1)增加云平台查询用户接口。

2)企业端人员导入接口完善。

picc-admin-server/src/main/resources/application-dev.yml

@@ -25,7 +25,10 @@ weixin:
   sendTmplId1: "oc6Kh7_ZkANmsUnl2keg-X2nUKRBkAwjnGI3z1gTodo"
 
 jpcloud:
-  apiUrl: http://localhost:9081/jp-cloud-api
+  notifyBackUrl: http://localhost:7070/picc-enterprise-server/pay/orderNotifyBack
+  synchroBackUrl: http://localhost:7070/picc-enterprise-server/pay/paySuccess
+#  apiUrl: http://localhost:9081/jp-cloud-api
+  apiUrl: http://pay.huishouyou.com.cn
   findMemberByNamesUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberByNamesForPicc
   findMemberUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberForPicc
   payUrl: ${jpcloud.apiUrl}/payment/tradingOrderPayPc

picc-admin-server/src/main/resources/application-production.yml

@@ -36,3 +36,14 @@ weixin:
   tokenUrl: "http://picc.jzrccs.com/weixin-middleware/token"
   createQrCodeUrl: "http://picc.jzrccs.com/weixin-middleware/qrcode/create"
   sendTmplMsgUrl: "https://api.weixin.qq.com/cgi-bin/message/template/send"
+
+jpcloud:
+  notifyBackUrl: http://picc.jzrccs.com/enterprise/pay/orderNotifyBack
+  synchroBackUrl: http://picc.jzrccs.com/enterprise/pay/paySuccess
+  apiUrl: http://pay.huishouyou.com.cn
+  findMemberByNamesUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberByNamesForPicc
+  findMemberUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberForPicc
+  payUrl: ${jpcloud.apiUrl}/payment/tradingOrderPayPc
+  sellerSerialNumber: '000001000020'
+  platformCode: '0008'
+  platformKey: '1234567890'

picc-admin-server/src/main/resources/application-test.yml

@@ -28,3 +28,14 @@ weixin:
   createQrCodeUrl: "http://picc.jzrccs.com/weixin-middleware/qrcode/create"
   sendTmplMsgUrl: "https://api.weixin.qq.com/cgi-bin/message/template/send"
   sendTmplId1: "oc6Kh7_ZkANmsUnl2keg-X2nUKRBkAwjnGI3z1gTodo"
+
+jpcloud:
+  notifyBackUrl: http://gyxm.jing-zhou.gov.cn/picc-enterprise-server/pay/orderNotifyBack
+  synchroBackUrl: http://gyxm.jing-zhou.gov.cn/picc-enterprise-server/pay/paySuccess
+  apiUrl: http://gyxm.jing-zhou.gov.cn/jp-cloud-api
+  findMemberByNamesUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberByNamesForPicc
+  findMemberUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberForPicc
+  payUrl: ${jpcloud.apiUrl}/payment/tradingOrderPayPc
+  sellerSerialNumber: '000001000020'
+  platformCode: '0008'
+  platformKey: '1234567890'

picc-enterprise-server/src/main/resources/application-production.yml

@@ -30,9 +30,13 @@ cas:
 jpcloud:
   notifyBackUrl: http://picc.jzrccs.com/enterprise/pay/orderNotifyBack
   synchroBackUrl: http://picc.jzrccs.com/enterprise/pay/paySuccess
-  jpcloudUrl: http://pay.huishouyou.com.cn/payment/tradingOrderPayPc
+  apiUrl: http://pay.huishouyou.com.cn
+  findMemberByNamesUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberByNamesForPicc
+  findMemberUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberForPicc
+  payUrl: ${jpcloud.apiUrl}/payment/tradingOrderPayPc
   sellerSerialNumber: '000001000020'
   platformCode: '0008'
+  platformKey: '1234567890'
 
 weixin:
   appId: wxf6af207d9143d1de

picc-enterprise-server/src/main/resources/application-test.yml

@@ -24,9 +24,13 @@ cas:
 jpcloud:
   notifyBackUrl: http://gyxm.jing-zhou.gov.cn/picc-enterprise-server/pay/orderNotifyBack
   synchroBackUrl: http://gyxm.jing-zhou.gov.cn/picc-enterprise-server/pay/paySuccess
-  jpcloudUrl: http://gyxm.jing-zhou.gov.cn/jp-cloud-api/payment/tradingOrderPayPc
+  apiUrl: http://gyxm.jing-zhou.gov.cn/jp-cloud-api
+  findMemberByNamesUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberByNamesForPicc
+  findMemberUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberForPicc
+  payUrl: ${jpcloud.apiUrl}/payment/tradingOrderPayPc
   sellerSerialNumber: '000001000020'
   platformCode: '0008'
+  platformKey: '1234567890'
 
 weixin:
   appId: wxf6af207d9143d1de

picc-enterprise-server/src/test/java/com/jpsoft/picc/test/InsuranceApplicationTest.java

@@ -1,13 +1,19 @@
 package com.jpsoft.picc.test;
 
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.model.PutObjectResult;
 import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
 import com.jpsoft.picc.modules.business.service.InsuranceApplicationService;
+import com.jpsoft.picc.modules.common.config.OSSConfig;
+import com.jpsoft.picc.modules.common.utils.OSSUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.io.FileInputStream;
 import java.util.Date;
 import java.util.UUID;
 
@@ -17,6 +23,9 @@ public class InsuranceApplicationTest {
     @Autowired
     private InsuranceApplicationService insuranceApplicationService;
 
+    @Autowired
+    private OSSConfig ossConfig;
+
     @Test
     public void testInsert(){
         InsuranceApplication model = new InsuranceApplication();
@@ -27,4 +36,25 @@ public class InsuranceApplicationTest {
 
         insuranceApplicationService.insert(model);
     }
+
+    @Test
+    public void testUpload(){
+        String filePath = "H:\\企业人员名单导入模板.xls";
+
+        try {
+            FileInputStream fileInput = new FileInputStream(filePath);
+
+            OSS ossClient = new OSSClientBuilder().build(ossConfig.getEndpoint(),
+                    ossConfig.getAccessKeyId(), ossConfig.getAccessKeySecret());
+
+            // 上传文件流
+            PutObjectResult result = ossClient.putObject(ossConfig.getBucketName(), "picc/template/2020/2/企业人员名单导入模板.xls", fileInput);
+
+            // 关闭OSSClient
+            ossClient.shutdown();
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+        }
+    }
 }