From bbb7a538df960f2f47b0af8c3db03622fca08d99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 五月 2020 13:54:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/test/java/org/fanli/TaoKeTest.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index 3957b80..a0ba7ee 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -86,10 +86,14 @@
 		// e.printStackTrace();
 		// }
 
-		List<TaoBaoOrder> list = TaoKeOrderApiUtil.getTaoBaoRelationOrderList(
-				TimeUtil.convertToTimeTemp("2019-12-09 10:13:52", "yyyy-MM-dd HH:mm:ss"),
-				TimeUtil.convertToTimeTemp("2019-12-09 10:14:53", "yyyy-MM-dd HH:mm:ss"), 1);
-		System.out.println(list);
+//		List<TaoBaoOrder> list = TaoKeOrderApiUtil.getTaoBaoRelationOrderList(
+//				TimeUtil.convertToTimeTemp("2019-12-09 10:13:52", "yyyy-MM-dd HH:mm:ss"),
+//				TimeUtil.convertToTimeTemp("2019-12-09 10:14:53", "yyyy-MM-dd HH:mm:ss"), 1);
+//		System.out.println(list);
+		
+		 String result = TaoKeApiUtil.officialActivityConvert("19507100253",
+				 "1571715733668", "20211660").getShort_click_url();
+		 System.out.println(result);
 	}
 
 	@Test

--
Gitblit v1.8.0