推荐冲突解决

Administrator

2018-11-09 3831cce6dc5b5264523e7daaefb056fa3d6f6046

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

@@ -8,6 +8,7 @@


import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -19,9 +20,7 @@
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.ThreadUtil;

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONObject;



@@ -76,7 +75,9 @@
         @Override

         public void run() {

            try {

               iosPushService.addDeviceToken(null, null, acceptData.getDevice());

               if ("ios".equalsIgnoreCase(acceptData.getPlatform()))

                  iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), null,

                        acceptData.getDevice());

            } catch (Exception e) {

            }

         }