From a139dba9262dbb4b70f34d3c2034c255561abcad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 18:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 MessagePushTravel/src/main/resources/application.yml |   41 +++++++++++++----------------------------
 1 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/MessagePushTravel/src/main/resources/application.yml b/MessagePushTravel/src/main/resources/application.yml
index 17d9797..9cee63e 100644
--- a/MessagePushTravel/src/main/resources/application.yml
+++ b/MessagePushTravel/src/main/resources/application.yml
@@ -2,38 +2,23 @@
   port: 6000
 spring:
   profiles:
-    active: prod
+    active: dev
+#    active: prod
   application:
     name: message #服务名称
   servlet:
     multipart:
       max-request-size: 100MB
       max-file-size: 100MB
-  data:
-    redis:
-      host: 172.21.35.151
-      database: 0
-      password: SC_cache@20#25
-      time-out: 1000
-      # 集群节点
-      cluster:
-        nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513
-        # 重定向最大次数
-        max-redirects: 3
-      lettuce:
-        cluster:
-          refresh:
-            # 集群拓扑自适应刷新
-            adaptive: true
-            # 集群拓扑刷新周期 毫秒
-            period: 3000
-        pool:
-          # 最大链接数量
-          max-active: 100
-          # 最大阻塞时间 负数没有限制
-          max-wait: -1
-          # 最大空闲链接
-          max-idle: 10
-          # 最小空闲链接
-          min-idle: 0
+  redis:
+    host: 192.168.110.80
+    port: 6379
+    password: 123456
+#    host: 172.21.35.151
+#    port: 6512
+#    password: SC_cache@20#25
+#    database: 0
+#    timeout: 1000
+#    cluster:
+#      nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513
 

--
Gitblit v1.7.1