|  | @@ -1,7 +1,8 @@
 | 
	
		
			
				|  |  |  package com.ym.controller;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -import com.alibaba.fastjson.JSON;
 | 
	
		
			
				|  |  | -import com.ym.mec.common.entity.*;
 | 
	
		
			
				|  |  | +import com.ym.mec.common.entity.ImGroupMessage;
 | 
	
		
			
				|  |  | +import com.ym.mec.common.entity.ImPrivateMessage;
 | 
	
		
			
				|  |  | +import com.ym.mec.common.entity.ImTxtMessage;
 | 
	
		
			
				|  |  |  import com.ym.pojo.CustomMessage;
 | 
	
		
			
				|  |  |  import com.ym.service.MessageService;
 | 
	
		
			
				|  |  |  import io.rong.messages.TxtMessage;
 | 
	
	
		
			
				|  | @@ -9,7 +10,6 @@ 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;
 | 
	
	
		
			
				|  | @@ -43,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(JSON.parseObject(content.getContent()),content.getExtra());
 | 
	
		
			
				|  |  | +        CustomMessage customMessage = new CustomMessage(content.getContent(),content.getExtra());
 | 
	
		
			
				|  |  |          customMessage.setTYPE(imGroupMessage.getType());
 | 
	
		
			
				|  |  |          groupMessage.setContent(customMessage);
 | 
	
		
			
				|  |  |          groupMessage.setTargetId(imGroupMessage.getTargetId());
 |