From c9cbdfa41d645d42eeaa7e06d550d4ef8ac328e7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 03 一月 2020 12:15:08 +0800
Subject: [PATCH] redis关键词

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 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 2499963..863e8aa 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
@@ -48,6 +48,7 @@
 import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
 import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;
 import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;
+import com.yeshi.fanli.service.inter.push.DeviceTokenXMService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
 import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
 import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
@@ -64,6 +65,7 @@
 import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.GsonUtil;
+import com.yeshi.fanli.util.RedisKeyEnum;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.ThreadUtil;
@@ -129,7 +131,10 @@
 
 	@Resource
 	private DeviceTokenOPPOService deviceTokenOPPOService;
-	
+
+	@Resource
+	private DeviceTokenXMService deviceTokenXMService;
+
 	@Resource
 	private DeviceTokenVIVOService deviceTokenVIVOService;
 
@@ -270,6 +275,7 @@
 						if (active != null) {
 							deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
 							deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
+							deviceTokenXMService.bindUid(active.getId(), uuser.getId());
 						}
 					} catch (Exception e) {
 						e.printStackTrace();
@@ -791,8 +797,7 @@
 			return;
 		}
 
-		String key = "bindalipay-" + uid;
-
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");
 		if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
 			out.print(JsonUtil.loadFalseResult(2, "鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇�"));
 			return;
@@ -847,8 +852,7 @@
 			return;
 		}
 
-		String key = "bindalipay-" + uid;
-
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");
 		if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
 			out.print(JsonUtil.loadFalseResult(1001, "鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇�"));
 			return;
@@ -938,8 +942,7 @@
 			return;
 		}
 
-		String key = "bindalipay-" + uid;
-
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");
 		if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
 			out.print(JsonUtil.loadFalseResult(1001, "鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇�"));
 			return;
@@ -1155,6 +1158,8 @@
 				deviceTokenOPPOService.unBindUid(uid, deviceActive.getId());
 				// 瑙g粦VIVO鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
 				deviceTokenVIVOService.unBindUid(uid, deviceActive.getId());
+				// 瑙g粦XM鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
+				deviceTokenXMService.unBindUid(deviceActive.getId());
 			}
 		}
 		out.print(JsonUtil.loadTrueResult(""));
@@ -1232,6 +1237,7 @@
 						if (active != null) {
 							deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
 							deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
+							deviceTokenXMService.bindUid(active.getId(), uuser.getId());
 						}
 					}
 				});

--
Gitblit v1.8.0