From e257a2834bf7b62af5c5c96f9b0b21fac92f2196 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 24 七月 2021 18:31:02 +0800
Subject: [PATCH] jumpdetail分system
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
index b4e9fc7..42b5dfd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
@@ -2,6 +2,7 @@
import com.alipay.api.AlipayApiException;
import com.google.gson.Gson;
+import com.ks.push.service.BDeviceTokenService;
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.*;
@@ -31,6 +32,9 @@
import com.yeshi.fanli.util.wx.MyWXLoginUtil;
import com.yeshi.fanli.vo.user.QQUserInfoVO;
import net.sf.json.JSONObject;
+import org.apache.dubbo.config.annotation.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -54,6 +58,8 @@
@Controller
@RequestMapping("api/v1/user")
public class UserAccountController {
+
+ private Logger logger = LoggerFactory.getLogger(UserAccountController.class);
@Resource
private UserInfoService userInfoService;
@@ -120,6 +126,10 @@
@Resource
private DeviceActiveService deviceActiveService;
+
+
+ @Reference(version = "1.0", check = false)
+ private BDeviceTokenService bDeviceTokenService;
private BusinessSystem getSystem(AcceptData acceptData) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
@@ -1056,16 +1066,27 @@
return;
if ("android".equalsIgnoreCase(acceptData.getPlatform())) {
DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
- // 闇�瑕佽В缁慔W鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
- deviceTokenHWService.unBindDeviceToken(acceptData.getDevice());
- if (deviceActive != null) {
- // 瑙ｇ粦OPPO鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
- deviceTokenOPPOService.unBindUid(uid, deviceActive.getId());
- // 瑙ｇ粦VIVO鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
- deviceTokenVIVOService.unBindUid(uid, deviceActive.getId());
- // 瑙ｇ粦XM鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
- deviceTokenXMService.unBindUid(deviceActive.getId());
+
+ //鏂扮増鎺ㄩ�佽В缁�
+ if (acceptData.getSystem().isNewPush()) {
+ try {
+ bDeviceTokenService.unBindUid(acceptData.getSystem().name(), StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid());
+ } catch (Exception e) {
+ logger.error("鏂扮増鎺ㄩ�佽В缁戝嚭閿欙細{}", uid, e);
+ }
+ } else {
+ // 闇�瑕佽В缁慔W鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
+ deviceTokenHWService.unBindDeviceToken(acceptData.getDevice());
+ if (deviceActive != null) {
+ // 瑙ｇ粦OPPO鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
+ deviceTokenOPPOService.unBindUid(uid, deviceActive.getId());
+ // 瑙ｇ粦VIVO鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
+ deviceTokenVIVOService.unBindUid(uid, deviceActive.getId());
+ // 瑙ｇ粦XM鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
+ deviceTokenXMService.unBindUid(deviceActive.getId());
+ }
}
+
}
out.print(JsonUtil.loadTrueResult(""));
}
@@ -1093,7 +1114,7 @@
if (!StringUtil.isNullOrEmpty(aliAccessToken)) {
long now = System.currentTimeMillis();
- String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.oneKeyLoginCount,StringUtil.Md5( StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid()));
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.oneKeyLoginCount, StringUtil.Md5(StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid()));
redisManager.increase(key);
int expire = (int) ((TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now + 1000 * 60 * 60 * 24L, "yyyyMMdd"), "yyyyMMdd") - now) / 1000);
redisManager.expire(key, expire);
@@ -1182,7 +1203,7 @@
if (!StringUtil.isNullOrEmpty(aliAccessToken)) {
long now = System.currentTimeMillis();
- String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.oneKeyLoginCount,StringUtil.Md5( StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid()));
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.oneKeyLoginCount, StringUtil.Md5(StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid()));
redisManager.increase(key);
int expire = (int) ((TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now + 1000 * 60 * 60 * 24L, "yyyyMMdd"), "yyyyMMdd") - now) / 1000);
redisManager.expire(key, expire);
--
Gitblit v1.8.0