Merge remote-tracking branch 'origin/yonge' into yonge

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

@@ -8,6 +8,7 @@ import io.rong.models.message.GroupMessage;
 import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
 import io.rong.models.message.TemplateMessage;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -41,7 +42,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(content.getContent(),content.getExtra());
+        CustomMessage customMessage = new CustomMessage(StringEscapeUtils.unescapeJavaScript(content.getContent()),content.getExtra());
         customMessage.setTYPE(imGroupMessage.getType());
         groupMessage.setContent(customMessage);
         groupMessage.setTargetId(imGroupMessage.getTargetId());

mec-web/src/main/java/com/ym/mec/web/controller/education/ImController.java

@@ -2,7 +2,6 @@ package com.ym.mec.web.controller.education;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.biz.service.TeacherService;
@@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @Api(tags = "即时通讯相关服务")
 @RequestMapping("im")
 @RestController
@@ -102,5 +99,4 @@ public class ImController extends BaseController {
         sysMessageService.sendPrivateMessage(targetId,content);
         return succeed();
     }
-
 }