解决冲突
This commit is contained in:
parent
6a80e2be32
commit
7a652adbab
@ -680,7 +680,7 @@ public class BaseWebSocketProcess {
|
||||
BoxMessageResp boxMessageResp = new BoxMessageResp();
|
||||
BeanUtils.copyProperties(baseMessageResp, boxMessageResp);
|
||||
boxMessageResp.setAudio(s);
|
||||
sendMsg(baseSession, JSONObject.toJSONString(boxMessageResp));
|
||||
sendMsg(baseSession, JSONObject.toJSONString(boxMessageResp));======
|
||||
return s;
|
||||
}).subscribeOn(Schedulers.single()).subscribe();
|
||||
}else{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user