diff --git a/pom.xml b/pom.xml
index 4352e1135..9d27bea9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.5.RELEASE
+ 2.7.7
club.joylink
@@ -15,7 +15,7 @@
Rail transit simulation system
- 11
+ 17
4.1.1
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bf37f3ac9..676deebed 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,44 +10,48 @@ udp:
yjddzh:
receiveTimeOver: 60
spring:
- profiles:
- active: dev
- application:
- name: joylink-rtss
- jackson:
- date-format: yyyy-MM-dd HH:mm:ss
- time-zone: GMT+8
- default-property-inclusion: non_null
- servlet:
- multipart:
- max-file-size: 10MB
+ profiles:
+ default: dev
+ main:
+ allow-bean-definition-overriding: true
+ allow-circular-references: true
+ application:
+ name: joylink-rtss
+ jackson:
+ date-format: yyyy-MM-dd HH:mm:ss
+ time-zone: GMT+8
+ default-property-inclusion: non_null
+ servlet:
+ multipart:
+ max-file-size: 10MB
+ datasource:
+ driverClassName: com.mysql.cj.jdbc.Driver
+ hikari:
+ minimum-idle: 5 # 连接池维护的最小空闲连接数
+ maximum-pool-size: 10 #配置最大连接池大小
+ auto-commit: true #配置从池返回的连接的默认自动提交行为
+ idle-timeout: 30000 # 允许连接在连接池中空闲的最长时间,单位ms
+ pool-name: HikariPool
+ max-lifetime: 1800000 # 池中连接关闭后的最长生命周期,单位ms
+ connection-timeout: 30000 # 等待连接的超时时间,单位ms
+ connection-test-query: select 1
# JavaMailSender 邮件发送的配置
- mail:
- host: smtp.exmail.qq.com
- port: 465
- username: serviceemai@joylink.club
- password: Jiulian0503
- properties:
- mail:
- smtp:
- auth: true
- starttls:
- enable: true
- required: true
- socketFactory:
- port: 465
- class: javax.net.ssl.SSLSocketFactory
- fallback: false
- datasource:
- driverClassName: com.mysql.cj.jdbc.Driver
- hikari:
- minimum-idle: 5 # 连接池维护的最小空闲连接数
- maximum-pool-size: 10 #配置最大连接池大小
- auto-commit: true #配置从池返回的连接的默认自动提交行为
- idle-timeout: 30000 # 允许连接在连接池中空闲的最长时间,单位ms
- pool-name: HikariPool
- max-lifetime: 1800000 # 池中连接关闭后的最长生命周期,单位ms
- connection-timeout: 30000 # 等待连接的超时时间,单位ms
+ mail:
+ host: smtp.exmail.qq.com
+ port: 465
+ username: serviceemai@joylink.club
+ password: Jiulian0503
+ properties:
+ mail:
+ smtp:
+ auth: true
+ starttls:
+ enable: true
+ required: true
+ socketFactory:
+ port: 465
+ class: javax.net.ssl.SSLSocketFactory
+ fallback: false
mybatis:
mapper-locations: classpath:mybatis/mapper/**/*.xml
# type-aliases-package: club.joylink.rtss.entity
@@ -88,7 +92,9 @@ tencent-cloud:
# 环境连接配置 start
---
spring:
- profiles: dev
+ config:
+ activate:
+ on-profile: dev
datasource:
url: jdbc:mysql://192.168.3.233:3306/joylink?useSSL=false&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: root
@@ -116,11 +122,13 @@ common:
license-secret-key: joylink
---
spring:
- profiles: test
- datasource:
- url: jdbc:mysql://172.16.0.128:3306/joylink?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: Joylink@0503
+ config:
+ activate:
+ on-profile: test
+ datasource:
+ url: jdbc:mysql://172.16.0.128:3306/joylink?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: Joylink@0503
wechat:
wx-api-url: https://open.weixin.qq.com/connect/oauth2/authorize?appid=${wechat.app-id}&redirect_uri=https://test.joylink.club/wx/%s&response_type=code&scope=snsapi_base&state=%s#wechat_redirect
@@ -147,7 +155,9 @@ common:
---
spring:
- profiles: local-test
+ config:
+ activate:
+ on-profile: local-test
datasource:
url: jdbc:mysql://192.168.53.22:3306/joylink?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
@@ -178,11 +188,13 @@ common:
---
spring:
- profiles: prd
- datasource:
- url: jdbc:mysql://192.168.0.169:3306/joylink?useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: joylink@0503
+ config:
+ activate:
+ on-profile: prd
+ datasource:
+ url: jdbc:mysql://192.168.0.169:3306/joylink?useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: joylink@0503
wechat:
app-id: wx41cb66db5faf330f
app-secret: eb7199c1e73417be6a4d38b4a848effb
@@ -212,7 +224,9 @@ common:
---
spring:
- profiles: local
+ config:
+ activate:
+ on-profile: local
datasource:
url: jdbc:mysql://192.168.1.254:3306/joylink?useSSL=false&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: root