zouxuan 5 vuotta sitten
vanhempi
commit
862ffa7c0b

+ 2 - 1
mec-im/src/main/java/com/ym/controller/PrivateController.java

@@ -1,5 +1,6 @@
 package com.ym.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.ym.mec.common.entity.*;
 import com.ym.pojo.CustomMessage;
 import com.ym.service.MessageService;
@@ -42,7 +43,7 @@ public class PrivateController {
     public Object sendCustom(@RequestBody ImGroupMessage imGroupMessage) throws Exception {
         GroupMessage groupMessage = new GroupMessage();
         ImTxtMessage content = (ImTxtMessage)imGroupMessage.getContent();
-        CustomMessage customMessage = new CustomMessage(StringEscapeUtils.unescapeJavaScript(content.getContent()),content.getExtra());
+        CustomMessage customMessage = new CustomMessage(JSON.parseObject(content.getContent()),content.getExtra());
         customMessage.setTYPE(imGroupMessage.getType());
         groupMessage.setContent(customMessage);
         groupMessage.setTargetId(imGroupMessage.getTargetId());

+ 2 - 1
mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -1,5 +1,6 @@
 package com.ym.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.common.ApiException;
 import com.ym.common.BaseResponse;
@@ -59,7 +60,7 @@ public class RoomController{
         }
 //        roomService.sendImPlayMidiMessage(playMidiMessageData);
         GroupMessage groupMessage = new GroupMessage();
-        CustomMessage customMessage = new CustomMessage(playMidiMessageData.getContent(),null);
+        CustomMessage customMessage = new CustomMessage(JSON.parseObject(playMidiMessageData.getContent()),null);
         customMessage.setTYPE("DY:PlayMidiMessage");
         groupMessage.setContent(customMessage);
         groupMessage.setTargetId(playMidiMessageData.getRoomId().split(","));

+ 4 - 4
mec-im/src/main/java/com/ym/pojo/CustomMessage.java

@@ -4,11 +4,11 @@ import com.alibaba.fastjson.JSONObject;
 import io.rong.messages.BaseMessage;
 
 public class CustomMessage extends BaseMessage {
-    private String content = "";
+    private JSONObject content;
     private String extra = "";
     private String TYPE = "";
 
-    public CustomMessage(String content, String extra) {
+    public CustomMessage(JSONObject content, String extra) {
         this.content = content;
         this.extra = extra;
     }
@@ -21,11 +21,11 @@ public class CustomMessage extends BaseMessage {
         return TYPE;
     }
 
-    public String getContent() {
+    public JSONObject getContent() {
         return this.content;
     }
 
-    public void setContent(String content) {
+    public void setContent(JSONObject content) {
         this.content = content;
     }