From 70a0aed5a22fbdbb486351258535944b5dae2a79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 17 四月 2019 11:58:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 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 3939b78..5ae3bc5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -21,6 +21,7 @@
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONObject;
@@ -73,32 +74,36 @@
// 璁″叆璁板綍
try {
- String result = TaoKeApiUtil.getAccessToken(code, Constant.TAOBAO_AUTH_APPKEY,
- Constant.TAOBAO_AUTH_APPSECRET);
+ String result = TaoKeApiUtil.getAccessToken(code, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
JSONObject data = JSONObject.fromObject(result);
data = data.optJSONObject("top_auth_token_create_response").optJSONObject("token_result");
String accessToken = data.optString("access_token");
String openUid = data.optString("taobao_open_uid");
String taoBaoUid = data.optString("taobao_user_id");
String nickName = data.optString("taobao_user_nick");
-
+ try {
+ nickName = URLDecoder.decode(nickName, "UTF-8");
+ } catch (Exception e) {
+ }
// LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken);
// 鑾峰彇娓犻亾ID涓庝細鍛業D
if ("share".equalsIgnoreCase(source)) {
- String relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
- Constant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ String relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
if (StringUtil.isNullOrEmpty(relationId))
LogHelper.test(uid + "娓犻亾澶囨澶辫触");
try {
- userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid,nickName, true);
+ userExtraTaoBaoInfoService.addRelationId(uid, relationId, taoBaoUid, nickName, true);
} catch (UserExtraTaoBaoInfoException e) {
LogHelper.test(e.getMsg());
errCode = 5;
}
- } else if ("zigou".equalsIgnoreCase(source)) {
- String specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
- Constant.TAOBAO_AUTH_APPSECRET);
+ } else if ("zigou".equalsIgnoreCase(source)) {
+ String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+
if (StringUtil.isNullOrEmpty(specialId))
LogHelper.test(uid + "浼氬憳澶囨澶辫触");
try {
@@ -108,38 +113,39 @@
errCode = 5;
}
} else if ("bind".equalsIgnoreCase(source)) {
-
+
boolean bindInfo = true;
// 缁戝畾娣樺疂锛歏1.5.3
- String relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
+ String relationId = TaoKeApiUtil.getRelationId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);// 娓犻亾ID
if (StringUtil.isNullOrEmpty(relationId)) {
LogHelper.test(uid + "娓犻亾澶囨澶辫触");
bindInfo = false;
- }
-
+ }
+
String specialId = null;
- if(bindInfo) {
+ if (bindInfo) {
specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
- Constant.TAOBAO_AUTH_APPSECRET);
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
if (StringUtil.isNullOrEmpty(specialId)) {
LogHelper.test(uid + "浼氬憳澶囨澶辫触");
bindInfo = false;
}
}
-
+
if (!bindInfo) {
errCode = 5;// 淇℃伅鑾峰彇涓嶅叏
} else {
try {
- userExtraTaoBaoInfoService.saveUserTaoBaoInfo(uid, relationId, specialId, taoBaoUid, nickName, true);
+ userExtraTaoBaoInfoService.saveUserTaoBaoInfo(uid, relationId, specialId, taoBaoUid, nickName,
+ true);
} catch (UserExtraTaoBaoInfoException e) {
LogHelper.test(e.getMsg());
errCode = 6;
}
}
-
+
}
-
if (!StringUtil.isNullOrEmpty(nickName))
try {
@@ -154,7 +160,7 @@
record.setTaoBaoUserNick(nickName);
record.setCreateTime(new Date());
taoBaoUnionAuthRecordService.addAuthRecord(record);
-
+
} catch (Exception e) {
errCode = 4;
try {
--
Gitblit v1.8.0