|
@@ -2,7 +2,7 @@ spring:
|
|
|
application:
|
|
|
name: szwl-server
|
|
|
profiles:
|
|
|
- # 打包时,换这里:sit测试,prod正式
|
|
|
+ # 打包或运行时,换这里:sit测试,prod正式
|
|
|
active: sit
|
|
|
cloud:
|
|
|
config:
|
|
@@ -78,12 +78,7 @@ spring:
|
|
|
username: root
|
|
|
password: sunzee@020
|
|
|
driver-class-name: com.mysql.jdbc.Driver
|
|
|
-#redis配置
|
|
|
- redis:
|
|
|
- database: 0
|
|
|
- host: 120.25.151.99 # Redis服务器地址
|
|
|
- port: 63790 # Redis服务器连接端口
|
|
|
- password: # Redis服务器连接密码(默认为空)
|
|
|
+
|
|
|
#注册中心
|
|
|
eureka:
|
|
|
client:
|
|
@@ -92,10 +87,10 @@ eureka:
|
|
|
register-with-eureka: true
|
|
|
instance:
|
|
|
prefer-ip-address: true
|
|
|
- # ip-address: 10.241.20.241
|
|
|
+ # ip-address: 120.25.151.99
|
|
|
|
|
|
---
|
|
|
-#正式环境
|
|
|
+##正式环境
|
|
|
spring:
|
|
|
profiles: prod
|
|
|
#数据库配置
|
|
@@ -104,25 +99,7 @@ spring:
|
|
|
username: root
|
|
|
password: sunzee@020
|
|
|
driver-class-name: com.mysql.jdbc.Driver
|
|
|
- #redis配置
|
|
|
- redis:
|
|
|
- cluster:
|
|
|
- # 连接超时时间(毫秒)
|
|
|
- timeout: 50000
|
|
|
- #设置命令的执行时间,如果超过这个时间,则报错
|
|
|
- commandTimeout: 50000
|
|
|
- #集群配置
|
|
|
- nodes: 10.0.0.153:7000,10.0.0.153:7001,10.0.0.152:7001,10.0.0.152:7000,10.0.0.155:7001,10.0.0.155:7000
|
|
|
- # nodes: 47.112.127.131:7000,47.112.127.131:7001,112.74.63.148:7001,112.74.63.148:7000,120.78.140.173:7001,120.78.140.173:7000
|
|
|
- pool:
|
|
|
- # 连接池最大连接数(使用负值表示没有限制)
|
|
|
- max-active: 5000
|
|
|
- # 连接池最大阻塞等待时间(使用负值表示没有限制)
|
|
|
- max-wait: 2000
|
|
|
- # 连接池中的最大空闲连接
|
|
|
- max-idle: 500
|
|
|
- # 连接池中的最小空闲连接
|
|
|
- min-idle: 5
|
|
|
+
|
|
|
#注册中心
|
|
|
eureka:
|
|
|
client:
|
|
@@ -131,7 +108,6 @@ eureka:
|
|
|
register-with-eureka: true
|
|
|
instance:
|
|
|
prefer-ip-address: true
|
|
|
- # ip-address: 10.241.20.241
|
|
|
|
|
|
|
|
|
|