From 3ce9e928e082ff8abf697dba560cbfbb412e89f8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 15:45:02 +0800
Subject: [PATCH] 商城后台编辑
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
index 3928390..91b2dd1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -20,11 +20,11 @@
import com.yeshi.fanli.exception.taobao.TaoBaoAuthException;
import com.yeshi.fanli.exception.user.UserExtraTaoBaoInfoException;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.msg.UserAccountMsgNotificationService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionAuthRecordService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
+import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;
+import com.yeshi.fanli.service.inter.user.tb.TaoBaoUnionAuthRecordService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -66,17 +66,17 @@
@RequestMapping(value = "tb")
public void tb(String code, String state, HttpServletRequest request, HttpServletResponse response) {
-
LogHelper.test("娣樺疂鎺堟潈鍥炶皟:" + code + "锛�" + state);
if (StringUtil.isNullOrEmpty(code) || StringUtil.isNullOrEmpty(state)) {
LogHelper.error("娣樺疂鎺堟潈鍥炶皟鍑洪敊");
try {
- response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html?code=1");
} catch (IOException e1) {
e1.printStackTrace();
}
return;
}
+
try {
String key = StringUtil.Md5("taobao-code-" + code);
if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key)))
@@ -85,16 +85,40 @@
} catch (Exception e) {
}
- String stateStr = AESUtil.decrypt(state, Constant.UIDAESKEY);
+
+ String stateStr = null;
+ Long time = null;
+ Long uid = null;
+ String source = null;
+ try {
+ stateStr = AESUtil.decrypt(state, Constant.UIDAESKEY);
+ JSONObject json = JSONObject.fromObject(stateStr);
+ time = json.optLong("t");
+ uid = json.optLong("u");
+ source = json.optString("s");
+ } catch (Exception e) {
+ try {
+ state = URLDecoder.decode(state, "UTF-8");
+ } catch (UnsupportedEncodingException e1) {
+ e1.printStackTrace();
+ }
+ stateStr = AESUtil.decrypt(state, Constant.UIDAESKEY);
+ JSONObject json = JSONObject.fromObject(stateStr);
+ time = json.optLong("t");
+ uid = json.optLong("u");
+ source = json.optString("s");
+ }
+
+ LogHelper.userErrorInfo("娣樺疂鎺堟潈鍥炶皟state:" + state);
+
+ LogHelper.userErrorInfo("娣樺疂鎺堟潈鍥炶皟瑙ｅ瘑:" + stateStr);
+
int errCode = 0;
if (StringUtil.isNullOrEmpty(stateStr)) {
// 瑙ｅ瘑閿欒
errCode = 1;
}
- JSONObject json = JSONObject.fromObject(stateStr);
- Long time = json.optLong("t");
- Long uid = json.optLong("u");
- String source = json.optString("s");
+
if (System.currentTimeMillis() - time > 1000 * 60 * 10L) {
// 杩囨椂
errCode = 2;
@@ -143,6 +167,7 @@
final String relationId2 = relationId;
// 寮傛鐢宠浼氬憳ID
+ final Long fuid=uid;
ThreadUtil.run(new Runnable() {
@Override
@@ -156,12 +181,12 @@
}
if (StringUtil.isNullOrEmpty(specialId))
- LogHelper.test(uid + "浼氬憳澶囨澶辫触");
+ LogHelper.test(fuid + "浼氬憳澶囨澶辫触");
try {
- userExtraTaoBaoInfoService.addSpecialId(uid, specialId, taoBaoUid, name, true);
+ userExtraTaoBaoInfoService.addSpecialId(fuid, specialId, taoBaoUid, name, true);
if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId2))
- userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
+ userInfoModifyRecordService.addModifyRecord(fuid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
} catch (UserExtraTaoBaoInfoException e) {
LogHelper.test(e.getMsg());
}
@@ -189,6 +214,7 @@
LogHelper.test(e.getMsg());
errCode = 5;
}
+ final Long fuid=uid;
final String specialId2 = specialId;
// 寮傛鐢宠娓犻亾ID
@@ -203,12 +229,12 @@
} catch (TaoBaoAuthException e1) {
} // 娓犻亾ID
if (StringUtil.isNullOrEmpty(relationId))
- LogHelper.test(uid + "娓犻亾澶囨澶辫触");
+ LogHelper.test(fuid + "娓犻亾澶囨澶辫触");
try {
- userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid, name, true);
+ userExtraTaoBaoInfoService.addRelationId(fuid, relationId, taoBaoUid, name, true);
if (!StringUtil.isNullOrEmpty(specialId2) && !StringUtil.isNullOrEmpty(relationId))
- userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
+ userInfoModifyRecordService.addModifyRecord(fuid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
} catch (UserExtraTaoBaoInfoException e) {
LogHelper.test(e.getMsg());
}
--
Gitblit v1.8.0