Merge remote-tracking branch 'origin/master'

admin

2019-03-14 eed607d87b2eee1f09b4a28da614f3ad0b46601d

 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java

@@ -9,12 +9,13 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;

import com.yeshi.fanli.entity.bus.msg.UserSystemMsgTypeEnum;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;

import com.yeshi.fanli.service.inter.push.PushRecordService;

import com.yeshi.fanli.service.inter.push.PushService;

@@ -22,9 +23,6 @@
import com.yeshi.fanli.service.inter.user.SystemZnxService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.IOSPushFactory;



import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONObject;



@@ -51,9 +49,6 @@


   @Resource

   private AccountMessageService accountMessageService;



   @Resource

   private SystemService systemService;



   @Resource

   private PushService pushService;