同步代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/MessageServiceImpl.java

@@ -65,6 +65,7 @@ import com.yeejoin.amos.patrol.email.IEmailService;
 import com.yeejoin.amos.patrol.feign.PushFeignServer;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import com.yeejoin.amos.patrol.jpush.AppMessagePushService;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
 
@@ -324,7 +325,13 @@ public class MessageServiceImpl implements IMessageService {
 
 	@Override
 	public Msg pushMsgAndSave(String toke,String product,String appKey,Msg msg) {
-		List<PushMsgParam> pmps = new ArrayList<PushMsgParam>();
+		//List<PushMsgParam> pmps = new ArrayList<PushMsgParam>();
+		if(toke!=null){
+			RequestContext.setToken(toke);
+			RequestContext.setProduct(product);
+			RequestContext.setAppKey(appKey);
+		}
+
 		PushMsgParam pushMsg = new PushMsgParam();
 		pushMsg.setRecivers(Arrays.asList(msg.getUserId()));
 		pushMsg.setContent(ObjectUtils.isEmpty(msg.getPushBody()) ? msg.getBody() : msg.getPushBody());
@@ -335,10 +342,10 @@ public class MessageServiceImpl implements IMessageService {
 		extras.put("type",msg.getMsgType());
 		extras.put("id",msg.getRelationId()==null?"0":msg.getRelationId().toString());
 		pushMsg.setExtras(extras);
-		pmps.add(pushMsg);
+		//pmps.add(pushMsg);
 		msg.setSendTime(new Date());
 		msg.setStatus(1);
-		pushFeignServer.sendMessage(pmps);
+		pushFeignServer.sendMessage(pushMsg);
 		iMsgDao.save(msg);
 		return msg;
 	}