From be641cbe14bf20c807dccceb1c4b825d80443aed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 一月 2020 14:42:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/test/java/org/fanli/TaoKeTest.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index b8319de..2bb28b4 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -32,6 +32,7 @@
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
import com.yeshi.fanli.util.BeanUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -91,14 +92,9 @@
@Test
public void test2() {
- // String link = TaoKeApiUtil.officialActivityConvert("87140050199",
- // "1571715733668", "20211660");
- // System.out.println(link);
-
- String text = HttpUtil.get("https://m.tb.cn/h.eBj7iNJ?sm=c4049c");
- System.out.println(text);
-
-
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCoupon(571754672318L,
+ new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET));
+ System.out.println(goods);
}
@@ -203,8 +199,19 @@
@Test
public void test6() {
- TaoBaoGoodsBrief goods = TaoBaoUtil.getSimpleGoodsBrief(607940944794L);
- System.out.println(goods);
+ String text = "[鐜懓]鍚勪綅浜插弸濂斤紝璁板緱棰嗗埜鍝鎰夊揩]" + "銆愪含涓�1鏈�3鏃ラ鍒哥簿閫夈�慭n" + "[绾㈠寘]鎶㈢孩鍖� 鏈�楂�888\n" + "https://u.jd.com/8xeCfl\n"
+ + "馃殔鐏溅绁ㄧ鍒�50鍏僜n" + "https://u.jd.com/cMReZz\n" + "馃専灞呭濂界墿9.9鍖呴偖\n" + "https://u.jd.com/AG2z4A\n"
+ + "馃憯鐢疯3浠�7鎶榎n" + "https://u.jd.com/kgMslr\n" + "馃憲濂宠娓呬粨5鎶樿捣\n" + "https://u.jd.com/kgMslr\n" + "馃泹鏈夌ぜ鏈夊勾璐n"
+ + "https://u.jd.com/qdvIiG\n" + "馃拫SK-II澶т績\n" + "https://u.jd.com/7XybkD\n" + "馃挵瓒呯骇鐧句嚎琛ヨ创\n"
+ + "https://u.jd.com/qVFjDL\n" + "馃嵓姣嶅┐鍒稿勾璐ц妭\n" + "https://u.jd.com/kA0scy\n" + "馃泹瓒呭競婊�199-100\n"
+ + "https://u.jd.com/eQSwNn\n" + "[鐧糫鍐呰喘鍒稿ぇ鍏╘n" + "https://u.jd.com/zIHmUy\n" + "[绂廬Plus鍏ㄥ搧鍒竆n"
+ + "https://u.jd.com/d9fcGr\n" + "鈿′含涓滅鏉�\n" + "https://u.jd.com/WSIi1z\n" + "銆愯寰椾笌鏇村濂藉弸鍒嗕韩[鎰夊揩]銆�";
+ ConvertLinkManager convertLinkManager = BeanUtil.getBean(ConvertLinkManager.class);
+ try {
+ System.out.println(convertLinkManager.convertLinkFromText(text, 437032L, true));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@Test
--
Gitblit v1.8.0