diff --git a/wisenergy-web-admin/src/main/resources/application-test.yml b/wisenergy-web-admin/src/main/resources/application-test.yml index 87b26fddfcbff7fcaaab9f9e375631115697c7eb..d7fabeffe3f69715803bf749012688b76012524a 100644 --- a/wisenergy-web-admin/src/main/resources/application-test.yml +++ b/wisenergy-web-admin/src/main/resources/application-test.yml @@ -68,16 +68,3 @@ sms: version: 2017-05-25 action: SendSms signName: 西田森生物科技 - -xxl: - job: - accessToken: - admin: - addresses: http://172.24.252.165:8090/job-admin - executor: - address: - appname: shop-mall - ip: 172.24.252.165 - logpath: /home/meepo/logs/xxl-job/jobhandler - logretentiondays: 30 - port: 9999 diff --git a/wisenergy-web-admin/src/main/resources/application.yml b/wisenergy-web-admin/src/main/resources/application.yml index 81e9e44effedd976977d42ce43651227916b855c..f9f3fe3a380be92daca7ded633dd496eb47e93a5 100644 --- a/wisenergy-web-admin/src/main/resources/application.yml +++ b/wisenergy-web-admin/src/main/resources/application.yml @@ -50,4 +50,17 @@ mybatis-plus: map-underscore-to-camel-case: true cache-enabled: false call-setters-on-nulls: true - jdbc-type-for-null: 'null' \ No newline at end of file + jdbc-type-for-null: 'null' + +xxl: + job: + accessToken: + admin: + addresses: http://172.24.252.165:81/job-admin + executor: + address: + appname: shop-mall + ip: 172.24.252.165 + logpath: /home/meepo/logs/xxl-job/jobhandler + logretentiondays: 30 + port: 9999 \ No newline at end of file