Merge remote-tracking branch 'origin/master'

admin

2018-12-05 ee26d58531067afff8e036efa93cb0d57a773250

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

@@ -6,9 +6,6 @@


import javax.annotation.Resource;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

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

@@ -17,6 +14,7 @@


import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.push.DeviceActive;

import com.yeshi.fanli.entity.push.DeviceTokenIOS;

import com.yeshi.fanli.entity.push.PushGoods;

@@ -24,7 +22,6 @@
import com.yeshi.fanli.entity.push.PushGoodsRecord;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.exception.push.PushGoodsGroupException;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

@@ -40,6 +37,9 @@
import com.yeshi.fanli.util.StringUtil;

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



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping(value = "api/v1/push")

public class PushController {