From d40e978df4717d91f72f6e295c58f98524bbd29c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 一月 2020 14:27:28 +0800
Subject: [PATCH] 跳转方式增加小程序
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 48 +++++++++++++++++++++---------------------------
1 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 8c5cdf9..a3b21f9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -58,7 +58,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
@@ -1756,30 +1755,6 @@
return taoBaoGoods;
}
- public static TaoBaoGoodsBrief convert(DaTaoKeDetail detail) {
- TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();
- taoBaoGoods.setAuctionId(detail.getGoodsId());
- taoBaoGoods.setBiz30day(detail.getSalesNum());
- taoBaoGoods.setCouponAmount(detail.getQuanPrice());
- taoBaoGoods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getQuanCondition(),
- MoneyBigDecimalUtil.getWithNoZera(detail.getQuanPrice())));
- taoBaoGoods.setCouponLeftCount(detail.getQuanSurplus());
- taoBaoGoods.setCouponStartFee(new BigDecimal(detail.getQuanCondition()));
- if (detail.getQuanReceive() != null)
- taoBaoGoods.setCouponTotalCount(detail.getQuanSurplus() + detail.getQuanReceive());
- taoBaoGoods.setPictUrl(detail.getPic());
- taoBaoGoods.setPictUrlWhite(detail.getPic());
- taoBaoGoods.setSellerId(detail.getSellerId());
- taoBaoGoods.setShopTitle("");
- taoBaoGoods.setTitle(detail.getdTitle());
- taoBaoGoods.setUserType(detail.getIsTmall());
- taoBaoGoods.setZkPrice(detail.getOrgPrice());
- taoBaoGoods.setTkRate(detail.getCommission());
- taoBaoGoods.setTkCommFee(new BigDecimal("0"));
- taoBaoGoods.setState(0);
- return taoBaoGoods;
- }
-
public static TaoBaoGoodsBrief convert(DaTaoKeDetailV2 detail) {
TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();
taoBaoGoods.setAuctionId(detail.getGoodsId());
@@ -1863,8 +1838,7 @@
String result = null;
try {
- Connection.Response doc = Jsoup.connect(url).ignoreContentType(true)
- .timeout(1000*10)
+ Connection.Response doc = Jsoup.connect(url).ignoreContentType(true).timeout(1000 * 10)
.userAgent(
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.18362")
.header("Accept", "text/html, application/xhtml+xml, application/xml; q=0.9, */*; q=0.8")
@@ -2153,4 +2127,24 @@
return false;
}
+ /**
+ * 浠庢枃鏈腑鎻愬彇娣樺彛浠�
+ * @Title: getTokenListFromText
+ * @Description:
+ * @param str
+ * @return
+ * List<String> 杩斿洖绫诲瀷
+ * @throws
+ */
+ public static List<String> getTokenListFromText(String str) {
+ String pattern = "(鈧硔1}[A-Za-z0-9]+鈧硔1})|(楼{1}[A-Za-z0-9]+楼{1})|(锟1}[A-Za-z0-9]+锟1})|(鈧瑊1}[A-Za-z0-9]+鈧瑊1})";
+ Pattern r = Pattern.compile(pattern);
+ Matcher m = r.matcher(str);
+ List<String> urlList = new ArrayList<>();
+ while (m.find()) {
+ urlList.add(m.group());
+ }
+ return urlList;
+ }
+
}
--
Gitblit v1.8.0