From 41ca6e0132b92a34624380a18d19eb7b7e73d522 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:23:51 +0800
Subject: [PATCH] 冲突
---
fanli/src/test/java/org/fanli/TaoKeTest.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index c5eb6ec..2854814 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -35,7 +35,6 @@
import com.yeshi.fanli.util.BeanUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
-import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -49,13 +48,41 @@
@Test
public void test1() {
- DaTaoKeApiUtil.getGoodsDetail(23527089L);
+ // List<TaoBaoGoodsBrief> list=
+ // TaoKeApiUtil.guessLikeByAuctionId(550439753563L,6);
+ // System.out.println(list);
+ // TaoBaoUtil.getTBDetailImageWithSize(597016140493L);
+ // System.out.println(goods);
+ // DaTaoKeApiUtil.getGoodsDetailByGoodsId(558195316187L);
+ // try {
+ // TaoKeApiUtil.specialConvertCoupon(608512721647L, new
+ // TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ // TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
+ // TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
+ // } catch (Exception e) {
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
+ // }
+
+// String link = TaoKeApiUtil.officialActivityConvert(87140050199L + "", "1571715733668", "513796574");
+// System.out.println(link);
+
+// String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+// "http://api.flqapp.com/fanli/client/v1/auth/callback/tb", 6396582L, "share");
+// System.out.println(link);
+
+ try {
+ TaoKeApiUtil.searchGoodsDetail(608512721647L);
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ }
+
}
@Test
public void test2() {
- String link = TaoKeApiUtil.officialActivityConvert("87140050199", "1571120794546", "20211660");
- System.out.println(TaoKeApiUtil.getTKToken("http://", "姣嶅┐棰勫敭", link));
+ String link = TaoKeApiUtil.officialActivityConvert("87140050199", "1571715733668", "20211660");
+ System.out.println(link);
// https://s.click.taobao.com/t?e=m%3D2%26s%3DW%2Fys7R71JXMcQipKwQzePCperVdZeJviyK8Cckff7TVRAdhuF14FMXC%2FEJQELlNo5x%2BIUlGKNpVpS9y0ojX%2FfMsvmRQfeMsreH9%2FasRClvq63GoCXmcqkTiRUN2xVR4GdesO8XD8dsNdITvXwTxvKDqJgCOacH%2BU%2FVJqtNeEg5OOvkjnk315zzvflh4%2Fhqj8BmyXDtEFdgwjGkouqJtJeds5wF0j1Yhhp1953%2FcnpLUV6UUID4c8TeTEWJdP8jmRdTEuB5K8MGvkLv1nNhnYz%2FB0z8qlrv%2Bjr%2B%2FiM5RbEEle7auY0HPYWszlTEcWhO9mli2vZjCuAmyG1kYtrC7hgcEnE%2FQxigjMfFc2hYciEyAdpuz3kb9JWJVVX36lFeRKtwLUkdbL0syg%2BG8%2FlCRQJ1YlOPkYHNIul3paqKYwK75NNUki5Nwcg2GYz3Bez8Z8OusR9%2BDFlSU%2BcenL13XDY2hrrfx7OMbmkUtLKDKbz1CCoC2zoKs%2FmnEqY%2Bakgpmw&pvid=24980167&union_lens=lensId:0b013a8d_0cec_16df214d979_38a1
}
--
Gitblit v1.8.0