diff --git a/pom.xml b/pom.xml
index 4f1706c4..c2ad8c9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -305,7 +305,7 @@
com.dreamchaser.depository_manage.DepositoryManageApplication
- true
+
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 704e115f..c3c83460 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -18,19 +18,19 @@ spring:
datasource:
dynamic:
strict: false
- primary: master # 配置默认数据库
+ primary: master # 配置默认数据库depository
datasource:
master:
username: depository # 用户名
- password: NhE47edekBHxhjYk #密码
- url: jdbc:mysql://127.0.0.1:3306/depository?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
+ password: 9z_Bu28r1*DZ3K6@+a #密码
+ url: jdbc:mysql://172.20.5.34:4000/depository?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
driver-class-name: com.mysql.cj.jdbc.Driver #驱动
type: com.alibaba.druid.pool.DruidDataSource
hr_new:
username: hr_new
password: AnknKiXiXaxNrw78
- url: jdbc:mysql://127.0.0.1:3306/hr_new?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
+ url: jdbc:mysql://172.20.2.87:3306/hr_new?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -72,7 +72,8 @@ spring:
static-path-pattern: /static/**
redis:
port: 6379
- host: 127.0.0.1
+ host: 172.20.5.57
+ password: Redis+brngJ3U19@8_Z2^7a
database: 5
jedis:
pool:
@@ -84,9 +85,9 @@ spring:
redisPool:
port: 6379
- host: 127.0.0.1
+ host: 172.20.5.57
dbs: 5,14,15
- password:
+ password: Redis+brngJ3U19@8_Z2^7a
mybatis-plus:
mapper-locations: classpath*:*_mapper/*Mapper.xml
diff --git a/src/main/resources/application-waiw.yml b/src/main/resources/application-waiw.yml
new file mode 100644
index 00000000..704e115f
--- /dev/null
+++ b/src/main/resources/application-waiw.yml
@@ -0,0 +1,95 @@
+#开启健康检查、审计、统计和监控，即可通过访问/actuator/beans等查看状态
+management:
+ endpoints:
+ web:
+ exposure:
+ include: beans,health
+spring:
+ mobile:
+ sitepreference:
+ enabled: true
+
+ servlet:
+ multipart:
+ enabled: true
+ max-file-size: 100MB # 单个文件上传的最大上限
+ max-request-size: 100MB # 一次请求总大小上限
+ ##数据库设置
+ datasource:
+ dynamic:
+ strict: false
+ primary: master # 配置默认数据库
+ datasource:
+ master:
+ username: depository # 用户名
+ password: NhE47edekBHxhjYk #密码
+ url: jdbc:mysql://127.0.0.1:3306/depository?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
+ driver-class-name: com.mysql.cj.jdbc.Driver #驱动
+ type: com.alibaba.druid.pool.DruidDataSource
+
+ hr_new:
+ username: hr_new
+ password: AnknKiXiXaxNrw78
+ url: jdbc:mysql://127.0.0.1:3306/hr_new?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ type: com.alibaba.druid.pool.DruidDataSource
+ druid:
+ initialSize: 5 # 初始连接数
+ minIdle: 5 # 最小空闲数
+ maxActive: 20 #最大活跃连接数
+ maxWait: 60000 #获取连接的最大等待时间（毫秒）
+ timeBetweenEvictionRunsMillis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+ minEvictableIdleTimeMillis: 300000 #配置一个连接在池中最小生存的时间，单位是毫秒
+ useGlobalDataSourceStat: true
+ testWhileIdle: true
+ testOnReturn: false
+ testOnBorrow: false
+ poolPreparedStatements: true
+ maxPoolPreparedStatementPerConnectionSize: 20
+ #配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
+ filters: stat, wall, log4j
+ connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+ #超时回收机制
+ removeAbandoned: true
+ removeAbandonedTimeout: 1800
+ logAbandoned: true
+
+
+
+
+ banner:
+ location: banner.txt
+ thymeleaf:
+ cache: false
+ mode: HTML
+ mvc:
+ hiddenmethod:
+ filter:
+ enabled: true
+ view:
+ prefix: /templates/
+ suffix: .html
+ static-path-pattern: /static/**
+ redis:
+ port: 6379
+ host: 127.0.0.1
+ database: 5
+ jedis:
+ pool:
+ min-idle: 10
+ max-idle: 20
+ max-wait: -1ms
+ max-active: 200
+ timeout: 2000ms
+
+redisPool:
+ port: 6379
+ host: 127.0.0.1
+ dbs: 5,14,15
+ password:
+
+mybatis-plus:
+ mapper-locations: classpath*:*_mapper/*Mapper.xml
+
+file:
+ uploadPath: D:/upLoad
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index abd3be29..316b50ed 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
spring:
profiles:
- active: test
+ active: prod
server:
port: 11111
\ No newline at end of file
diff --git a/src/main/resources/redisson-config.yml b/src/main/resources/redisson-config.yml
index 298c8e0a..6f2a9976 100644
--- a/src/main/resources/redisson-config.yml
+++ b/src/main/resources/redisson-config.yml
@@ -1,6 +1,8 @@
#Redisson配置
singleServerConfig:
- address: "redis://127.0.0.1:6379"
+ #address: "redis://127.0.0.1:6379" #内网,本地
+ address: "redis://172.20.5.57:6379" #外网
+ password: "Redis+brngJ3U19@8_Z2^7a" #外网
clientName: null
database: 15 #选择使用哪个数据库0~15
idleConnectionTimeout: 10000