From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index 0327766..ee8bec7 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.io.FileNotFoundException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,11 +22,11 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 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.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsActivityService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
 import com.yeshi.fanli.service.inter.user.TBPidService;
 import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
@@ -47,7 +48,10 @@
 	@Test
 	public void test1() {
 		try {
-			TaoBaoGoodsBrief goods = TaoKeApiUtil.getSimpleGoodsInfo(575733104503L);
+			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();
@@ -56,33 +60,39 @@
 
 	@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
 	public void test3() {
-		// try {
-		// EmergencyUtil.baoJin("monitor-error-tb-app-limit-24980167",
-		// "娣樺疂APPKey璇锋眰闄愬埗銆�24980167銆�", new String[] { "18581318252" });
-		// } catch (Exception e1) {
-		//
-		// }
-		// 0K6TBHS%2F84vpYy%2FzKPWwH6J7%2BkHL3AEW
-		// 2PlyMHAEtzjJX3K6R73L5KJ7%2BkHL3AEW
-		Long[] auctionIds = new Long[] { 528561708277L, 563689377074L, 570752677800L, 569281626446L, 567165767332L,
-				555437572417L, 534857332052L, 565233575889L, 565536124572L };
+		Long auctionId = 598165623087L;
+		String appKey = "27821872";
+		String appSecret = "9277b7c40b753e142303eeabc1936c80";
+		String pid = "mm_491980152_690500060_109327900051";
+		TaoKeAppInfo app = new TaoKeAppInfo(appKey, appSecret, pid);
 
-		// TaoKeApiUtil.getLiJinXG();
-		// String
-		// url="https://uland.taobao.com/taolijin/edetail?eh=aIrBfHZGd4iZuQF0XRz0iAXoB+DaBK5LQS0Flu/fbSp4QsdWMikAalrisGmre1Id0BFAqRODu114yl7QZ1qFyc7LbOC0oAuo+MUwzxYlSKECGml30RY8PBx5jSVkulpmRQIlrKaDNziGVmobyGguP+jgTFwOoHsRe9593cvcC9QGQASttHIRqdGO5qxVOPQ2buEoHk5wx6hxhsv5QYr1rbcOQrCzclRfPTIk7Z0myMWxZvcNeMU+E+L71lQF+6uZp7DLcYmoygrjfjYOW9fVleIg09jheaZgonv6QcvcARY=&union_lens=lensId:0b0b4505_0c2a_16af789993f_0880;traffic_flag=lm";
-		// String token=
-		// TaoKeApiUtil.getTKToken("https://img.alicdn.com/imgextra/i4/2256112408/O1CN01EKNifJ1TeuF9x4it9_!!2256112408.jpg_400x400.jpg",
-		// "鏃楃澘鐢甸鎵囧彴寮忓鐢�12瀵�16瀵搁潤闊冲鐢熷鑸嶆憞澶村畾鏃惰妭鑳藉彴鎵囪惤鍦版墖", url);
-		// System.out.println(token);
+		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 (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	@Test

--
Gitblit v1.8.0