From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/test/java/org/fanli/TBImgTest.java |   35 +++++++----------------------------
 1 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/fanli/src/test/java/org/fanli/TBImgTest.java b/fanli/src/test/java/org/fanli/TBImgTest.java
index ed88397..95d4ac4 100644
--- a/fanli/src/test/java/org/fanli/TBImgTest.java
+++ b/fanli/src/test/java/org/fanli/TBImgTest.java
@@ -1,43 +1,22 @@
 package org.fanli;
 
-import java.io.IOException;
-import java.io.InputStream;
+import java.util.List;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.yeshi.utils.HttpUtil;
-import org.yeshi.utils.exception.HttpException;
+import org.yeshi.utils.entity.ProxyIP;
 
-import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
-import com.yeshi.fanli.util.FileUtil;
-import com.yeshi.fanli.util.ImageUtil;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.entity.common.ImageInfo;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 
 @Ignore
 public class TBImgTest {
 
 	@Test
 	public void test1() {
-
-		try {
-			InputStream img = ImageUtil.drawGoodsShareImg(
-					HttpUtil.downLoadImg(
-							"https://wwc.alicdn.com/avatar/getAvatar.do?userId=1889722423&width=160&height=160&type=sns"),
-					HttpUtil.downLoadImg(
-							"https://wwc.alicdn.com/avatar/getAvatar.do?userId=1889722423&width=160&height=160&type=sns"),
-					TaoKeApiUtil.searchGoodsDetail(559888327092L));
-			try {
-				FileUtil.saveAsFile(img, "D:/test.png");
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			
-			
-		} catch (HttpException e) {
-			e.printStackTrace();
-		} catch (TaobaoGoodsDownException e) {
-			e.printStackTrace();
-		}
+		List<ImageInfo> list = TaoBaoUtil.getTBDetailImageWithSizev2(565204406588L,new ProxyIP("180.104.85.109", 4248));
+		for (ImageInfo info : list)
+			System.out.println(info.getPicture());
 	}
 
 }

--
Gitblit v1.8.0