Merge branch 'master' of http://git.justh5.com/deepseek/deep-ask

# Conflicts:
#	src/main/java/admin/server/VoiceWebSocketServer.java

src/main/java/admin/server/VoiceWebSocketServer.java

@@ -104,6 +104,8 @@ public class VoiceWebSocketServer {
     public void onTextMessage(Session session,String message) throws IOException {
 //        session.setMaxBinaryMessageBufferSize(50 * 1024 * 1024);
         log.info("message:{}",message);
+        @SuppressWarnings({"unchecked"})
+        Map<String,Object> map = JSON.parseObject(message,Map.class);
         WebSocketModel webSocketModel = JSON.parseObject(message,WebSocketModel.class);
         //1.如果问题不存在则创建问题
         ChatgptRoleSession byId = chatgptRoleSessionService.getById(webSocketModel.getSessionId());
@@ -123,10 +125,16 @@ public class VoiceWebSocketServer {
             chatgptRoleRecordsService.save(chatgptRoleRecords);
         }
         String msg = "";
+        // 文字聊天
+        if("sendText".equals(map.get("action"))){
+             msg = (String)map.get("data");
         if("sendText".equals(webSocketModel.getAction())){
              msg = webSocketModel.getData();
         }
-        maxkbOpenApiService.talk(message,session);
+        if(msg != null && !msg.isEmpty()){
+            maxkbOpenApiService.talk(msg,session);
+        }
+
     }
 
 //    @OnMessage