From 54ae34b91644b02c422b41197ae6ce33f4e3ca57 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 十月 2019 13:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/test/java/org/fanli/TaoKeTest.java |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index 3763633..7907fd1 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -49,26 +49,18 @@
 
 	@Test
 	public void test1() {
-		System.out.println(TaoBaoUtil.filterTaoToken("锟uPdYM9Knxe锟�"));
+		String url = TaoKeApiUtil.officialActivityConvert("19507100253", "1539329391766", "20211660");
+		System.out.println(TaoBaoUtil.filterTaoToken(TaoKeApiUtil.getTKToken(
+				"http://ec-1255749512.file.myqcloud.com/img/FloatAD/a43fdefe735c41f4955a261d43870ff8.png", "娣樺彛浠�",
+				url)));
 	}
 
 	@Test
 	public void test2() {
-
-		TaoBaoGoodsBrief goods = null;
-		try {
-			goods = TaoKeApiUtil.searchGoodsDetail(601535036423L);
-
-			// goods = TaoKeApiUtil.searchGoodsDetail(601535036423L, new
-			// TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
-			// TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
-			// TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
-		} catch (TaobaoGoodsDownException e2) {
-			e2.printStackTrace();
-		}
-		System.out.println(goods);
-
-		// goods = TaoKeApiUtil.searchGoodsDetail(auctionId);
+		String link = TaoKeApiUtil.officialActivityConvert("87140050199", "1571120794546", "20211660");
+		System.out.println(TaoKeApiUtil.getTKToken("http://","姣嶅┐棰勫敭",link));
+		//https://s.click.taobao.com/t?e=m%3D2%26s%3DW%2Fys7R71JXMcQipKwQzePCperVdZeJviyK8Cckff7TVRAdhuF14FMXC%2FEJQELlNo5x%2BIUlGKNpVpS9y0ojX%2FfMsvmRQfeMsreH9%2FasRClvq63GoCXmcqkTiRUN2xVR4GdesO8XD8dsNdITvXwTxvKDqJgCOacH%2BU%2FVJqtNeEg5OOvkjnk315zzvflh4%2Fhqj8BmyXDtEFdgwjGkouqJtJeds5wF0j1Yhhp1953%2FcnpLUV6UUID4c8TeTEWJdP8jmRdTEuB5K8MGvkLv1nNhnYz%2FB0z8qlrv%2Bjr%2B%2FiM5RbEEle7auY0HPYWszlTEcWhO9mli2vZjCuAmyG1kYtrC7hgcEnE%2FQxigjMfFc2hYciEyAdpuz3kb9JWJVVX36lFeRKtwLUkdbL0syg%2BG8%2FlCRQJ1YlOPkYHNIul3paqKYwK75NNUki5Nwcg2GYz3Bez8Z8OusR9%2BDFlSU%2BcenL13XDY2hrrfx7OMbmkUtLKDKbz1CCoC2zoKs%2FmnEqY%2Bakgpmw&pvid=24980167&union_lens=lensId:0b013a8d_0cec_16df214d979_38a1
+		
 	}
 
 	@Test

--
Gitblit v1.8.0