From 9289aa181144778637d18a3f727663a10b5195cc Mon Sep 17 00:00:00 2001
From: zhangf <1603559716@qq.com>
Date: 星期一, 24 六月 2024 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/master' into zf1
---
ruoyi-admin/src/main/resources/application-pro.yml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-pro.yml b/ruoyi-admin/src/main/resources/application-pro.yml
index 509abe4..4f4b79d 100644
--- a/ruoyi-admin/src/main/resources/application-pro.yml
+++ b/ruoyi-admin/src/main/resources/application-pro.yml
@@ -24,9 +24,9 @@
druid:
# 主库数据源
master:
- url: jdbc:mysql://192.168.30.118:3306/swspkmas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:7006/swspkmas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: e7be93ef5413e5ed
+ password: 2farwL3yPXfbH2AP
# 从库数据源
slave:
# 从数据源开关/默认关闭
@@ -87,7 +87,7 @@
# 数据库索引
database: 5
# 密码
- password: gkhy@202306
+ password: akj78avauba789a
# 连接超时时间
timeout: 10s
lettuce:
--
Gitblit v1.9.2