From 0e3ea0679873266b5d682f899ac71c95a17f51ce Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期六, 22 二月 2020 19:01:00 +0800
Subject: [PATCH] 数据恢复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java | 104 ++++++++++++++++++++++++---------------------------
1 files changed, 49 insertions(+), 55 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 c1f03ff..cf95a76 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
@@ -24,6 +24,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
@@ -43,7 +44,11 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
+import com.yeshi.fanli.service.inter.push.DeviceActiveService;
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;
@@ -60,10 +65,10 @@
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;
-import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
@@ -125,6 +130,15 @@
private DeviceTokenHWService deviceTokenHWService;
@Resource
+ private DeviceTokenOPPOService deviceTokenOPPOService;
+
+ @Resource
+ private DeviceTokenXMService deviceTokenXMService;
+
+ @Resource
+ private DeviceTokenVIVOService deviceTokenVIVOService;
+
+ @Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
@@ -157,9 +171,9 @@
@Resource
private UserInfoModifyRecordService userInfoModifyRecordService;
- private static final String PASSWORD_MAX_ERROR = "password_max_error";
- private static final String EXTRACT_MIN_MONEY = "extract_min_money";
- private static final String EXTRACT_MAX_MONEY = "extract_max_money";
+ @Resource
+ private DeviceActiveService deviceActiveService;
+
/**
*
@@ -253,6 +267,13 @@
platformType = 2;
}
userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice());
+ // 缁戝畾oppo,vivo鎺ㄩ��
+ DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
+ 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();
}
@@ -261,7 +282,7 @@
} catch (UserAccountException e) {
try {
- LogHelper.cookieLog("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
+ LogHelper.error("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -335,39 +356,6 @@
}
}
- /**
- * 璐﹀彿鎵撻��
- *
- * @param acceptData
- * @param mainUid
- * @param lessUid
- * @param session
- * @param out
- */
- @RequestMapping(value = "connect")
- public void connect(AcceptData acceptData, long mainUid, long lessUid, HttpSession session, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
- return;
- }
-
- if (mainUid == 0 || lessUid == 0) {
- out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼犳墦閫氱敤鎴稩D"));
- return;
- }
-
- try {
- userAccountService.connectUsers(new UserInfo(mainUid), new UserInfo(lessUid));
- UserInfo user = userInfoService.getUserByIdWithMybatis(mainUid);
- JSONObject data = new JSONObject();
- data.put("user", GsonUtil.toJsonExpose(UserUtil.filterForClientUser(user)));
- out.print(JsonUtil.loadTrueResult(data));
- } catch (UserAccountException e) {
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
- }
- }
/**
* 鑾峰彇鐢ㄦ埛ID
@@ -773,8 +761,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;
@@ -829,8 +816,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;
@@ -920,8 +906,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;
@@ -1128,9 +1113,19 @@
public void logOut(AcceptData acceptData, Long uid, PrintWriter out) {
if (uid == null || uid == 0)
return;
- // 闇�瑕佽В缁慔W鎺ㄩ�佺殑鐢ㄦ埛缁戝畾
- if ("android".equalsIgnoreCase(acceptData.getPlatform()))
+ 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());
+ }
+ }
out.print(JsonUtil.loadTrueResult(""));
}
@@ -1201,13 +1196,12 @@
e.printStackTrace();
}
- if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
- /* 鏂颁汉绾㈠寘 */
- try {
- userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), device);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ // 缁戝畾oppo鎺ㄩ��
+ DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
+ if (active != null) {
+ deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
+ deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
+ deviceTokenXMService.bindUid(active.getId(), uuser.getId());
}
}
});
@@ -1216,7 +1210,7 @@
} catch (UserAccountException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
try {
- LogHelper.cookieLog("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
+ LogHelper.error("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -1322,7 +1316,7 @@
}
try {
- userAccountService.bindWeiXin(acceptData,uid, code);
+ userAccountService.bindWeiXin(acceptData, uid, code);
UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
// 鍒ゆ柇taoBaoUid鏄惁宸茬粡灏佺
--
Gitblit v1.8.0