From a3e1aec60d2f886b8c48966c889b567719d0c5ea Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 16 十月 2019 16:50:25 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 148 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 106 insertions(+), 42 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 de82022..91b2dd1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -13,22 +13,25 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionAuthRecord;
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.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.inter.user.UserActiveLogService;
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;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONObject;
@@ -51,26 +54,29 @@
@Resource
private UserAccountMsgNotificationService userAccountMsgNotificationService;
-
+
@Resource
private UserInfoModifyRecordService userInfoModifyRecordService;
@Resource
private RedisManager redisManager;
+ @Resource
+ private UserActiveLogService userActiveLogService;
+
@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)))
@@ -79,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;
@@ -119,7 +149,7 @@
String relationId = null;
try {
- relationId= TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
} catch (TaoBaoAuthException e) {
if (e.getCode() == TaoBaoAuthException.CODE_NOT_REAL_NAME)
@@ -134,9 +164,10 @@
LogHelper.test(e.getMsg());
errCode = 5;
}
-
- final String relationId2 = relationId;
+
+ final String relationId2 = relationId;
// 寮傛鐢宠浼氬憳ID
+ final Long fuid=uid;
ThreadUtil.run(new Runnable() {
@Override
@@ -150,19 +181,19 @@
}
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());
}
}
});
-
- //绋嶄綔寤惰繜
+
+ // 绋嶄綔寤惰繜
Thread.sleep(50);
} else if ("zigou".equalsIgnoreCase(source)) {
String specialId = null;
@@ -183,6 +214,7 @@
LogHelper.test(e.getMsg());
errCode = 5;
}
+ final Long fuid=uid;
final String specialId2 = specialId;
// 寮傛鐢宠娓犻亾ID
@@ -197,18 +229,18 @@
} 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());
}
}
});
- //绋嶄綔寤惰繜
+ // 绋嶄綔寤惰繜
Thread.sleep(50);
} else if ("bind".equalsIgnoreCase(source)) {
@@ -253,7 +285,7 @@
try {
userExtraTaoBaoInfoService.saveUserTaoBaoInfo(uid, relationId, specialId, taoBaoUid, nickName,
true);
-
+
if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId))
userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
} catch (UserExtraTaoBaoInfoException e) {
@@ -283,33 +315,65 @@
LogHelper.errorDetailInfo(e);
}
+ UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(uid);
+
+ boolean isNewJump = false;
+ if (activeLog != null) {
+ String platform = null;
+ String version = activeLog.getVersionCode();
+ if (activeLog.getChannel().equalsIgnoreCase("appstore")) {
+ platform = "ios";
+ } else {
+ platform = "android";
+ }
+ if (VersionUtil.greaterThan_2_0(platform, version)) {
+ isNewJump = true;
+ }
+ }
+
try {
if (errCode == 0)// 鎴愬姛
{
if ("share".equalsIgnoreCase(source)) {
- // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=0");
- closeWebPage(response.getWriter());
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");
+ else
+ closeWebPage(response.getWriter());
} else if ("zigou".equalsIgnoreCase(source)) {
- // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=0");
- closeWebPage(response.getWriter());
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");
+ else
+ closeWebPage(response.getWriter());
} else if ("bind".equalsIgnoreCase(source)) {
- String script = String.format(
- "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛\");yestv.finishPage();}</script>",
- StringUtil.getBase64String("鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛"));
- response.getWriter().print(script);
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");
+ else {
+ String script = String.format(
+ "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛\");yestv.finishPage();}</script>",
+ StringUtil.getBase64String("鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛"));
+ response.getWriter().print(script);
+ }
}
} else {// 澶辫触
if ("share".equalsIgnoreCase(source)) {
- // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");
- closeWebPage(response.getWriter());
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");
+ else
+ closeWebPage(response.getWriter());
} else if ("zigou".equalsIgnoreCase(source)) {
- // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=1");
- closeWebPage(response.getWriter());
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");
+ else
+ closeWebPage(response.getWriter());
} else if ("bind".equalsIgnoreCase(source)) {
- String script = String.format(
- "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎶辨瓑锛屾窐瀹濈粦瀹氬け璐");yestv.finishPage();}</script>",
- StringUtil.getBase64String("鎶辨瓑锛屾窐瀹濈粦瀹氬け璐�"));
- response.getWriter().print(script);
+ if (isNewJump)
+ response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");
+ else {
+ String script = String.format(
+ "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎶辨瓑锛屾窐瀹濈粦瀹氬け璐");yestv.finishPage();}</script>",
+ StringUtil.getBase64String("鎶辨瓑锛屾窐瀹濈粦瀹氬け璐�"));
+ response.getWriter().print(script);
+ }
}
}
} catch (Exception e) {
--
Gitblit v1.8.0