From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 171 +++++++++++++++++++++++++++-----------------------------
1 files changed, 82 insertions(+), 89 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 4e07733..a37c156 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -1,18 +1,5 @@
package com.yeshi.fanli.controller;
-import java.io.IOException;
-import java.io.PrintWriter;
-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.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;
@@ -20,22 +7,27 @@
import com.yeshi.fanli.exception.taobao.TaoBaoAuthException;
import com.yeshi.fanli.exception.user.UserExtraTaoBaoInfoException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.log.LogManager;
+import com.yeshi.fanli.log.LogType;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
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.RedisKeyEnum;
-import com.yeshi.fanli.util.RedisManager;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TaoBaoConstant;
-import com.yeshi.fanli.util.ThreadUtil;
-import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.*;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-
import net.sf.json.JSONObject;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Date;
/**
* 鎺堟潈鍥炶皟
@@ -67,11 +59,11 @@
@RequestMapping(value = "tb")
public void tb(String code, String state, HttpServletRequest request, HttpServletResponse response) {
- LogHelper.test("娣樺疂鎺堟潈鍥炶皟:" + code + "锛�" + state);
+ LogManager.getLogger(LogType.taobaoAuth).info("娣樺疂鎺堟潈鍥炶皟:" + code + "锛�" + state);
if (StringUtil.isNullOrEmpty(code) || StringUtil.isNullOrEmpty(state)) {
LogHelper.error("娣樺疂鎺堟潈鍥炶皟鍑洪敊");
try {
- response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html?code=1");
+ response.sendRedirect("http://apph5.banliapp.com/flqWeb/h5/tbauth/fail.html?code=1");
} catch (IOException e1) {
e1.printStackTrace();
}
@@ -110,9 +102,9 @@
source = json.optString("s");
}
- LogHelper.userErrorInfo("娣樺疂鎺堟潈鍥炶皟state:" + state);
+ LogManager.getLogger(LogType.taobaoAuth).info("娣樺疂鎺堟潈鍥炶皟state:" + state);
- LogHelper.userErrorInfo("娣樺疂鎺堟潈鍥炶皟瑙ｅ瘑:" + stateStr);
+ LogManager.getLogger(LogType.taobaoAuth).info("娣樺疂鎺堟潈鍥炶皟瑙ｅ瘑:" + stateStr);
int errCode = 0;
if (StringUtil.isNullOrEmpty(stateStr)) {
@@ -130,6 +122,7 @@
// 璁″叆璁板綍
try {
+ //
String result = TaoKeApiUtil.getAccessToken(code, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
JSONObject data = JSONObject.fromObject(result);
@@ -143,8 +136,10 @@
} catch (Exception e) {
}
final String name = nickName;
- LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken);
+ LogManager.getLogger(LogType.taobaoAuth).info("uid:" + uid + "\n accessToken:" + accessToken);
+ //鎵ц缁戝畾
+ source="bind";
// 鑾峰彇娓犻亾ID涓庝細鍛業D
if ("share".equalsIgnoreCase(source)) {
String relationId = null;
@@ -153,12 +148,11 @@
relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
} catch (TaoBaoAuthException e) {
+ LogManager.getLogger(LogType.taobaoAuth).error(uid + "娓犻亾澶囨澶辫触:" + e.getMessage());
if (e.getCode() == TaoBaoAuthException.CODE_NOT_REAL_NAME)
userAccountMsgNotificationService.taoBaoAuthFail(uid, name, "娣樺疂璐﹀彿鏈疄鍚�");
}
- if (StringUtil.isNullOrEmpty(relationId))
- LogHelper.test(uid + "娓犻亾澶囨澶辫触");
try {
userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid, nickName, true);
} catch (UserExtraTaoBaoInfoException e) {
@@ -168,31 +162,29 @@
final String relationId2 = relationId;
// 寮傛鐢宠浼氬憳ID
- final Long fuid=uid;
- ThreadUtil.run(new Runnable() {
-
- @Override
- public void run() {
- String specialId = null;
- try {
- specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- } catch (TaoBaoAuthException e1) {
-
- }
-
- if (StringUtil.isNullOrEmpty(specialId))
- LogHelper.test(fuid + "浼氬憳澶囨澶辫触");
- try {
- userExtraTaoBaoInfoService.addSpecialId(fuid, specialId, taoBaoUid, name, true);
-
- if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId2))
- userInfoModifyRecordService.addModifyRecord(fuid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
- } catch (UserExtraTaoBaoInfoException e) {
- LogHelper.test(e.getMsg());
- }
- }
- });
+ final Long fuid = uid;
+// ThreadUtil.run(new Runnable() {
+//
+// @Override
+// public void run() {
+// String specialId = null;
+// try {
+// specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+// TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+// } catch (TaoBaoAuthException e1) {
+// LogManager.getLogger(LogType.taobaoAuth).error(fuid + "浼氬憳澶囨澶辫触:" + e1.getMessage());
+// }
+//
+// try {
+// userExtraTaoBaoInfoService.addSpecialId(fuid, specialId, taoBaoUid, name, true);
+//
+// if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId2))
+// userInfoModifyRecordService.addModifyRecord(fuid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
+// } catch (UserExtraTaoBaoInfoException e) {
+// LogHelper.test(e.getMsg());
+// }
+// }
+// });
// 绋嶄綔寤惰繜
Thread.sleep(50);
@@ -205,42 +197,44 @@
} catch (TaoBaoAuthException e) {
if (e.getCode() == TaoBaoAuthException.CODE_NOT_REAL_NAME)
userAccountMsgNotificationService.taoBaoAuthFail(uid, name, "娣樺疂璐﹀彿鏈疄鍚�");
+ LogManager.getLogger(LogType.taobaoAuth).error(uid + "浼氬憳澶囨澶辫触:" + e.getMessage());
+
+ LogHelper.test("娣樺疂鎺堟潈:"+uid + "浼氬憳澶囨澶辫触:" + e.getMessage());
}
- if (StringUtil.isNullOrEmpty(specialId))
- LogHelper.test(uid + "浼氬憳澶囨澶辫触");
+ LogHelper.test("娣樺疂鎺堟潈:"+specialId);
+
try {
userExtraTaoBaoInfoService.addSpecialId(uid, specialId, taoBaoUid, nickName, true);
} catch (UserExtraTaoBaoInfoException e) {
LogHelper.test(e.getMsg());
errCode = 5;
}
- final Long fuid=uid;
+ final Long fuid = uid;
final String specialId2 = specialId;
// 寮傛鐢宠娓犻亾ID
- ThreadUtil.run(new Runnable() {
-
- @Override
- public void run() {
- String relationId = null;
- try {
- relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- } catch (TaoBaoAuthException e1) {
- } // 娓犻亾ID
- if (StringUtil.isNullOrEmpty(relationId))
- LogHelper.test(fuid + "娓犻亾澶囨澶辫触");
- try {
- userExtraTaoBaoInfoService.addRelationId(fuid, relationId, taoBaoUid, name, true);
-
- if (!StringUtil.isNullOrEmpty(specialId2) && !StringUtil.isNullOrEmpty(relationId))
- userInfoModifyRecordService.addModifyRecord(fuid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
- } catch (UserExtraTaoBaoInfoException e) {
- LogHelper.test(e.getMsg());
- }
- }
- });
+// ThreadUtil.run(new Runnable() {
+//
+// @Override
+// public void run() {
+// String relationId = null;
+// try {
+// relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+// TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+// } catch (TaoBaoAuthException e1) {
+// LogManager.getLogger(LogType.taobaoAuth).error(fuid + "娓犻亾澶囨澶辫触:" + e1.getMessage());
+// }
+// try {
+// userExtraTaoBaoInfoService.addRelationId(fuid, relationId, taoBaoUid, name, true);
+//
+// if (!StringUtil.isNullOrEmpty(specialId2) && !StringUtil.isNullOrEmpty(relationId))
+// userInfoModifyRecordService.addModifyRecord(fuid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
+// } catch (UserExtraTaoBaoInfoException e) {
+// LogHelper.test(e.getMsg());
+// }
+// }
+// });
// 绋嶄綔寤惰繜
Thread.sleep(50);
@@ -255,11 +249,11 @@
relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
} catch (TaoBaoAuthException e) {
+ LogManager.getLogger(LogType.taobaoAuth).error(uid + "娓犻亾澶囨澶辫触");
tbErrorCode = e.getCode();
}
if (StringUtil.isNullOrEmpty(relationId)) {
- LogHelper.test(uid + "娓犻亾澶囨澶辫触");
bindInfo = false;
}
@@ -270,9 +264,9 @@
TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
} catch (TaoBaoAuthException e) {
tbErrorCode = e.getCode();
+ LogManager.getLogger(LogType.taobaoAuth).error(uid + "浼氬憳澶囨澶辫触");
}
if (StringUtil.isNullOrEmpty(specialId)) {
- LogHelper.test(uid + "浼氬憳澶囨澶辫触");
bindInfo = false;
}
}
@@ -337,17 +331,17 @@
{
if ("share".equalsIgnoreCase(source)) {
if (isNewJump)
- response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");
+ response.sendRedirect("http://apph5.banliapp.com/flqWeb/h5/tbauth/success.html");
else
closeWebPage(response.getWriter());
} else if ("zigou".equalsIgnoreCase(source)) {
if (isNewJump)
- response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");
+ response.sendRedirect("http://apph5.banliapp.com/flqWeb/h5/tbauth/success.html");
else
closeWebPage(response.getWriter());
} else if ("bind".equalsIgnoreCase(source)) {
if (isNewJump)
- response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/success.html");
+ response.sendRedirect("http://apph5.banliapp.com/flqWeb/h5/tbauth/success.html");
else {
String script = String.format(
"<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛\");yestv.finishPage();}</script>",
@@ -358,17 +352,17 @@
} else {// 澶辫触
if ("share".equalsIgnoreCase(source)) {
if (isNewJump)
- response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");
+ response.sendRedirect("http://apph5.banliapp.com/flqWeb/h5/tbauth/fail.html");
else
closeWebPage(response.getWriter());
} else if ("zigou".equalsIgnoreCase(source)) {
if (isNewJump)
- response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");
+ response.sendRedirect("http://apph5.banliapp.com/flqWeb/h5/tbauth/fail.html");
else
closeWebPage(response.getWriter());
} else if ("bind".equalsIgnoreCase(source)) {
if (isNewJump)
- response.sendRedirect("http://apph5.yeshitv.com/flqWeb/h5/tbauth/fail.html");
+ response.sendRedirect("http://apph5.banliapp.com/flqWeb/h5/tbauth/fail.html");
else {
String script = String.format(
"<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎶辨瓑锛屾窐瀹濈粦瀹氬け璐");yestv.finishPage();}</script>",
@@ -378,9 +372,8 @@
}
}
} catch (Exception e) {
-
+ LogHelper.errorDetailInfo(e);
}
-
}
private void closeWebPage(PrintWriter out) {
--
Gitblit v1.8.0