From 06a7debe678e7ae30f39c61a7f71a926d52d1ae7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 13 十一月 2018 10:26:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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..37754b7 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;
@@ -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) {
}
}
--
Gitblit v1.8.0