Browse Source

Merge remote-tracking branch 'origin/master_jiaoyang' into master_jiaoyang

yumeng 5 years ago
parent
commit
97307b855a

+ 2 - 2
jeecg-boot-module-system/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   profiles:
-#    active: wps
-    active: @activatedProperties@
+    active: wps
+#    active: @activatedProperties@
 
 swagger:
   production: false

+ 2 - 2
module-job-bytedance/src/main/resources/application-prod.yml

@@ -47,7 +47,7 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://127.0.0.1:3306/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     password: test@20190531
     driver-class-name: com.mysql.jdbc.Driver
@@ -86,7 +86,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96:3306/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: test@20190531
           driver-class-name: com.mysql.jdbc.Driver

+ 1 - 1
module-job-bytedance/src/main/resources/application.yml

@@ -21,4 +21,4 @@ xxl:
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30
     admin:
-      addresses: http://118.24.244.213:8090
+      addresses: http://118.24.244.213:8090/xxl-job-admin

+ 2 - 2
module-job-kuaishou/src/main/resources/application-prod.yml

@@ -52,7 +52,7 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://127.0.0.1:3306/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     password: test@20190531
     driver-class-name: com.mysql.jdbc.Driver
@@ -91,7 +91,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96:3306/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: test@20190531
           driver-class-name: com.mysql.jdbc.Driver

+ 3 - 3
module-job-kuaishou/src/main/resources/application.yml

@@ -2,8 +2,8 @@ server:
   port: 8092
 spring:
   profiles:
-#    active: @activatedProperties@
-    active: prod
+    active: @activatedProperties@
+#    active: prod
   application:
     name: system-web
 swagger:
@@ -22,4 +22,4 @@ xxl:
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30
     admin:
-      addresses: http://118.24.244.213:8090
+      addresses: http://118.24.244.213:8090/xxl-job-admin