From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_admin/src/main/resources/bootstrap.yml | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
index 7b33fd2..d788ad7 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
@@ -1,21 +1,36 @@
spring:
+ application:
+ name: meetingAdmin
cloud:
+ loadbalancer:
+ enabled: true
+ nacos:
+ # 浣跨敤Nacos璐熻浇绛栫暐锛屽紑鍙戠幆澧冨彲浠ュ埄鐢ㄥ氨杩戣闂満鍒跺畾鍚戣闂紝鍚姩鍙傛暟濡備笅锛�
+ # -Dspring.cloud.nacos.discovery.cluster-name=鑷畾涔�
+ enabled: true
+ cache:
+ # 鏆傛椂鍏抽棴缂撳瓨
+ enabled: false
nacos:
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ username: nacos
+ password: nacos
config:
- file-extension: yaml
- server-addr: 175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
- namespace: 52cba45d-024b-47ce-89f5-e0ef2c948b7b
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ namespace: dmvisit
username: nacos
- passward: doumee@168
- context-path: /nacos
- group: MEETING_GROUP
- ext-confi[0]:
- data-id: com.doumee.meeting
- group: MEETING_GROUP
- refresh: true
+ password: nacos
+# file-extension: yaml
+# group: dev
+# data-id: com.doumee.meeting.admin
discovery:
- server-addr: 175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
- namespace: 52cba45d-024b-47ce-89f5-e0ef2c948b7b
+ server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ namespace: dmvisit
username: nacos
- passward: doumee@168
- group: MEETING_GROUP
+ password: nacos
+ # 瀹夊叏閰嶇疆
+ security:
+ # 楠岀鍏挜鍦板潃
+ oauth2:
+ authorizationserver:
+ token-uri: http://
--
Gitblit v1.9.3