From 946a4e49da29d0237dc75fb8729d69ede21f6cba Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 23 四月 2024 10:40:36 +0800
Subject: [PATCH] 最新版本
---
server/pom.xml | 6 ------
server/meeting/meeting_admin/src/main/resources/bootstrap.yml | 19 +++++++++++++++----
server/meeting/meeting_admin/src/main/resources/application.yml | 1 +
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/application.yml b/server/meeting/meeting_admin/src/main/resources/application.yml
index fc5f22a..5ed0488 100644
--- a/server/meeting/meeting_admin/src/main/resources/application.yml
+++ b/server/meeting/meeting_admin/src/main/resources/application.yml
@@ -11,6 +11,7 @@
profiles:
active: dev
+
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
index 7b33fd2..818eee0 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
@@ -1,14 +1,26 @@
spring:
cloud:
+ loadbalancer:
+ enabled: true
+ nacos:
+ # 浣跨敤Nacos璐熻浇绛栫暐锛屽紑鍙戠幆澧冨彲浠ュ埄鐢ㄥ氨杩戣闂満鍒跺畾鍚戣闂紝鍚姩鍙傛暟濡備笅锛�
+ # -Dspring.cloud.nacos.discovery.cluster-name=鑷畾涔�
+ enabled: true
+ cache:
+ # 鏆傛椂鍏抽棴缂撳瓨
+ enabled: false
nacos:
+ server-addr: 175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ username: nacos
+ passward: nacos
config:
file-extension: yaml
server-addr: 175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
namespace: 52cba45d-024b-47ce-89f5-e0ef2c948b7b
username: nacos
- passward: doumee@168
+ passward: nacos
context-path: /nacos
- group: MEETING_GROUP
+ group: DEFAULT_GROUP
ext-confi[0]:
data-id: com.doumee.meeting
group: MEETING_GROUP
@@ -17,5 +29,4 @@
server-addr: 175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
namespace: 52cba45d-024b-47ce-89f5-e0ef2c948b7b
username: nacos
- passward: doumee@168
- group: MEETING_GROUP
+ passward: nacos
diff --git a/server/pom.xml b/server/pom.xml
index 16e31aa..ac240d2 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -278,12 +278,6 @@
<artifactId>javase</artifactId>
<version>3.3.0</version>
</dependency>
- <!-- 娴峰悍绯荤粺 -->
- <dependency>
- <groupId>com.hikvision.ga</groupId>
- <artifactId>artemis-http-client</artifactId>
- <version>1.1.3</version>
- </dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
--
Gitblit v1.9.3