截止9.18开发提交合并 #9

Merged
hejinbo merged 13 commits from hjb into dev 2023-09-18 11:54:40 +00:00
2 changed files with 6 additions and 6 deletions
Showing only changes of commit 362d433bb3 - Show all commits
@@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/ruyivue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: ruyivue
password: rybackproje13689
url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false
username: root
password: root123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
@@ -18,7 +18,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口,默认为8080
port: 8080
port: 9001
servlet:
# 应用的访问路径
context-path: /
@@ -70,9 +70,9 @@ spring:
# redis 配置
redis:
# 地址
host: localhost
host: 121.40.189.20
# 端口,默认为6379
port: 6379
port: 6389
# 数据库索引
database: 0
# 密码