Prechádzať zdrojové kódy

1.修改测试环境配置文件,测试环境对应测试公众号。
2.导入模板去掉年龄列表,如果不是身份证导入就在平台中填写年龄。

tomatozq 5 rokov pred
rodič
commit
f01e5cfafc

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

@@ -22,8 +22,8 @@ pdf:
   outputPath: C:\\picc\\pdf
 
 weixin:
-  appId: wxf6af207d9143d1de
-  appSecret: c86c042923e72c61c76a3a8658349312
+  appId: wxc0ddd6a415c535d9
+  appSecret: 042fe6c9c970c1d9fe585dccfca89221
   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"

+ 7 - 6
picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/CompanyMemberController.java

@@ -376,9 +376,9 @@ public class CompanyMemberController {
                     String cardType = array[2].toString();
                     String cardNo = array[3].toString();
                     String sex = array[4].toString();
-                    String age = array[5].toString();
-                    String jobName = array[6].toString();
-                    String healthStatus = array[7].toString();
+//                  String age = array[5].toString();
+                    String jobName = array[5].toString();
+                    String healthStatus = array[6].toString();
 
                     if(StringUtils.isEmpty(name)){
                         continue;
@@ -423,9 +423,10 @@ public class CompanyMemberController {
                             companyMember.setSex(cic.isFemal());
                         }
 
-                        if (StringUtils.isNotEmpty(age)) {
-                            companyMember.setAge(Integer.valueOf(age));
-                        } else if (cic != null && cic.validate()) {
+//                        if (StringUtils.isNotEmpty(age)) {
+//                            companyMember.setAge(Integer.valueOf(age));
+//                        }
+                        if (cic != null && cic.validate()) {
                             companyMember.setAge(cic.getAge());
                         }
 

+ 5 - 1
picc-enterprise-server/src/main/resources/application-remote.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: wxc0ddd6a415c535d9

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

@@ -22,8 +22,8 @@ cas:
   validation-type: 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
+  notifyBackUrl: http://gyxm.jing-zhou.gov.cn/picc-enterprise-test/pay/orderNotifyBack
+  synchroBackUrl: http://gyxm.jing-zhou.gov.cn/picc-enterprise-test/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
@@ -33,8 +33,8 @@ jpcloud:
   platformKey: '1234567890'
 
 weixin:
-  appId: wxf6af207d9143d1de
-  appSecret: c86c042923e72c61c76a3a8658349312
+  appId: wxc0ddd6a415c535d9
+  appSecret: 042fe6c9c970c1d9fe585dccfca89221
   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"