diff --git a/pigx-visual/pigx-xxl-job-admin/pom.xml b/pigx-visual/pigx-xxl-job-admin/pom.xml
index ea0412a32..4ccff5a07 100644
--- a/pigx-visual/pigx-xxl-job-admin/pom.xml
+++ b/pigx-visual/pigx-xxl-job-admin/pom.xml
@@ -12,13 +12,18 @@
jar
-
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
org.springframework.boot
diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml
deleted file mode 100644
index 59c6e7d8b..000000000
--- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-# xxl
-xxl:
- job:
- i18n: zh_CN
- logretentiondays: 30
- triggerpool:
- fast.max: 200
- slow.max: 200
-
-# mybatis
-mybatis:
- mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
-
-# spring
-spring:
- datasource:
- url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- driver-class-name: com.mysql.cj.jdbc.Driver
- username: ${MYSQL_USER:root}
- password: ${MYSQL_PWD:root}
- mvc:
- static-path-pattern: /static/**
- freemarker:
- suffix: .ftl
- request-context-attribute: request
- settings:
- number_format: 0.##########
- mail:
- host: smtp.mxhichina.com
- port: 465
- from: xxxx@gitee.wang
- username: xxxx@gitee.wang
- password: xxxx
- properties:
- mail:
- smtp:
- auth: true
- ssl.enable: true
- starttls.enable: false
- required: false
-# spring boot admin 配置
-
-management:
- health:
- mail:
- enabled: false
- endpoints:
- web:
- exposure:
- include: '*'
- endpoint:
- health:
- show-details: ALWAYS
\ No newline at end of file
diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/bootstrap.yml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/bootstrap.yml
index 66504fa4d..8b5b407e8 100644
--- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/bootstrap.yml
@@ -13,5 +13,10 @@ spring:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
metadata:
management.context-path: ${server.servlet.context-path}/actuator
+ config:
+ server-addr: ${spring.cloud.nacos.discovery.server-addr}
+ file-extension: yml
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
profiles:
- active: @profiles.active@
\ No newline at end of file
+ active: @profiles.active@