From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 127 ++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 65 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 2cff591..a37c156 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -1,18 +1,5 @@
package com.yeshi.fanli.controller;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Date;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;
@@ -27,17 +14,20 @@
import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;
import com.yeshi.fanli.service.inter.user.tb.TaoBaoUnionAuthRecordService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
-import com.yeshi.fanli.util.AESUtil;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.RedisKeyEnum;
-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.VersionUtil;
+import com.yeshi.fanli.util.*;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-
import net.sf.json.JSONObject;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Date;
/**
* 鎺堟潈鍥炶皟
@@ -132,6 +122,7 @@
// 璁″叆璁板綍
try {
+ //
String result = TaoKeApiUtil.getAccessToken(code, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
JSONObject data = JSONObject.fromObject(result);
@@ -147,6 +138,8 @@
final String name = nickName;
LogManager.getLogger(LogType.taobaoAuth).info("uid:" + uid + "\n accessToken:" + accessToken);
+ //鎵ц缁戝畾
+ source="bind";
// 鑾峰彇娓犻亾ID涓庝細鍛業D
if ("share".equalsIgnoreCase(source)) {
String relationId = null;
@@ -170,28 +163,28 @@
final String relationId2 = relationId;
// 寮傛鐢宠浼氬憳ID
final Long fuid = uid;
- ThreadUtil.run(new Runnable() {
-
- @Override
- public void run() {
- String specialId = null;
- try {
- specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- } catch (TaoBaoAuthException e1) {
- LogManager.getLogger(LogType.taobaoAuth).error(fuid + "浼氬憳澶囨澶辫触:" + e1.getMessage());
- }
-
- try {
- userExtraTaoBaoInfoService.addSpecialId(fuid, specialId, taoBaoUid, name, true);
-
- if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId2))
- userInfoModifyRecordService.addModifyRecord(fuid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
- } catch (UserExtraTaoBaoInfoException e) {
- LogHelper.test(e.getMsg());
- }
- }
- });
+// ThreadUtil.run(new Runnable() {
+//
+// @Override
+// public void run() {
+// String specialId = null;
+// try {
+// specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+// TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+// } catch (TaoBaoAuthException e1) {
+// LogManager.getLogger(LogType.taobaoAuth).error(fuid + "浼氬憳澶囨澶辫触:" + e1.getMessage());
+// }
+//
+// try {
+// userExtraTaoBaoInfoService.addSpecialId(fuid, specialId, taoBaoUid, name, true);
+//
+// if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId2))
+// userInfoModifyRecordService.addModifyRecord(fuid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
+// } catch (UserExtraTaoBaoInfoException e) {
+// LogHelper.test(e.getMsg());
+// }
+// }
+// });
// 绋嶄綔寤惰繜
Thread.sleep(50);
@@ -205,7 +198,11 @@
if (e.getCode() == TaoBaoAuthException.CODE_NOT_REAL_NAME)
userAccountMsgNotificationService.taoBaoAuthFail(uid, name, "娣樺疂璐﹀彿鏈疄鍚�");
LogManager.getLogger(LogType.taobaoAuth).error(uid + "浼氬憳澶囨澶辫触:" + e.getMessage());
+
+ LogHelper.test("娣樺疂鎺堟潈:"+uid + "浼氬憳澶囨澶辫触:" + e.getMessage());
}
+
+ LogHelper.test("娣樺疂鎺堟潈:"+specialId);
try {
userExtraTaoBaoInfoService.addSpecialId(uid, specialId, taoBaoUid, nickName, true);
@@ -217,27 +214,27 @@
final String specialId2 = specialId;
// 寮傛鐢宠娓犻亾ID
- ThreadUtil.run(new Runnable() {
-
- @Override
- public void run() {
- String relationId = null;
- try {
- relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- } catch (TaoBaoAuthException e1) {
- LogManager.getLogger(LogType.taobaoAuth).error(fuid + "娓犻亾澶囨澶辫触:" + e1.getMessage());
- }
- try {
- userExtraTaoBaoInfoService.addRelationId(fuid, relationId, taoBaoUid, name, true);
-
- if (!StringUtil.isNullOrEmpty(specialId2) && !StringUtil.isNullOrEmpty(relationId))
- userInfoModifyRecordService.addModifyRecord(fuid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
- } catch (UserExtraTaoBaoInfoException e) {
- LogHelper.test(e.getMsg());
- }
- }
- });
+// ThreadUtil.run(new Runnable() {
+//
+// @Override
+// public void run() {
+// String relationId = null;
+// try {
+// relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+// TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+// } catch (TaoBaoAuthException e1) {
+// LogManager.getLogger(LogType.taobaoAuth).error(fuid + "娓犻亾澶囨澶辫触:" + e1.getMessage());
+// }
+// try {
+// userExtraTaoBaoInfoService.addRelationId(fuid, relationId, taoBaoUid, name, true);
+//
+// if (!StringUtil.isNullOrEmpty(specialId2) && !StringUtil.isNullOrEmpty(relationId))
+// userInfoModifyRecordService.addModifyRecord(fuid, ModifyTypeEnum.bindTaoBao, taoBaoUid);
+// } catch (UserExtraTaoBaoInfoException e) {
+// LogHelper.test(e.getMsg());
+// }
+// }
+// });
// 绋嶄綔寤惰繜
Thread.sleep(50);
--
Gitblit v1.8.0