From 3cf41feae65a864fc00d72fdd09a676372fc3b27 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 12:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 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 cb412c7..82f7e9b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -6,6 +6,7 @@
import java.util.Date;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
@@ -13,6 +14,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionAuthRecord;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionAuthRecordService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.AESUtil;
@@ -39,9 +41,10 @@
private TaoBaoUnionAuthRecordService taoBaoUnionAuthRecordService;
@RequestMapping(value = "tb")
- public void tb(String code, String state, HttpServletResponse response) {
- if (StringUtil.isNullOrEmpty(code) || StringUtil.isNullOrEmpty(state))
- {
+ 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");
} catch (IOException e1) {
@@ -66,20 +69,6 @@
if (uid == null || uid.longValue() == 0L)
errCode = 3;
- if (uid == 911382L) {
- try {
- if ("share".equalsIgnoreCase(source))
-
- response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");
-
- else
- response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=1");
- } catch (IOException e) {
-
- }
- return;
- }
-
// 璁″叆璁板綍
try {
@@ -91,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);
}
@@ -117,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