配置调整

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyPaymentSettleController.java

@@ -196,7 +196,7 @@ public class ApplyPaymentSettleController extends BaseController {
                         Integer srcUserType = 0;//来源用户类型 0管理,1企业
                         String srcUserId = ShiroUtils.getUserId();
                         String srcUserName = ShiroUtils.getLoginName();
-                        String receiveUserId = push.getId();
+                        String receiveUserId = push.getPushUser();
                         String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
                         parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
                     }

pro-main/src/main/resources/application-dev.yml

@@ -1,12 +1,14 @@
 # 环境 dev|test|prod|cloud
 
-#dev环境  mysql7.0
-spring :
-  datasource :
-    driverClassName : com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/idea_base?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-    username: root
-    password: 123456
+#dev环境  mysql5.7
+spring:
+  datasource:
+    #主库
+    master:
+      jdbc-url: jdbc:mysql://localhost:3306/idea_settle_down?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
+      username: root
+      password: 123456
+      driver-class-name: com.mysql.jdbc.Driver
     hikari:
       maxLifetime: 1765000
       maximumPoolSize: 15
@@ -18,6 +20,6 @@ spring :
       cluster-nodes: 36.134.98.30:9300    # 测试es服务器
 
 
-
+serverUrl: https://www.idea-co-sf.com/settleDown/#/login
 
 

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

@@ -5,9 +5,9 @@ spring:
   datasource:
     #主库
     master:
-      jdbc-url: jdbc:mysql://47.113.226.116:3306/idea_settle_down?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
-      username: pany
-      password: asset@2002302!24
+      jdbc-url: jdbc:mysql://10.1.4.70:3306/idea_settle_down?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
+      username: root
+      password: 123456
       driver-class-name: com.mysql.jdbc.Driver
     hikari:
       maxLifetime: 1765000

pro-main/src/main/resources/application-test.yml

@@ -5,9 +5,9 @@ spring:
   datasource:
     #主库
     master:
-      jdbc-url: jdbc:mysql://localhost:3306/idea_settle_down?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-      username: root
-      password: 123456
+      jdbc-url: jdbc:mysql://47.113.226.116:3306/idea_settle_down?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
+      username: pany
+      password: asset@2002302!24
       driver-class-name: com.mysql.jdbc.Driver
     hikari:
       maxLifetime: 1765000
@@ -19,7 +19,9 @@ spring:
       cluster-name: idea-es-cluster-1  # cluster_name
       cluster-nodes: 36.134.98.30:9300    # 测试es服务器
 
-serverUrl: https://www.idea-co-sf.com/settleDown/#/login
+server:
+  port: 9016
 
+serverUrl: https://www.idea-co-sf.com/settleDown/#/login