|
@@ -1,8 +1,6 @@
|
|
|
package com.ym.controller;
|
|
package com.ym.controller;
|
|
|
|
|
|
|
|
-import com.ym.mec.common.entity.ImGroupMessage;
|
|
|
|
|
-import com.ym.mec.common.entity.ImPrivateMessage;
|
|
|
|
|
-import com.ym.mec.common.entity.ImTxtMessage;
|
|
|
|
|
|
|
+import com.ym.mec.common.entity.*;
|
|
|
import com.ym.pojo.CustomMessage;
|
|
import com.ym.pojo.CustomMessage;
|
|
|
import com.ym.service.MessageService;
|
|
import com.ym.service.MessageService;
|
|
|
import io.rong.messages.TxtMessage;
|
|
import io.rong.messages.TxtMessage;
|
|
@@ -10,6 +8,7 @@ import io.rong.models.message.GroupMessage;
|
|
|
import io.rong.models.message.PrivateMessage;
|
|
import io.rong.models.message.PrivateMessage;
|
|
|
import io.rong.models.message.RecallMessage;
|
|
import io.rong.models.message.RecallMessage;
|
|
|
import io.rong.models.message.TemplateMessage;
|
|
import io.rong.models.message.TemplateMessage;
|
|
|
|
|
+import org.apache.commons.lang.StringEscapeUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -43,7 +42,7 @@ public class PrivateController {
|
|
|
public Object sendCustom(@RequestBody ImGroupMessage imGroupMessage) throws Exception {
|
|
public Object sendCustom(@RequestBody ImGroupMessage imGroupMessage) throws Exception {
|
|
|
GroupMessage groupMessage = new GroupMessage();
|
|
GroupMessage groupMessage = new GroupMessage();
|
|
|
ImTxtMessage content = (ImTxtMessage)imGroupMessage.getContent();
|
|
ImTxtMessage content = (ImTxtMessage)imGroupMessage.getContent();
|
|
|
- CustomMessage customMessage = new CustomMessage(content.getContent(),content.getExtra());
|
|
|
|
|
|
|
+ CustomMessage customMessage = new CustomMessage(StringEscapeUtils.unescapeJavaScript(content.getContent()),content.getExtra());
|
|
|
customMessage.setTYPE(imGroupMessage.getType());
|
|
customMessage.setTYPE(imGroupMessage.getType());
|
|
|
groupMessage.setContent(customMessage);
|
|
groupMessage.setContent(customMessage);
|
|
|
groupMessage.setTargetId(imGroupMessage.getTargetId());
|
|
groupMessage.setTargetId(imGroupMessage.getTargetId());
|
zouxuan