From b7815ea64052db9d4659ffc68b25392f1cca8621 Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 26 Feb 2020 15:48:38 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96xxl-job-admin?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E9=85=8D=E7=BD=AE=E8=A6=86?= =?UTF-8?q?=E7=9B=96nacos=E9=80=9A=E7=94=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doc/nacos/blade-xxljob-admin-dev.yaml | 16 ++++++ blade-ops/blade-xxljob-admin/pom.xml | 2 +- .../src/main/resources/application-dev.yml | 7 +++ .../src/main/resources/application-prod.yml | 7 +++ .../src/main/resources/application-test.yml | 6 ++ .../src/main/resources/application.properties | 51 ----------------- .../src/main/resources/application.yml | 55 +++++++++++++++++++ 7 files changed, 92 insertions(+), 52 deletions(-) create mode 100644 blade-ops/blade-xxljob-admin/doc/nacos/blade-xxljob-admin-dev.yaml create mode 100644 blade-ops/blade-xxljob-admin/src/main/resources/application-dev.yml create mode 100644 blade-ops/blade-xxljob-admin/src/main/resources/application-prod.yml create mode 100644 blade-ops/blade-xxljob-admin/src/main/resources/application-test.yml delete mode 100644 blade-ops/blade-xxljob-admin/src/main/resources/application.properties create mode 100644 blade-ops/blade-xxljob-admin/src/main/resources/application.yml diff --git a/blade-ops/blade-xxljob-admin/doc/nacos/blade-xxljob-admin-dev.yaml b/blade-ops/blade-xxljob-admin/doc/nacos/blade-xxljob-admin-dev.yaml new file mode 100644 index 00000000..a1dda785 --- /dev/null +++ b/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 diff --git a/blade-ops/blade-xxljob-admin/pom.xml b/blade-ops/blade-xxljob-admin/pom.xml index db0e1744..8612ca6a 100644 --- a/blade-ops/blade-xxljob-admin/pom.xml +++ b/blade-ops/blade-xxljob-admin/pom.xml @@ -3,7 +3,7 @@ blade-ops org.springblade - 2.3.1.RELEASE + 2.4.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-xxljob-admin/src/main/resources/application-dev.yml b/blade-ops/blade-xxljob-admin/src/main/resources/application-dev.yml new file mode 100644 index 00000000..c7f2ad46 --- /dev/null +++ b/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} + diff --git a/blade-ops/blade-xxljob-admin/src/main/resources/application-prod.yml b/blade-ops/blade-xxljob-admin/src/main/resources/application-prod.yml new file mode 100644 index 00000000..396d0b96 --- /dev/null +++ b/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} + diff --git a/blade-ops/blade-xxljob-admin/src/main/resources/application-test.yml b/blade-ops/blade-xxljob-admin/src/main/resources/application-test.yml new file mode 100644 index 00000000..3fdf586b --- /dev/null +++ b/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} diff --git a/blade-ops/blade-xxljob-admin/src/main/resources/application.properties b/blade-ops/blade-xxljob-admin/src/main/resources/application.properties deleted file mode 100644 index 292ab5bd..00000000 --- a/blade-ops/blade-xxljob-admin/src/main/resources/application.properties +++ /dev/null @@ -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 diff --git a/blade-ops/blade-xxljob-admin/src/main/resources/application.yml b/blade-ops/blade-xxljob-admin/src/main/resources/application.yml new file mode 100644 index 00000000..766bf596 --- /dev/null +++ b/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 +