diff --git a/blade-service/logpm-basicdata/src/main/resources/application-dev.yml b/blade-service/logpm-basicdata/src/main/resources/application-dev.yml
index abb6e8a17..8286d310f 100644
--- a/blade-service/logpm-basicdata/src/main/resources/application-dev.yml
+++ b/blade-service/logpm-basicdata/src/main/resources/application-dev.yml
@@ -43,3 +43,14 @@ spring:
username: ${blade.datasource.basicdata.slave.username}
password: ${blade.datasource.basicdata.slave.password}
+xxl:
+ job:
+ accessToken: ''
+ admin:
+ addresses: http://127.0.0.1:7009/xxl-job-admin
+ executor:
+ appname: logpm-basicdata-xxljob
+ ip: 127.0.0.1
+ logpath: ../data/applogs/logpm-factory-data-xxljob/jobhandler
+ logretentiondays: -1
+ port: 17018
diff --git a/blade-service/logpm-basicdata/src/main/resources/application-prod.yml b/blade-service/logpm-basicdata/src/main/resources/application-prod.yml
index abb6e8a17..40f040c5b 100644
--- a/blade-service/logpm-basicdata/src/main/resources/application-prod.yml
+++ b/blade-service/logpm-basicdata/src/main/resources/application-prod.yml
@@ -43,3 +43,14 @@ spring:
username: ${blade.datasource.basicdata.slave.username}
password: ${blade.datasource.basicdata.slave.password}
+xxl:
+ job:
+ accessToken: ''
+ admin:
+ addresses: http://172.16.128.147:7009/xxl-job-admin
+ executor:
+ appname: logpm-basicdata-xxljob
+ ip: 127.0.0.1
+ logpath: ../data/applogs/logpm-factory-data-xxljob/jobhandler
+ logretentiondays: -1
+ port: 17018
diff --git a/blade-service/logpm-basicdata/src/main/resources/application-test.yml b/blade-service/logpm-basicdata/src/main/resources/application-test.yml
index df229dcb5..0235f16a8 100644
--- a/blade-service/logpm-basicdata/src/main/resources/application-test.yml
+++ b/blade-service/logpm-basicdata/src/main/resources/application-test.yml
@@ -43,3 +43,14 @@ spring:
username: ${blade.datasource.basicdata.slave.username}
password: ${blade.datasource.basicdata.slave.password}
+xxl:
+ job:
+ accessToken: ''
+ admin:
+ addresses: http://127.0.0.1:7009/xxl-job-admin
+ executor:
+ appname: logpm-basicdata-xxljob
+ ip: 127.0.0.1
+ logpath: ../data/applogs/logpm-factory-data-xxljob/jobhandler
+ logretentiondays: -1
+ port: 17018
diff --git a/blade-service/logpm-basicdata/src/main/resources/application.yml b/blade-service/logpm-basicdata/src/main/resources/application.yml
index fc025c74f..a84f9a5a7 100644
--- a/blade-service/logpm-basicdata/src/main/resources/application.yml
+++ b/blade-service/logpm-basicdata/src/main/resources/application.yml
@@ -20,15 +20,4 @@ spring:
main:
allow-circular-references: true
-xxl:
- job:
- accessToken: ''
- admin:
- addresses: http://127.0.0.1:7009/xxl-job-admin
- executor:
- appname: logpm-basicdata-xxljob
- ip: 127.0.0.1
- logpath: ../data/applogs/logpm-factory-data-xxljob/jobhandler
- logretentiondays: -1
- port: 17018
diff --git a/blade-service/logpm-warehouse/src/main/resources/application-dev.yml b/blade-service/logpm-warehouse/src/main/resources/application-dev.yml
index d0f017ede..8f88cdad8 100644
--- a/blade-service/logpm-warehouse/src/main/resources/application-dev.yml
+++ b/blade-service/logpm-warehouse/src/main/resources/application-dev.yml
@@ -68,3 +68,14 @@ spring:
url: ${blade.datasource.warehouse.slave.url}
username: ${blade.datasource.warehouse.slave.username}
password: ${blade.datasource.warehouse.slave.password}
+xxl:
+ job:
+ accessToken: ''
+ admin:
+ addresses: http://127.0.0.1:7009/xxl-job-admin
+ executor:
+ appname: logpm-factory-xxljob
+ ip: 127.0.0.1
+ logpath: ../data/applogs/logpm-factory-xxljob/jobhandler
+ logretentiondays: -1
+ port: 7018
diff --git a/blade-service/logpm-warehouse/src/main/resources/application-prod.yml b/blade-service/logpm-warehouse/src/main/resources/application-prod.yml
index 76e5005e2..71e9f4a80 100644
--- a/blade-service/logpm-warehouse/src/main/resources/application-prod.yml
+++ b/blade-service/logpm-warehouse/src/main/resources/application-prod.yml
@@ -55,3 +55,14 @@ spring:
acknowledge-mode: manual
template:
mandatory: true
+xxl:
+ job:
+ accessToken: ''
+ admin:
+ addresses: http://172.16.128.147:7009/xxl-job-admin
+ executor:
+ appname: logpm-factory-xxljob
+ ip: 127.0.0.1
+ logpath: ../data/applogs/logpm-factory-xxljob/jobhandler
+ logretentiondays: -1
+ port: 7018
diff --git a/blade-service/logpm-warehouse/src/main/resources/application-test.yml b/blade-service/logpm-warehouse/src/main/resources/application-test.yml
index 9331c9492..28a10b0df 100644
--- a/blade-service/logpm-warehouse/src/main/resources/application-test.yml
+++ b/blade-service/logpm-warehouse/src/main/resources/application-test.yml
@@ -55,3 +55,14 @@ spring:
acknowledge-mode: manual
template:
mandatory: true
+xxl:
+ job:
+ accessToken: ''
+ admin:
+ addresses: http://127.0.0.1:7009/xxl-job-admin
+ executor:
+ appname: logpm-factory-xxljob
+ ip: 127.0.0.1
+ logpath: ../data/applogs/logpm-factory-xxljob/jobhandler
+ logretentiondays: -1
+ port: 7018
diff --git a/blade-service/logpm-warehouse/src/main/resources/application.yml b/blade-service/logpm-warehouse/src/main/resources/application.yml
index 5c4495fc1..70efb75b7 100644
--- a/blade-service/logpm-warehouse/src/main/resources/application.yml
+++ b/blade-service/logpm-warehouse/src/main/resources/application.yml
@@ -10,23 +10,6 @@ swagger:
- org.springblade
- com.logpm
-#oss配置
-oss:
- enabled: true
- name: minio
- tenant-mode: false
- endpoint: http://127.0.0.1:9000
- access-key: D99KGE6ZTQXSATTJWU24
- secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ
- bucket-name: bladex
-
-#blade配置
-blade:
- #本地文件上传
- file:
- remote-mode: true
- upload-domain: http://localhost:8999
- remote-path: /usr/share/nginx/html
logging:
config: classpath:logback.xml
@@ -37,15 +20,5 @@ spring:
allow-circular-references: true
-xxl:
- job:
- accessToken: ''
- admin:
- addresses: http://127.0.0.1:7009/xxl-job-admin
- executor:
- appname: logpm-factory-xxljob
- ip: 127.0.0.1
- logpath: ../data/applogs/logpm-factory-xxljob/jobhandler
- logretentiondays: -1
- port: 7018
+