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 | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/MessagePushTravel/src/main/resources/application.yml b/MessagePushTravel/src/main/resources/application.yml
index 05ef1b6..9cee63e 100644
--- a/MessagePushTravel/src/main/resources/application.yml
+++ b/MessagePushTravel/src/main/resources/application.yml
@@ -2,7 +2,8 @@
port: 6000
spring:
profiles:
- active: prod
+ active: dev
+# active: prod
application:
name: message #服务名称
servlet:
@@ -10,11 +11,14 @@
max-request-size: 100MB
max-file-size: 100MB
redis:
- 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
+ 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