From 1b77c2724e38d087f3eab4a2f27b3b165f4265dc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 25 五月 2026 14:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide
---
src/main/resources/application-safe.yml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-safe.yml
similarity index 94%
rename from src/main/resources/application-dev.yml
rename to src/main/resources/application-safe.yml
index 7d75a06..d157f70 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-safe.yml
@@ -1,7 +1,7 @@
-# 鑺-浠撳偍鐗╂祦绯荤粺椤圭洰鐩稿叧閰嶇疆
+# 鑺-瀹夌幆绠＄悊绯荤粺椤圭洰鐩稿叧閰嶇疆
inspur:
- appId: 1205971611543404544
- appSecret: VkyDMDYwMTIwMjYxNzQxNDM2OTItrv
+ appId: 1256286436366221312
+ appSecret: yG7DMjUwNTIwMjYxMzU0NTI3MzQrn8
ruoyi:
# 鍚嶇О
name: RuoYi
@@ -65,7 +65,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://localhost:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://172.17.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
# 浠庡簱鏁版嵁婧�
@@ -137,14 +137,14 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 172.17.0.1
# host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
- password:
+ password: zttZTT123!
# password: 123456
# 杩炴帴瓒呮椂鏃堕棿
--
Gitblit v1.9.3