From 647381956de136a65f752a8069d6fe4821db1621 Mon Sep 17 00:00:00 2001
From: republicline <1464474399@qq.com>
Date: Tue, 15 Oct 2024 14:41:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E5=AE=A4=E7=9A=84token=E6=A0=A1=E9=AA=8C,=20=E8=87=AA=E7=94=B1?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/rax/vital/v1/config/WebSocketConfig.java | 4 ++--
 .../vital/v1/medicine/service/impl/ChatServiceImpl.java    | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/upms/upms-biz/src/main/java/com/rax/vital/v1/config/WebSocketConfig.java b/upms/upms-biz/src/main/java/com/rax/vital/v1/config/WebSocketConfig.java
index 39489c4..027bfcd 100644
--- a/upms/upms-biz/src/main/java/com/rax/vital/v1/config/WebSocketConfig.java
+++ b/upms/upms-biz/src/main/java/com/rax/vital/v1/config/WebSocketConfig.java
@@ -24,8 +24,8 @@ public class WebSocketConfig implements WebSocketConfigurer {
 				.addHandler(chatHandler(), "/rax/chatRoom")
 				.addHandler(addMedicineHandler(), "/rax/addMedicine")
 				.addHandler(machineFeedbackHandler(),"/rax/getMedicine")
-				.addInterceptors(new HttpSessionHandshakeInterceptor())
-				.addInterceptors(webSocketInterceptors())
+//				.addInterceptors(new HttpSessionHandshakeInterceptor())
+//				.addInterceptors(webSocketInterceptors())
 				.setAllowedOrigins("*");
 	}
 
diff --git a/upms/upms-biz/src/main/java/com/rax/vital/v1/medicine/service/impl/ChatServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/vital/v1/medicine/service/impl/ChatServiceImpl.java
index b077029..94c123b 100644
--- a/upms/upms-biz/src/main/java/com/rax/vital/v1/medicine/service/impl/ChatServiceImpl.java
+++ b/upms/upms-biz/src/main/java/com/rax/vital/v1/medicine/service/impl/ChatServiceImpl.java
@@ -25,6 +25,7 @@ import java.io.IOException;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -44,6 +45,8 @@ public class ChatServiceImpl implements ChatService {
 
 	private static final Map<String, String> sessionDatabaseMap = new ConcurrentHashMap<>();
 
+
+
 	// MongoDB的地址
 	@Value("${vital-sign.mongodb.host}")
 	private String mongoDBHost;
@@ -158,6 +161,8 @@ public class ChatServiceImpl implements ChatService {
 		CustomDataSource dataSource = datasourceMap.get(session.getId());
 //		String databaseName = patientName + idNum;
 		String databaseName = idNum;
+
+
 		ArrayList<Map> history = new ArrayList<>();
 
 		if (dataSource == null) {
@@ -177,6 +182,8 @@ public class ChatServiceImpl implements ChatService {
 					}
 				}
 
+
+
 				String sql = "select content, create_time \"creatTime\", create_user \"createUser\", create_name \"createName\" from t_chat where deleted = 0 and revoked = 0 order by create_time asc ";
 				Connection connection = dataSource.getConnection();
 				try {