From 57732f6956407b2cdd9b44a39f0d9c89dd5567e4 Mon Sep 17 00:00:00 2001 From: liangqi Date: Mon, 4 Apr 2022 11:40:33 +0800 Subject: [PATCH] =?UTF-8?q?xxl-job=E5=A4=9A=E7=8E=AF=E5=A2=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 42 +++++++++++++++++ .../src/main/resources/application-prod.yml | 43 ++++++++++++++++++ .../src/main/resources/application-test.yml | 42 +++++++++++++++++ .../src/main/resources/application.yml | 45 ++----------------- 4 files changed, 130 insertions(+), 42 deletions(-) create mode 100644 xxl-job-admin/src/main/resources/application-dev.yml create mode 100644 xxl-job-admin/src/main/resources/application-prod.yml create mode 100644 xxl-job-admin/src/main/resources/application-test.yml diff --git a/xxl-job-admin/src/main/resources/application-dev.yml b/xxl-job-admin/src/main/resources/application-dev.yml new file mode 100644 index 00000000..b5464a19 --- /dev/null +++ b/xxl-job-admin/src/main/resources/application-dev.yml @@ -0,0 +1,42 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + auto-commit: true + connection-test-query: SELECT 1 + connection-timeout: 10000 + idle-timeout: 30000 + max-lifetime: 900000 + maximum-pool-size: 30 + minimum-idle: 10 + pool-name: HikariCP + validation-timeout: 1000 + password: yihuan@mysql + type: com.zaxxer.hikari.HikariDataSource + url: jdbc:mysql://192.168.2.40:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai + username: root + mail: + from: xxx@qq.com + 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 +xxl: + job: + accessToken: '' + i18n: zh_CN + logretentiondays: 30 + triggerpool: + fast: + max: 200 + slow: + max: 100 diff --git a/xxl-job-admin/src/main/resources/application-prod.yml b/xxl-job-admin/src/main/resources/application-prod.yml new file mode 100644 index 00000000..069dce4b --- /dev/null +++ b/xxl-job-admin/src/main/resources/application-prod.yml @@ -0,0 +1,43 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + auto-commit: true + connection-test-query: SELECT 1 + connection-timeout: 10000 + idle-timeout: 30000 + max-lifetime: 900000 + maximum-pool-size: 30 + minimum-idle: 10 + pool-name: HikariCP + validation-timeout: 1000 + password: yihuan@mysql + type: com.zaxxer.hikari.HikariDataSource + url: jdbc:mysql://192.168.2.40:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai + username: root + mail: + from: xxx@qq.com + 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 + +xxl: + job: + accessToken: '' + i18n: zh_CN + logretentiondays: 30 + triggerpool: + fast: + max: 200 + slow: + max: 100 diff --git a/xxl-job-admin/src/main/resources/application-test.yml b/xxl-job-admin/src/main/resources/application-test.yml new file mode 100644 index 00000000..b5464a19 --- /dev/null +++ b/xxl-job-admin/src/main/resources/application-test.yml @@ -0,0 +1,42 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + auto-commit: true + connection-test-query: SELECT 1 + connection-timeout: 10000 + idle-timeout: 30000 + max-lifetime: 900000 + maximum-pool-size: 30 + minimum-idle: 10 + pool-name: HikariCP + validation-timeout: 1000 + password: yihuan@mysql + type: com.zaxxer.hikari.HikariDataSource + url: jdbc:mysql://192.168.2.40:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai + username: root + mail: + from: xxx@qq.com + 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 +xxl: + job: + accessToken: '' + i18n: zh_CN + logretentiondays: 30 + triggerpool: + fast: + max: 200 + slow: + max: 100 diff --git a/xxl-job-admin/src/main/resources/application.yml b/xxl-job-admin/src/main/resources/application.yml index 2f28a8ba..1b258a85 100644 --- a/xxl-job-admin/src/main/resources/application.yml +++ b/xxl-job-admin/src/main/resources/application.yml @@ -12,22 +12,8 @@ server: servlet: context-path: /xxl-job-admin spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - hikari: - auto-commit: true - connection-test-query: SELECT 1 - connection-timeout: 10000 - idle-timeout: 30000 - max-lifetime: 900000 - maximum-pool-size: 30 - minimum-idle: 10 - pool-name: HikariCP - validation-timeout: 1000 - password: yihuan@mysql - type: com.zaxxer.hikari.HikariDataSource - url: jdbc:mysql://192.168.2.40:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai - username: root + profiles: + active: dev freemarker: charset: UTF-8 request-context-attribute: request @@ -35,34 +21,9 @@ spring: number_format: 0.########## suffix: .ftl templateLoaderPath: classpath:/templates/ - mail: - from: xxx@qq.com - 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/ -xxl: - job: - accessToken: '' - i18n: zh_CN - logretentiondays: 30 - triggerpool: - fast: - max: 200 - slow: - max: 100 + static-locations: classpath:/static/ \ No newline at end of file