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 |    5 +++--
 1 files changed, 3 insertions(+), 2 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..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
@@ -75,8 +75,9 @@
 			@Override
 			public void run() {
 				try {
-					iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), 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