From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 ec8106b..10fd233 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -100,7 +100,7 @@
nickName = URLDecoder.decode(nickName, "UTF-8");
} catch (Exception e) {
}
- final String name=nickName;
+ final String name = nickName;
// LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken);
// 鑾峰彇娓犻亾ID涓庝細鍛業D
@@ -115,9 +115,9 @@
LogHelper.test(e.getMsg());
errCode = 5;
}
- //寮傛鐢宠浼氬憳ID
- ThreadUtil.run(new Runnable() {
-
+ // 寮傛鐢宠浼氬憳ID
+ ThreadUtil.run(new Runnable() {
+
@Override
public void run() {
String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
@@ -132,7 +132,7 @@
}
}
});
-
+
} else if ("zigou".equalsIgnoreCase(source)) {
String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
@@ -145,11 +145,10 @@
LogHelper.test(e.getMsg());
errCode = 5;
}
-
-
- //寮傛鐢宠娓犻亾ID
- ThreadUtil.run(new Runnable() {
-
+
+ // 寮傛鐢宠娓犻亾ID
+ ThreadUtil.run(new Runnable() {
+
@Override
public void run() {
String relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
@@ -163,7 +162,7 @@
}
}
});
-
+
} else if ("bind".equalsIgnoreCase(source)) {
boolean bindInfo = true;
@@ -253,4 +252,9 @@
}
+ @RequestMapping(value = "pinduoduo")
+ public void pinDuoDuo(HttpServletResponse response) {
+
+ }
+
}
--
Gitblit v1.8.0