From 3f042f2d3ce9bae01678c8e57425f71d774eaad5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 24 九月 2019 15:46:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 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..1b4a8de 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;
@@ -71,7 +71,7 @@
 		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();
 			}
@@ -85,7 +85,10 @@
 		} catch (Exception e) {
 
 		}
+		LogHelper.userErrorInfo("娣樺疂鎺堟潈鍥炶皟state:"+state);
 		String stateStr = AESUtil.decrypt(state, Constant.UIDAESKEY);
+		LogHelper.userErrorInfo("娣樺疂鎺堟潈鍥炶皟瑙e瘑:"+stateStr);
+		
 		int errCode = 0;
 		if (StringUtil.isNullOrEmpty(stateStr)) {
 			// 瑙e瘑閿欒

--
Gitblit v1.8.0