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 | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index 6411807..0327766 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -1,3 +1,4 @@
+
package org.fanli;
import java.io.File;
@@ -5,12 +6,10 @@
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;
-import org.junit.Ignore;
import org.junit.Test;
import org.yeshi.utils.HttpUtil;
@@ -22,18 +21,16 @@
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.job.UpdateRelationAndSpecialOrderJob;
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;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.BeanUtil;
-import com.yeshi.fanli.util.SpringContext;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
@@ -49,24 +46,21 @@
@Test
public void test1() {
- UpdateRelationAndSpecialOrderJob updateRelationAndSpecialOrderJob= BeanUtil.getBean(UpdateRelationAndSpecialOrderJob.class);
- SpringContext.initCOS();
- updateRelationAndSpecialOrderJob.doJob2();
+ try {
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.getSimpleGoodsInfo(575733104503L);
+ System.out.println(goods);
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ }
}
@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());
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- }
+ 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
@@ -82,9 +76,6 @@
Long[] auctionIds = new Long[] { 528561708277L, 563689377074L, 570752677800L, 569281626446L, 567165767332L,
555437572417L, 534857332052L, 565233575889L, 565536124572L };
- for (Long auctionId : auctionIds)
- TaoKeApiUtil.createTaoLiJin(auctionId, "杩斿埄鍒告柊浜烘窐绀奸噾绾㈠寘", new BigDecimal("1.00"), 1, 1, new Date(),
- new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24L), new Date());
// 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";
--
Gitblit v1.8.0