From ffd6563902758e7509d1acde4ad2fdf0bfd235fe Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@Admin> Date: 星期二, 20 十一月 2018 18:20:43 +0800 Subject: [PATCH] Merge branch 'master' of ssh://yujian@193.112.35.168:29418/fanli-server.git --- fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java index dba8d0c..044e7b5 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java +++ b/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; @@ -72,15 +71,17 @@ data.put("count", list.size()); data.put("systemClientParamsList", gson.toJson(list)); out.print(JsonUtil.loadTrueResult(data)); - ThreadUtil.run(new Runnable() { - @Override - public void run() { - try { - iosPushService.addDeviceToken(null, null, acceptData.getDevice()); - } catch (Exception e) { - } - } - }); +// ThreadUtil.run(new Runnable() { +// @Override +// public void run() { +// try { +// if ("ios".equalsIgnoreCase(acceptData.getPlatform())) +// iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), null, +// acceptData.getDevice()); +// } catch (Exception e) { +// } +// } +// }); return; } -- Gitblit v1.8.0