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) {