Commit 18dfb4b1 authored by 王飞's avatar 王飞

Merge branch 'wangfei' into 'dev'

1、配置新测试环境的相关地址与端口

See merge request !351
parents c30cdd26 02e631a6
...@@ -6,16 +6,16 @@ spring: ...@@ -6,16 +6,16 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://49.232.167.247:22030/vehicle-quality-review?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&sessionVariables=group_concat_max_len=3000 url: jdbc:mysql://106.3.99.64:20011/vehicle-quality-review?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&sessionVariables=group_concat_max_len=3000
username: root username: root
password: 1qaz@WSX password: 1qaz@WSX
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭
enabled: false enabled: false
url: url:
username: username:
password: password:
# 初始连接数 # 初始连接数
initialSize: 5 initialSize: 5
# 最小连接池数量 # 最小连接池数量
...@@ -39,7 +39,7 @@ spring: ...@@ -39,7 +39,7 @@ spring:
testWhileIdle: true testWhileIdle: true
testOnBorrow: false testOnBorrow: false
testOnReturn: false testOnReturn: false
webStatFilter: webStatFilter:
enabled: true enabled: true
statViewServlet: statViewServlet:
enabled: true enabled: true
...@@ -58,4 +58,4 @@ spring: ...@@ -58,4 +58,4 @@ spring:
merge-sql: true merge-sql: true
wall: wall:
config: config:
multi-statement-allow: true multi-statement-allow: true
\ No newline at end of file
...@@ -18,7 +18,7 @@ ruoyi: ...@@ -18,7 +18,7 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口,默认为8080 # 服务器的HTTP端口,默认为8080
port: 22032 port: 22016
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
...@@ -70,9 +70,9 @@ spring: ...@@ -70,9 +70,9 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: 49.232.167.247 host: 106.3.99.64
# 端口,默认为6379 # 端口,默认为6379
port: 22031 port: 22012
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 # 密码
...@@ -146,7 +146,7 @@ xss: ...@@ -146,7 +146,7 @@ xss:
urlPatterns: /* urlPatterns: /*
minio: minio:
url: http://49.232.167.247:22038 url: http://106.3.99.64:22013
accessKey: lB7WhZYiQwLzhHPutRGn accessKey: lB7WhZYiQwLzhHPutRGn
secretKey: 7XMWpLm6p4d20OFe9uXKifEyhF3cp4sTCowI2fhJ secretKey: 7XMWpLm6p4d20OFe9uXKifEyhF3cp4sTCowI2fhJ
bucketName: vehicle-quality-review-oss bucketName: vehicle-quality-review-oss
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment