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/service/impl/push/IOSPushServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
index 1b8730b..e4111ec 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
@@ -241,7 +241,7 @@
@Override
public void addDeviceToken(Long uid, int version, String deviceToken, String device) {
// 濡傛灉device涓虹┖灏辫繑鍥�
- if (StringUtil.isNullOrEmpty(device))
+ if (StringUtil.isNullOrEmpty(device) || StringUtil.isNullOrEmpty(deviceToken))
return;
// 鍒ゆ柇device鏄惁瀛樺湪
@@ -252,6 +252,7 @@
deviceTokenIos.setUpdateTime(new Date());
deviceTokenIos.setDevice(device);
deviceTokenIos.setDeviceToken(deviceToken);
+ deviceTokenIos.setDeviceTokenMd5(StringUtil.Md5(deviceToken));
deviceTokenIos.setUid(uid);
deviceTokenIos.setVersion(version);
deviceTokenIOSMapper.insertSelective(deviceTokenIos);
@@ -288,8 +289,8 @@
}
@Override
- public DeviceTokenIOS getDeviceTokenByDevice(String device) {
- return deviceTokenIOSMapper.selectByDevice(device);
+ public DeviceTokenIOS getDeviceTokenByDeviceToken(String deviceToken) {
+ return deviceTokenIOSMapper.selectByDeviceToken(deviceToken);
}
/**
--
Gitblit v1.8.0