From 00026c4255ed1b47961d17a5b4500fe788bfa9d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 09:45:50 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

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

diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index afc7c67..ee8bec7 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -23,7 +23,6 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoLink;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
-import com.yeshi.fanli.exception.taobao.TaoKeApiException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
@@ -48,16 +47,35 @@
 
 	@Test
 	public void test1() {
-
+		try {
+			TaoKeAppInfo app = new TaoKeAppInfo("27867727", "781fce83545edbed13af32dc3fa9fc3a",
+					"mm_124933865_865950258_109407350204");
+			app.setAdzoneId("109407350204");
+			TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(596441448615L, app);
+			System.out.println(goods);
+		} catch (TaobaoGoodsDownException e) {
+			e.printStackTrace();
+		}
 	}
 
 	@Test
 	public void test2() {
-		System.out.println(HttpUtil.getShortLink("http://h5.flq001.com"));
-		System.out.println(HttpUtil.getShortLink("http://h5.flq002.com"));
-		System.out.println(HttpUtil.getShortLink("http://h5.flq003.com"));
-		System.out.println(HttpUtil.getShortLink("http://h5.flq004.com"));
-		System.out.println(HttpUtil.getShortLink("http://h5.flq005.com"));
+
+		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);
+
 	}
 
 	@Test
@@ -66,13 +84,13 @@
 		String appKey = "27821872";
 		String appSecret = "9277b7c40b753e142303eeabc1936c80";
 		String pid = "mm_491980152_690500060_109327900051";
-		TaoKeAppInfo app=new TaoKeAppInfo(appKey, appSecret, pid);
+		TaoKeAppInfo app = new TaoKeAppInfo(appKey, appSecret, pid);
 
 		try {
 			TaoKeApiUtil.createTaoLiJin(auctionId, "娣樼ぜ閲�", new BigDecimal(1), 1, new Date(),
 					new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 12L), new Date(),
 					new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 12L), app);
-		} catch (TaoKeApiException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}

--
Gitblit v1.8.0