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 | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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 03d3ea8..37254f1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -1,17 +1,20 @@
package com.yeshi.fanli.controller;
-import java.io.PrintWriter;
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Date;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
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;
@@ -38,9 +41,16 @@
private TaoBaoUnionAuthRecordService taoBaoUnionAuthRecordService;
@RequestMapping(value = "tb")
- public void tb(String code, String state, PrintWriter out) {
- 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) {
+ e1.printStackTrace();
+ }
return;
+ }
String stateStr = AESUtil.decrypt(state, Constant.UIDAESKEY);
int errCode = 0;
if (StringUtil.isNullOrEmpty(stateStr)) {
@@ -50,6 +60,7 @@
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;
@@ -68,14 +79,23 @@
String openUid = data.optString("taobao_open_uid");
String taoBaoUid = data.optString("taobao_user_id");
String nickName = data.optString("taobao_user_nick");
+ // 鑾峰彇娓犻亾ID涓庝細鍛業D
+ if ("share".equalsIgnoreCase(source)) {
+ String relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
+ Constant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid, true);
+ } else {
+ String specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
+ Constant.TAOBAO_AUTH_APPSECRET);
+ userExtraTaoBaoInfoService.addSpecialId(uid, specialId, taoBaoUid, true);
+ }
+
if (!StringUtil.isNullOrEmpty(nickName))
try {
nickName = URLDecoder.decode(nickName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
-
- // userExtraTaoBaoInfoService.addRelationId(uid, relationId);
TaoBaoUnionAuthRecord record = new TaoBaoUnionAuthRecord();
record.setUser(new UserInfo(uid));
record.setTaoBaoOpenUid(openUid);
@@ -87,7 +107,23 @@
errCode = 4;
}
- out.print("<html><body>缁戝畾閿欒:閿欒鐮侊紙" + errCode + "锛�</body></html>");
+ try {
+ if (errCode == 0)// 鎴愬姛
+ {
+ if ("share".equalsIgnoreCase(source))
+ response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=0");
+ else
+ response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=0");
+ } else {// 澶辫触
+ 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 (Exception e) {
+
+ }
+
}
}
--
Gitblit v1.8.0