From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 89 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 44 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..edf39f4 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
@@ -6,6 +6,7 @@
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -25,6 +26,7 @@
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.params.HttpMethodParams;
+import org.hibernate.cache.spi.NaturalIdCacheKey;
import org.jsoup.Connection;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
@@ -58,7 +60,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;
@@ -1074,23 +1075,18 @@
return tg;
}
- public static TaoBaoGoodsBrief getTaoBaoGoodsBrief(String id) {
- Map<String, String> params = new HashMap<String, String>();
- params.put("q", String.format("http://item.taobao.com/item.htm?id=%s", id));
- params.put("_t", System.currentTimeMillis() + "");
- params.put("auctionTag", "");
- params.put("perPageSize", 40 + "");
- params.put("t", System.currentTimeMillis() + "");
- String result = TaoBaoHttpUtil.get(SEARCH_URL, params);
- result = result.replace("</span>", "").replace("<span class=H>", "");
- TaoBaoSearchResult presult = parseTaoBao(result);
- if (presult != null && presult.getTaoBaoGoodsBriefs().size() > 0) {
- // TaoBaoGoodsBrief taoBaoGoodsBrief =
- // presult.getTaoBaoGoodsBriefs().get(0);
-
- return presult.getTaoBaoGoodsBriefs().get(0);
- } else
- return null;
+ /**
+ * 鑾峰彇鏈弬涓庢帹骞跨殑娣樺疂鍟嗗搧璇︽儏
+ * @Title: getTaoBaoGoodsBrief
+ * @Description:
+ * @param id
+ * @return
+ * TaoBaoGoodsBrief 鍖呭惈锛堟爣棰樹笌鍥剧墖锛�
+ * @throws
+ */
+ public static TaoBaoGoodsBrief getTaoBaoGoodsBriefNotInPub(Long id) {
+ TaoBaoGoodsBrief tb = TaoBaoUtil.getTmallGoodsInfo(id+"");
+ return tb;
}
public static List<String> getSuguestSearch(String key) {
@@ -1756,30 +1752,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 +1835,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 +2124,34 @@
return false;
}
+ /**
+ * 浠庢枃鏈腑鎻愬彇娣樺彛浠�
+ * @Title: getTokenListFromText
+ * @Description:
+ * @param str
+ * @return
+ * List<String> 杩斿洖绫诲瀷
+ * @throws
+ */
+ public static List<String> getTokenListFromText(String str) {
+ String[] marks = new String[] { "鈧�", "楼", "锟�", "鈧�", "\\$", "鈧�", "垄", "鈧�" };
+
+ return getTokenListFromText(str, Arrays.asList(marks));
+ }
+
+ public static List<String> getTokenListFromText(String str, List<String> markList) {
+ List<String> expressList = new ArrayList<>();
+ for (String st : markList) {
+ expressList.add(String.format("(%s{1}[A-Za-z0-9]{11,13}+%s{1})", st, st));
+ }
+ String pattern = StringUtil.concat(expressList, "|");
+ 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