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 | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 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 56f284c..10fd233 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java @@ -23,6 +23,7 @@ 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.taobao.TaoKeApiUtil; import net.sf.json.JSONObject; @@ -99,6 +100,7 @@ nickName = URLDecoder.decode(nickName, "UTF-8"); } catch (Exception e) { } + final String name = nickName; // LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken); // 鑾峰彇娓犻亾ID涓庝細鍛業D @@ -113,6 +115,24 @@ LogHelper.test(e.getMsg()); errCode = 5; } + // 寮傛鐢宠浼氬憳ID + ThreadUtil.run(new Runnable() { + + @Override + public void run() { + String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY, + TaoBaoConstant.TAOBAO_AUTH_APPSECRET); + + if (StringUtil.isNullOrEmpty(specialId)) + LogHelper.test(uid + "浼氬憳澶囨澶辫触"); + try { + userExtraTaoBaoInfoService.addSpecialId(uid, specialId, taoBaoUid, name, true); + } catch (UserExtraTaoBaoInfoException e) { + LogHelper.test(e.getMsg()); + } + } + }); + } else if ("zigou".equalsIgnoreCase(source)) { String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET); @@ -125,6 +145,24 @@ LogHelper.test(e.getMsg()); errCode = 5; } + + // 寮傛鐢宠娓犻亾ID + ThreadUtil.run(new Runnable() { + + @Override + public void run() { + 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, name, true); + } catch (UserExtraTaoBaoInfoException e) { + LogHelper.test(e.getMsg()); + } + } + }); + } else if ("bind".equalsIgnoreCase(source)) { boolean bindInfo = true; @@ -214,4 +252,9 @@ } + @RequestMapping(value = "pinduoduo") + public void pinDuoDuo(HttpServletResponse response) { + + } + } -- Gitblit v1.8.0