From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index cb87218..0327766 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -1,8 +1,10 @@
+
 package org.fanli;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -19,12 +21,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.TaoBaoPunishOrder;
-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;
@@ -32,10 +33,8 @@
 import com.yeshi.fanli.util.BeanUtil;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
-import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -47,37 +46,43 @@
 
 	@Test
 	public void test1() {
-		// TaoBaoShop shop=
-		// TaoBaoUtil.getTaoBaoShopDetailByAuctionId(536542467108L);
-		// System.out.println(shop);
-		long startTime = TimeUtil.convertToTimeTemp("2019-04-02 00:00:00", "yyyy-MM-dd HH:mm:ss");
-
-		List<TaoBaoPunishOrder> list = TaoKeOrderApiUtil.getPunishOrderList(startTime,
-				startTime + 1000 * 60 * 60 * 24L);
-		System.out.println(list);
-
-		// TaoKeApiUtil.getTaoKeContentEffective();
-		// TaoKeApiUtil.getTaoKeContent();
-	}
-
-	@Test
-	public void test2() {
-		TaoKeAppInfo app = new TaoKeAppInfo();
-		app.setAdzoneId("44841750025");
-		app.setAppKey("25070111");
-		app.setAppSecret("c7809ad9cd926fc45199d1d3ab7fe2eb");
-		app.setPid("mm_124933865_113050446_44841750025");
 		try {
-			TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(527893773636L, app);
-			System.out.println(goods.getId());
+			TaoBaoGoodsBrief goods = TaoKeApiUtil.getSimpleGoodsInfo(575733104503L);
+			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"));
+	}
+
+	@Test
 	public void test3() {
-		TaoKeApiUtil.taoKeContent();
+		// 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 };
+
+		// 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);
 	}
 
 	@Test

--
Gitblit v1.8.0