소스 검색

修改骄阳任务

syh 4 년 전
부모
커밋
8d09cdd9c4
2개의 변경된 파일16개의 추가작업 그리고 16개의 파일을 삭제
  1. 15 4
      module-job-kuaishou/src/main/resources/application-jiaoyang.yml
  2. 1 12
      module-job-kuaishou/src/main/resources/application.yml

+ 15 - 4
module-job-kuaishou/src/main/resources/application-jiaoyang.yml

@@ -91,15 +91,15 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   redis:
     database: 0
-#    host: 172.30.0.17
-    host: 127.0.0.1
+    host: 172.30.0.17
+#    host: 127.0.0.1
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -108,7 +108,7 @@ spring:
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
     password: foobared
-#    port: 6379
+    port: 6379
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/**/xml/*Mapper.xml
@@ -172,3 +172,14 @@ oss:
     replace-value: oss-cn-beijing-internal
     replace-old-value: oss-cn-beijing
     download: /data/file/video/
+xxl:
+  job:
+    accessToken:
+    executor:
+      appname: module-job-kuaishou
+      port: 9998
+      ip:
+      logpath: /data/applogs/xxl-job/jobhandler
+      logretentiondays: 30
+    admin:
+      addresses: http://129.28.150.229:8090/xxl-job-admin

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

@@ -2,7 +2,7 @@ server:
   port: 8092
 spring:
   profiles:
-    active: @activatedProperties@
+    active: jiaoyang
   application:
     name: system-web
 swagger:
@@ -11,15 +11,4 @@ swagger:
     enable: true
     username: jeecg
     password: jeecg1314
-xxl:
-  job:
-    accessToken:
-    executor:
-      appname: module-job-kuaishou
-      port: 9998
-      ip:
-      logpath: /data/applogs/xxl-job/jobhandler
-      logretentiondays: 30
-    admin:
-      addresses: http://129.28.150.229:8090/xxl-job-admin