⚡ 优化xxl-job-admin模块的配置，支持自定义配置覆盖nacos通用配置

blade-ops/blade-xxljob-admin/doc/nacos/blade-xxljob-admin-dev.yaml

@@ -0,0 +1,16 @@
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    druid:
+      validation-query: select 1
+
+#项目模块集中配置
+blade:
+  #工作流模块开发生产环境数据库地址
+  datasource:
+    job:
+      dev:
+        # MySql
+        url: jdbc:mysql://127.0.0.1:3306/xxl_job?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8
+        username: root
+        password: root

blade-ops/blade-xxljob-admin/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.4.0.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-ops/blade-xxljob-admin/src/main/resources/application-dev.yml

@@ -0,0 +1,7 @@
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.job.dev.url}
+    username: ${blade.datasource.job.dev.username}
+    password: ${blade.datasource.job.dev.password}
+

blade-ops/blade-xxljob-admin/src/main/resources/application-prod.yml

@@ -0,0 +1,7 @@
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.job.prod.url}
+    username: ${blade.datasource.job.prod.username}
+    password: ${blade.datasource.job.prod.password}
+

blade-ops/blade-xxljob-admin/src/main/resources/application-test.yml

@@ -0,0 +1,6 @@
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.job.test.url}
+    username: ${blade.datasource.job.test.username}
+    password: ${blade.datasource.job.test.password}

blade-ops/blade-xxljob-admin/src/main/resources/application.properties

@@ -1,51 +0,0 @@
-### web
-server.port=7009
-server.servlet.context-path=/xxl-job-admin
-
-### actuator
-management.server.servlet.context-path=/actuator
-management.health.mail.enabled=false
-
-### resources
-spring.mvc.servlet.load-on-startup=0
-spring.mvc.static-path-pattern=/static/**
-spring.resources.static-locations=classpath:/static/
-
-### freemarker
-spring.freemarker.templateLoaderPath=classpath:/templates/
-spring.freemarker.suffix=.ftl
-spring.freemarker.charset=UTF-8
-spring.freemarker.request-context-attribute=request
-spring.freemarker.settings.number_format=0.##########
-
-### mybatis
-mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
-
-### xxl-job, datasource
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8
-spring.datasource.username=root
-spring.datasource.password=root
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-### xxl-job email
-spring.mail.host=smtp.qq.com
-spring.mail.port=25
-spring.mail.username=xxx@qq.com
-spring.mail.password=xxx
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
-spring.mail.properties.mail.smtp.starttls.required=true
-spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-
-### xxl-job, access token
-xxl.job.accessToken=
-
-### xxl-job, i18n (default empty as chinese, "en" as english)
-xxl.job.i18n=
-
-## xxl-job, triggerpool max size
-xxl.job.triggerpool.fast.max=200
-xxl.job.triggerpool.slow.max=100
-
-### xxl-job, log retention days
-xxl.job.logretentiondays=30

blade-ops/blade-xxljob-admin/src/main/resources/application.yml

@@ -0,0 +1,55 @@
+server:
+  port: 7009
+  servlet:
+    context-path: /xxl-job-admin
+
+spring:
+  freemarker:
+    charset: UTF-8
+    request-context-attribute: request
+    settings:
+      number_format: 0.##########
+    suffix: .ftl
+    templateLoaderPath: classpath:/templates/
+  mail:
+    host: smtp.qq.com
+    password: xxx
+    port: 25
+    properties:
+      mail:
+        smtp:
+          auth: true
+          socketFactory:
+            class: javax.net.ssl.SSLSocketFactory
+          starttls:
+            enable: true
+            required: true
+    username: xxx@qq.com
+  mvc:
+    servlet:
+      load-on-startup: 0
+    static-path-pattern: /static/**
+  resources:
+    static-locations: classpath:/static/
+
+management:
+  health:
+    mail:
+      enabled: false
+  server:
+    servlet:
+      context-path: /actuator
+mybatis:
+  mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
+
+xxl:
+  job:
+    accessToken: ''
+    i18n: ''
+    logretentiondays: 30
+    triggerpool:
+      fast:
+        max: 200
+      slow:
+        max: 100
+