From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/test/java/org/fanli/TaoKeTest.java |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index 78d6fd0..019c895 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.yeshi.fanli.entity.taobao.SearchFilter;
@@ -22,10 +23,10 @@
 import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
-//@Ignore
+@Ignore
 public class TaoKeTest {
-	
-	public static int count=0;
+
+	public static int count = 0;
 
 	@Test
 	public void test1() {
@@ -36,11 +37,11 @@
 		sf.setKey("闉嬪");
 		TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);
 		List<TaoBaoGoodsBrief> goodsList = result.getTaoBaoGoodsBriefs();
-		List<Long> list=new ArrayList<>();
+		List<Long> list = new ArrayList<>();
 		for (TaoBaoGoodsBrief tf : goodsList) {
-			list.add(tf.getAuctionId()) ;
+			list.add(tf.getAuctionId());
 		}
-		
+
 		try {
 			TaoKeApiUtil.getBatchGoodsInfo(list);
 		} catch (TaoKeApiException e1) {
@@ -99,10 +100,5 @@
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
 		}
-	}
-
-	@Test
-	public void test5() {
-		TaoKeApiUtil.parseAuctionIdFromLink("https://m.tb.cn/h.3skbzZd?sm=e15385");
 	}
 }

--
Gitblit v1.8.0