From 78174ead3ee63e3d52c33d8c77b4dedf0957a2f9 Mon Sep 17 00:00:00 2001
From: 252535409 <252535409@qq.com>
Date: Thu, 30 Nov 2023 22:17:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/ai/service/impl/RoomServiceImpl.java  | 4 ++--
 .../system/service/impl/SysAnnouncementServiceImpl.java     | 4 ++--
 .../java/org/jeecg/modules/system/util/WebServiceUtil.java  | 6 +++---
 .../src/main/resources/application-dev.yml                  | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/RoomServiceImpl.java b/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/RoomServiceImpl.java
index b9c4229..cbea5c0 100644
--- a/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/RoomServiceImpl.java
+++ b/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/RoomServiceImpl.java
@@ -76,8 +76,8 @@ public class RoomServiceImpl extends ServiceImpl<RoomMapper, Room> implements IR
 		room.setChatModerated(0);
 		roomMapper.insert(room);
 		//生成房间地址
-		String result = WebServiceUtil.send("请求人", room.getId());
-		String roomUrl = OPENMEETINGS_URL + JSONObject.parseObject(result).getString("message");
+		String result = WebServiceUtil.send("请求人", room.getId(), OPENMEETINGS_URL);
+		String roomUrl = OPENMEETINGS_URL + "/openmeetings/hash?secure=" + JSONObject.parseObject(result).getString("message");
 		JSONObject json = new JSONObject();
 		json.put("roomUrl", roomUrl);
 		json.put("roomId", room.getId());
diff --git a/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java b/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
index c4d65ad..9267c81 100644
--- a/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
+++ b/service-management-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
@@ -132,8 +132,8 @@ public class SysAnnouncementServiceImpl extends ServiceImpl<SysAnnouncementMappe
 	public boolean saveRoomAnnouncement(Long roomId) {
 		
 		//生成房间地址
-		String result = WebServiceUtil.send("协助人", roomId);
-		String roomUrl = OPENMEETINGS_URL + JSONObject.parseObject(result).getString("message");
+		String result = WebServiceUtil.send("协助人", roomId, OPENMEETINGS_URL);
+		String roomUrl = OPENMEETINGS_URL + "/openmeetings/hash?secure=" + JSONObject.parseObject(result).getString("message");
 		SysAnnouncement sysAnnouncement = new SysAnnouncement();
 		sysAnnouncement.setTitile("远程协助请求");
 		sysAnnouncement.setMsgContent("有用户请求远程协助，请登录："+roomUrl);
diff --git a/service-management-system/src/main/java/org/jeecg/modules/system/util/WebServiceUtil.java b/service-management-system/src/main/java/org/jeecg/modules/system/util/WebServiceUtil.java
index 3fc3f3f..3dcc47e 100644
--- a/service-management-system/src/main/java/org/jeecg/modules/system/util/WebServiceUtil.java
+++ b/service-management-system/src/main/java/org/jeecg/modules/system/util/WebServiceUtil.java
@@ -18,11 +18,11 @@ public class WebServiceUtil {
 	 * @param roomId
 	 * @return
 	 */
-	public static String send(String username,Long roomId) {
+	public static String send(String username,Long roomId,String namespace) {
 		//wsdl地址
-        String url = "http://gxb.v1.idcfengye.com/openmeetings/services/ApiRoomService?wsdl";
+        String url = namespace + "/openmeetings/services/ApiRoomService?wsdl";
         //命名空间
-        String namespace = "http://gxb.v1.idcfengye.com";
+//        String namespace = "http://gxb.v1.idcfengye.com";
         //方法名
         String methodName = "getRoomUrl";
  
diff --git a/service-management-system/src/main/resources/application-dev.yml b/service-management-system/src/main/resources/application-dev.yml
index 358ea4d..e6502f5 100644
--- a/service-management-system/src/main/resources/application-dev.yml
+++ b/service-management-system/src/main/resources/application-dev.yml
@@ -114,9 +114,9 @@ spring:
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
         multi-datasource1:
-          url: jdbc:mysql://47.92.244.192:3306/openmeetings?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+          url: jdbc:mysql://47.103.213.109:3306/openmeetings?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
           username: root
-          password: Wzw7788521
+          password: Wang5322570..
           driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
@@ -261,4 +261,4 @@ aliyun:
   accessKey: 123
   accessKeySecret: 456
 message_receive_id: 1000000
-openmeetings_url: http://gxb.v1.idcfengye.com/openmeetings/hash?secure=
\ No newline at end of file
+openmeetings_url: http://gxb.v1.idcfengye.com
\ No newline at end of file