From ad3119f7b7e0375a8363b900346284bb1c274a3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 12:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 c121fee..82f7e9b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -42,8 +42,9 @@
@RequestMapping(value = "tb")
public void tb(String code, String state, HttpServletRequest request, HttpServletResponse response) {
- LogHelper.test("娣樺疂鎺堟潈鍥炶皟:" + code+"锛�"+state);
+ 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");
} catch (IOException e1) {
@@ -79,14 +80,21 @@
String openUid = data.optString("taobao_open_uid");
String taoBaoUid = data.optString("taobao_user_id");
String nickName = data.optString("taobao_user_nick");
+
+ // LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken);
+
// 鑾峰彇娓犻亾ID涓庝細鍛業D
if ("share".equalsIgnoreCase(source)) {
String relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
Constant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ if (StringUtil.isNullOrEmpty(relationId))
+ LogHelper.test(uid + "娓犻亾澶囨澶辫触");
userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid, true);
} else {
String specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
Constant.TAOBAO_AUTH_APPSECRET);
+ if (StringUtil.isNullOrEmpty(specialId))
+ LogHelper.test(uid + "浼氬憳澶囨澶辫触");
userExtraTaoBaoInfoService.addSpecialId(uid, specialId, taoBaoUid, true);
}
@@ -105,6 +113,11 @@
taoBaoUnionAuthRecordService.addAuthRecord(record);
} catch (Exception e) {
errCode = 4;
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
try {
--
Gitblit v1.8.0