From 2d634416cc026d139d515d53b6fa56f73d253458 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 一月 2019 10:35:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 22 +++++-----------------
1 files changed, 5 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..37254f1 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,9 @@
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("娣樺疂鎺堟潈鍥炶皟:" + request.getRequestURI());
+ if (StringUtil.isNullOrEmpty(code) || StringUtil.isNullOrEmpty(state)) {
try {
response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");
} catch (IOException e1) {
@@ -65,20 +67,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;
- }
// 璁″叆璁板綍
--
Gitblit v1.8.0