From 7664dae2f53abe3076a95c986ba64b2a8d949827 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:06:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/test/java/org/fanli/TaoKeTest.java |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index ff6f3d7..2854814 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -36,7 +36,6 @@
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
 import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
-import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
 import net.sf.json.JSONArray;
@@ -55,20 +54,35 @@
 		// TaoBaoUtil.getTBDetailImageWithSize(597016140493L);
 		// System.out.println(goods);
 		// DaTaoKeApiUtil.getGoodsDetailByGoodsId(558195316187L);
-		try {
-			TaoKeApiUtil.specialConvertCoupon(608512721647L, new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
-					TaoBaoConstant.TAOBAO_AUTH_APPSECRET, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
+		// try {
+		// TaoKeApiUtil.specialConvertCoupon(608512721647L, new
+		// TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+		// TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
+		// TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
+		// } catch (Exception e) {
+		// // TODO Auto-generated catch block
+		// e.printStackTrace();
+		// }
+
+//		String link = TaoKeApiUtil.officialActivityConvert(87140050199L + "", "1571715733668", "513796574");
+//		System.out.println(link);
+		
+//		String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+//				"http://api.flqapp.com/fanli/client/v1/auth/callback/tb", 6396582L, "share");
+//		System.out.println(link);
+		
+	    try {
+			TaoKeApiUtil.searchGoodsDetail(608512721647L);
+		} catch (TaobaoGoodsDownException e) {
 			e.printStackTrace();
 		}
-
+		
 	}
 
 	@Test
 	public void test2() {
-		String link = TaoKeApiUtil.officialActivityConvert("87140050199", "1571120794546", "20211660");
-		System.out.println(TaoKeApiUtil.getTKToken("http://", "姣嶅┐棰勫敭", link));
+		String link = TaoKeApiUtil.officialActivityConvert("87140050199", "1571715733668", "20211660");
+		System.out.println(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
 
 	}

--
Gitblit v1.8.0