From 08b8d9a50c200e740e9e0a28e7627147c892dfc0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 21 三月 2025 21:52:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing

---
 UserOKTravel/guns-admin/src/main/resources/application.yml  |    2 +-
 UserOKTravel/guns-admin/src/main/resources/redis.properties |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/UserOKTravel/guns-admin/src/main/resources/application.yml b/UserOKTravel/guns-admin/src/main/resources/application.yml
index 705ca18..3864bd7 100644
--- a/UserOKTravel/guns-admin/src/main/resources/application.yml
+++ b/UserOKTravel/guns-admin/src/main/resources/application.yml
@@ -122,7 +122,7 @@
 #正式环境
 callbackPath: https://xn95128.cn/user
 #测试环境
-#callbackPath: https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/user
+#callbackPath: http://139.9.249.67:80/user
 
 
 ---
diff --git a/UserOKTravel/guns-admin/src/main/resources/redis.properties b/UserOKTravel/guns-admin/src/main/resources/redis.properties
index 75c3f74..830c9ce 100644
--- a/UserOKTravel/guns-admin/src/main/resources/redis.properties
+++ b/UserOKTravel/guns-admin/src/main/resources/redis.properties
@@ -7,8 +7,7 @@
 spring.redis.port=6379
 # Redis�������������루Ĭ��Ϊ�գ�
 spring.redis.password=XianNing@2024!
-#spring.redis.password=123456
-
+#spring.redis.password=
 # ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
 spring.redis.jedis.pool.max-active=1024
 # ���ӳ���������ȴ�ʱ�䣨ʹ�ø�ֵ��ʾû�����ƣ�

--
Gitblit v1.7.1