Merge remote-tracking branch 'origin/master'

# Conflicts:
#	apply-net/src/main/java/com/winsun/controller/DankuanController.java
#	apply-net/src/main/java/com/winsun/controller/RongHeController.java

apply-net/src/main/java/com/winsun/controller/DankuanController.java

@@ -477,17 +477,17 @@ public class DankuanController {
         map.put("ORDERNUMBER", orderView.getOrderNumber());//身份证
 
 
-//        if (Constant.Payment1.equals(ipay)) {
-//            //支付成功回调的页面
-//            // String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toPaymentSuccessPage?id=" + userId +"orderId="+id;
-            String MERCHANTURL = "http://3715zj2369.qicp.vip:52511/#/hhr/dkSuccessful?id="+userId;
-            map.put("MERCHANTURL", MERCHANTURL);
-//        }
+        //支付成功回调的页面（以前限制支付宝支付才能回调）
+        /**
+         * 测试后提交代码要恢复正式环境地址
+         */
+        String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/dkSuccessful?id="+userId+"&"+"orderSeq="+orderSeq;
+        map.put("MERCHANTURL", MERCHANTURL);
         //单宽回调后端接口地址
-        //  map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser");
-
+        // 正式环境
+        map.put("BACKDROPURL", "https://dx.dianyuanjiangli.com/apply-net/ciop/dankuan/toSubmisOrderPreser");
         //测试地址
-        map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/dankuan/toSubmisOrderPreser");
+    //      map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/dankuan/toSubmisOrderPreser");
 
 
         String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -461,21 +461,15 @@ public class RongHeController {
             map.put("ORDERPHONE", orderView.getOrderPhone());//支付宝账号（电话）
             map.put("ORDERNUMBER", orderView.getOrderNumber());//身份证
 
-
-//            if (Constant.Payment1.equals(ipay)) {
-                //支付成功回调的页面
-                /* String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
-                /*  String MERCHANTURL =  "http://167460x6b0.51mypc.cn/ciop/rongHe/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
-                // 正式地址
-                String MERCHANTURL = "http://3715zj2369.qicp.vip:52511/#/hhr/dkSuccessful?id="+userId;
-//                String MERCHANTURL = "http://chengfengluo.ngrok2.xiaomiqiu.cn/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
-                map.put("MERCHANTURL", MERCHANTURL);
- //           }
+            //支付成功回调的页面（以前限制支付宝支付才能回调）
+            /**
+             * 测试后提交代码要恢复正式环境地址
+             */
+            String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/dkSuccessful?id="+userId;
+            map.put("MERCHANTURL", MERCHANTURL);
             // 融合回调后端接口地址
-            //  map.put("BACKDROPURL", Constant.TOMCATURL + "/rongHe/toSubmisOrderPreser");
-//            map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/rongHe/toSubmisOrderPreser");
             //正式地址
-            map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/rongHe/toSubmisOrderPreser");
+//            map.put("BACKDROPURL", "https://dx.dianyuanjiangli.com/apply-net/ciop/rongHe/toSubmisOrderPreser");
 
             String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识
             //*	将值转换为大写	*//*

apply-net/src/main/resources/application-prod.yml

@@ -129,8 +129,8 @@ spring:
       datasource:
         master:
           url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
-          username: yzzx
-          password: yzzx123!@#
+          username: root
+          password: AMrGBg6ZSsRrDLs6
           driver-class-name: com.mysql.cj.jdbc.Driver
   devtools:
     restart:

gateway/src/main/resources/application-prod.yml

@@ -28,12 +28,9 @@ spring:
       max-request-size: 100MB
       max-file-size: 100MB
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/school_center?useSSL=false
-    username: yzzx
-    password: yzzx123!@#
-    #    username: root
-    #    password: AMrGBg6ZSsRrDLs6
+    url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
+    username: root
+    password: AMrGBg6ZSsRrDLs6
 zuul:
   ribbon:
     eager-load:

new-user/src/main/resources/application-prod.yml

@@ -131,8 +131,8 @@ spring:
       datasource:
         master:
           url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
-          username: yzzx
-          password: yzzx123!@#
+          username: root
+          password: AMrGBg6ZSsRrDLs6
           driver-class-name: com.mysql.cj.jdbc.Driver
   devtools:
     restart:

old-user/src/main/resources/application-prod.yml

@@ -129,8 +129,8 @@ spring:
       datasource:
         master:
           url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
-          username: yzzx
-          password: yzzx123!@#
+          username: root
+          password: AMrGBg6ZSsRrDLs6
           driver-class-name: com.mysql.cj.jdbc.Driver
   devtools:
     restart:

renewal-user/src/main/resources/application-prod.yml

@@ -129,8 +129,8 @@ spring:
       datasource:
         master:
           url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
-          username: yzzx
-          password: yzzx123!@#
+          username: root
+          password: AMrGBg6ZSsRrDLs6
           driver-class-name: com.mysql.cj.jdbc.Driver
   devtools:
     restart:

task/src/main/resources/application-prod.yml

@@ -122,8 +122,8 @@ spring:
       prohibition: 600
   datasource:
     url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
-      username: yzzx
-      password: yzzx123!@#
+    username: root
+    password: AMrGBg6ZSsRrDLs6
     filters: wall,mergeStat
     max-active: 20
   devtools: