From 1b1f8fb628c08fc757139a34e2293db8d2529092 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 24 一月 2019 10:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 5a77776..cdc37bc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -57,6 +57,8 @@
 import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.fanli.util.AESUtil;
+import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoHttpUtil;
@@ -1245,7 +1247,7 @@
 			}
 			return parsePhoneTmAndTb(id);
 		} catch (Exception e) {
-			LogHelper.error("鏃犳硶瑙f瀽鍒版窐瀹濆晢鍝両D:"+burl);
+			LogHelper.error("鏃犳硶瑙f瀽鍒版窐瀹濆晢鍝両D:" + burl);
 			return null;
 		}
 
@@ -1704,6 +1706,35 @@
 		return taoBaoGoods;
 	}
 
+	/**
+	 * 鑾峰彇娣樺疂鑱旂洘鐨勬巿鏉冮摼鎺�
+	 * 
+	 * @param appKey
+	 *            -搴旂敤Key
+	 * @param callBackUrl
+	 *            -鍥炶皟閾炬帴
+	 * @param uid-鐢ㄦ埛ID
+	 * @return
+	 */
+	public static String getTaoBaoUnionAuthUrl(String appKey, String callBackUrl, Long uid) {
+		if (uid == null)
+			return null;
+		long timestamp = System.currentTimeMillis();
+		JSONObject json = new JSONObject();
+		json.put("u", uid);
+		json.put("t", timestamp);
+		String url = null;
+		try {
+			url = String.format(
+					"https://oauth.taobao.com/authorize?response_type=code&client_id=%s&redirect_uri=%s&state=%s&view=wap",
+					appKey, callBackUrl,
+					URLEncoder.encode(AESUtil.encrypt(json.toString(), Constant.UIDAESKEY), "UTF-8"));
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return url;
+	}
+
 	public static void main(String[] args) {
 		String s = channelMap.get("3");
 		System.out.println(s);

--
Gitblit v1.8.0