From 8b505f74e1094fd67f86373ab9e9f80b54bca54e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 11 十月 2019 12:12:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/test/java/org/fanli/TaoKeTest.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index ae9db0d..3763633 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -15,6 +15,7 @@
import org.yeshi.utils.HttpUtil;
import com.yeshi.fanli.dao.mybatis.taobao.TBPidMapper;
+import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.taobao.PidUser;
@@ -22,7 +23,6 @@
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.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
@@ -36,6 +36,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONArray;
@@ -48,8 +49,7 @@
@Test
public void test1() {
- TaoBaoSearchResult result = TaoKeApiUtil.getMaterialByMaterialId(16432, 1, 100);
- System.out.println(result);
+ System.out.println(TaoBaoUtil.filterTaoToken("锟uPdYM9Knxe锟�"));
}
@Test
@@ -74,15 +74,16 @@
@Test
public void test3() {
Long auctionId = 598165623087L;
- String appKey = "27821872";
- String appSecret = "9277b7c40b753e142303eeabc1936c80";
- String pid = "mm_491980152_690500060_109327900051";
+ String appKey = "27965236";
+ String appSecret = "2be7a216bee767dc3a6388aa24f11140";
+ String pid = "mm_502940004_754900291_109486750166";
TaoKeAppInfo app = new TaoKeAppInfo(appKey, appSecret, pid);
try {
- TaoKeApiUtil.createTaoLiJin(auctionId, "娣樼ぜ閲�", new BigDecimal(1), 1, new Date(),
+ TaoLiJinDTO dto = 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);
+ System.out.println(dto);
} catch (Exception e) {
e.printStackTrace();
}
@@ -90,7 +91,6 @@
@Test
public void test4() {
-
TaoBaoOrderService taoBaoOrderService = BeanUtil.getBean(TaoBaoOrderService.class);
try {
List<TaoBaoOrder> list = TaoBaoOrderUtil.parseOrder(
--
Gitblit v1.8.0