From 78cd6f36ef6c58feb95cc39049f1a6336f38b410 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:32:53 +0800
Subject: [PATCH] add 增加 ruoyi-xxl-job-admin 多环境配置
---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml | 53 +++--------------
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml | 36 ++++++++++++
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml | 36 ++++++++++++
3 files changed, 82 insertions(+), 43 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..065b342
--- /dev/null
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
@@ -0,0 +1,36 @@
+--- # 鏁版嵁搴撻厤缃�
+spring:
+ datasource:
+ type: com.zaxxer.hikari.HikariDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+ username: root
+ password: root
+ 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
+
+--- # 閭欢閰嶇疆
+spring:
+ mail:
+ from: xxx@qq.com
+ host: smtp.qq.com
+ username: xxx@qq.com
+ password: xxx
+ port: 25
+ properties:
+ mail:
+ smtp:
+ auth: true
+ socketFactory:
+ class: javax.net.ssl.SSLSocketFactory
+ starttls:
+ enable: true
+ required: true
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..774d7f8
--- /dev/null
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
@@ -0,0 +1,36 @@
+--- # 鏁版嵁搴撻厤缃�
+spring:
+ datasource:
+ type: com.zaxxer.hikari.HikariDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://172.30.0.92:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+ username: root
+ password: root
+ 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
+
+--- # 閭欢閰嶇疆
+spring:
+ mail:
+ from: xxx@qq.com
+ host: smtp.qq.com
+ username: xxx@qq.com
+ password: xxx
+ port: 25
+ properties:
+ mail:
+ smtp:
+ auth: true
+ socketFactory:
+ class: javax.net.ssl.SSLSocketFactory
+ starttls:
+ enable: true
+ required: true
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
index e431911..edafdb0 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
@@ -4,34 +4,19 @@
servlet:
context-path: /xxl-job-admin
spring:
- mvc:
- servlet:
- load-on-startup: 0
- static-path-pattern: /static/**
- web:
- resources:
- static-locations: classpath:/static/
+ profiles:
+ active: @profiles.active@
+ mvc:
+ servlet:
+ load-on-startup: 0
+ static-path-pattern: /static/**
+ web:
+ resources:
+ static-locations: classpath:/static/
---- # 鏁版嵁搴撻厤缃�
+--- # mybatis 閰嶇疆
mybatis:
mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
-spring:
- datasource:
- type: com.zaxxer.hikari.HikariDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
- username: root
- password: root
- 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
--- # 椤甸潰閰嶇疆
spring:
@@ -42,24 +27,6 @@
number_format: 0.##########
suffix: .ftl
templateLoaderPath: classpath:/templates/
-
---- # 閭欢閰嶇疆
-spring:
- mail:
- from: xxx@qq.com
- host: smtp.qq.com
- username: xxx@qq.com
- password: xxx
- port: 25
- properties:
- mail:
- smtp:
- auth: true
- socketFactory:
- class: javax.net.ssl.SSLSocketFactory
- starttls:
- enable: true
- required: true
--- # 鐩戞帶閰嶇疆
management:
--
Gitblit v1.9.3