From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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..ac99c59 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,8 +74,8 @@
// 璁″叆璁板綍
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");
@@ -86,8 +87,8 @@
// 鑾峰彇娓犻亾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 {
@@ -97,8 +98,9 @@
errCode = 5;
}
} else if ("zigou".equalsIgnoreCase(source)) {
- String specialId = TaoKeApiUtil.getSpecialId(accessToken, Constant.TAOBAO_AUTH_APPKEY,
- Constant.TAOBAO_AUTH_APPSECRET);
+ String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+
if (StringUtil.isNullOrEmpty(specialId))
LogHelper.test(uid + "浼氬憳澶囨澶辫触");
try {
@@ -111,7 +113,7 @@
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;
@@ -120,7 +122,7 @@
String specialId = null;
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;
--
Gitblit v1.8.0