From a289e87cbc8862a105d230989cab43732194d50e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 16 七月 2025 16:25:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
index 60c4fde..28e831b 100644
--- a/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
@@ -64,7 +64,8 @@
# username: nacos
# password: nacos
# 生产环境
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
+# server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ server-addr: 192.168.0.123:8848
namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
data-id: seata-server.properties
@@ -81,7 +82,8 @@
# username: nacos
# password: nacos
# 生产环境
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
+# server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ server-addr: 192.168.0.123:8848
namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
username: nacos
@@ -97,7 +99,8 @@
# username: nacos
# password: nacos
# 生产环境
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
+# server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ server-addr: 192.168.0.123:8848
namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
@@ -116,7 +119,8 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
+# server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ server-addr: 192.168.0.123:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
@@ -124,7 +128,8 @@
password: nacos
config:
# 配置中心地址
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
+# server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ server-addr: 192.168.0.123:8848
namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
username: nacos
password: nacos
--
Gitblit v1.7.1