From 487b1dc8238ed08eb8b4a6e107a33fb5ce727257 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 19 Oct 2023 15:54:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B0=83=E7=94=A8=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E8=AF=AD=E9=9F=B3=E5=90=88=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/handler/BaseWebSocketProcess.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java index 3a0a6a6..e0e1d7e 100644 --- a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java +++ b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java @@ -709,22 +709,25 @@ public class BaseWebSocketProcess { } private void sendMsg(BaseSession baseSession, BaseMessageResp baseMessageResp) { - String msg = JSONObject.toJSONString(baseMessageResp); - log.info("推到终端：{},SN:{},userId:{}，消息内容：{}", baseSession.getSessionType(), baseSession.getSn(), baseSession.getUserId(), msg); - if(this instanceof BoxWebSocketHandler){ + + sendMsg(baseSession, JSONObject.toJSONString(baseMessageResp)); + /* if(this instanceof BoxWebSocketHandler){ audioService.getAudioUrl(baseMessageResp.getText()).map(s ->{ log.info("音频地址：{}", s); BoxMessageResp boxMessageResp = new BoxMessageResp(); BeanUtils.copyProperties(baseMessageResp, boxMessageResp); boxMessageResp.setAudio(s); - baseSession.getSink().next(baseSession.getSession().textMessage(JSONObject.toJSONString(boxMessageResp))); + sendMsg(baseSession, JSONObject.toJSONString(boxMessageResp)); return s; - }).subscribe(); + }).subscribeOn(Schedulers.single()).subscribe(); }else{ - baseSession.getSink().next(baseSession.getSession().textMessage(msg)); - } - + sendMsg(baseSession, JSONObject.toJSONString(baseMessageResp)); + }*/ + } + private void sendMsg(BaseSession baseSession, String msg) { + log.info("推到终端：{},SN:{},userId:{}，消息内容：{}", baseSession.getSessionType(), baseSession.getSn(), baseSession.getUserId(), msg); + baseSession.getSink().next(baseSession.getSession().textMessage(msg)); } public BoxSession getBoxSessionWithSn(String sn) {