From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceTokenHWServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceTokenHWServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceTokenHWServiceImpl.java
index 5b03516..49d8ca9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceTokenHWServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceTokenHWServiceImpl.java
@@ -43,6 +43,7 @@
DeviceTokenHW deviceTokenHW = new DeviceTokenHW();
deviceTokenHW.setDevice(device);
deviceTokenHW.setDeviceToken(token);
+ deviceTokenHW.setDeviceTokenMd5(StringUtil.Md5(token));
deviceTokenHW.setUpdateTime(new Date());
if (uid != null)
deviceTokenHW.setUser(new UserInfo(uid));
@@ -51,8 +52,10 @@
for (DeviceTokenHW deviceTokenHW : list) {
DeviceTokenHW update = new DeviceTokenHW();
update.setId(deviceTokenHW.getId());
- if (!StringUtil.isNullOrEmpty(token))
+ if (!StringUtil.isNullOrEmpty(token)) {
update.setDeviceToken(token);
+ update.setDeviceTokenMd5(StringUtil.Md5(token));
+ }
update.setUpdateTime(new Date());
if (uid != null)
update.setUser(new UserInfo(uid));
@@ -80,4 +83,9 @@
}
}
+ @Override
+ public void bindUid(String device, Long uid) {
+ deviceTokenHWMapper.bindUidByDevice(uid, device);
+ }
+
}
--
Gitblit v1.8.0