From 3a154bdb0a5aaa2c0ac3eac95a6ba747068bd454 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 13 一月 2026 10:00:37 +0800
Subject: [PATCH] 优化
---
server/visits/admin_timer/src/main/resources/bootstrap-dev.yml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml b/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
index 7ecec93..6164977 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,8 +22,13 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
+<<<<<<< HEAD
server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dev_renkang
+=======
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ namespace: dm_visits_test
+>>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d
username: nacos
password: nacos
--
Gitblit v1.9.3