From 0a3e5a876724ac247b33632300701077098111eb Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 18 七月 2019 17:11:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 70 ++++++++++++++++++++++++++++------
1 files changed, 57 insertions(+), 13 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 e4e214a..b4f245a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -15,8 +15,10 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionAuthRecord;
+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.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.AESUtil;
@@ -44,6 +46,9 @@
@Resource
private TaoBaoUnionAuthRecordService taoBaoUnionAuthRecordService;
+
+ @Resource
+ private UserAccountMsgNotificationService userAccountMsgNotificationService;
@Resource
private RedisManager redisManager;
@@ -102,12 +107,20 @@
} catch (Exception e) {
}
final String name = nickName;
- LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken);
+ LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken);
// 鑾峰彇娓犻亾ID涓庝細鍛業D
if ("share".equalsIgnoreCase(source)) {
- String relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ String relationId = null;
+
+ try {
+ TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ } catch (TaoBaoAuthException e) {
+ if (e.getCode() == TaoBaoAuthException.CODE_NOT_REAL_NAME)
+ userAccountMsgNotificationService.taoBaoAuthFail(uid, name, "娣樺疂璐﹀彿鏈疄鍚�");
+ }
+
if (StringUtil.isNullOrEmpty(relationId))
LogHelper.test(uid + "娓犻亾澶囨澶辫触");
try {
@@ -121,8 +134,13 @@
@Override
public void run() {
- String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ 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(uid + "浼氬憳澶囨澶辫触");
@@ -135,8 +153,15 @@
});
} else if ("zigou".equalsIgnoreCase(source)) {
- String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ String specialId = null;
+
+ try {
+ specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ } catch (TaoBaoAuthException e) {
+ if (e.getCode() == TaoBaoAuthException.CODE_NOT_REAL_NAME)
+ userAccountMsgNotificationService.taoBaoAuthFail(uid, name, "娣樺疂璐﹀彿鏈疄鍚�");
+ }
if (StringUtil.isNullOrEmpty(specialId))
LogHelper.test(uid + "浼氬憳澶囨澶辫触");
@@ -152,8 +177,12 @@
@Override
public void run() {
- String relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ 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(uid + "娓犻亾澶囨澶辫触");
try {
@@ -168,8 +197,16 @@
boolean bindInfo = true;
// 缁戝畾娣樺疂锛歏1.5.3
- String relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ String relationId = null;
+
+ int tbErrorCode = 0;
+ try {
+ relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ } catch (TaoBaoAuthException e) {
+ tbErrorCode = e.getCode();
+ }
+
if (StringUtil.isNullOrEmpty(relationId)) {
LogHelper.test(uid + "娓犻亾澶囨澶辫触");
bindInfo = false;
@@ -177,8 +214,12 @@
String specialId = null;
if (bindInfo) {
- specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ try {
+ specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ } catch (TaoBaoAuthException e) {
+ tbErrorCode = e.getCode();
+ }
if (StringUtil.isNullOrEmpty(specialId)) {
LogHelper.test(uid + "浼氬憳澶囨澶辫触");
bindInfo = false;
@@ -186,6 +227,9 @@
}
if (!bindInfo) {
+ if (tbErrorCode == TaoBaoAuthException.CODE_NOT_REAL_NAME) {
+ userAccountMsgNotificationService.taoBaoAuthFail(uid, name, "娣樺疂璐﹀彿鏈疄鍚�");
+ }
errCode = 5;// 淇℃伅鑾峰彇涓嶅叏
} else {
try {
--
Gitblit v1.8.0