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 |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 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 d1f71ac..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
@@ -71,16 +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, Integer.parseInt(acceptData.getVersion()), 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