From 179b39401c406579a0d10c442a665aeb2802e931 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 20 五月 2019 09:17:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java | 81 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
index a692119..7349511 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
@@ -99,30 +99,29 @@
"馃専",// 鍙戝厜鐨勬槦鏄�
};
- static final String[] timeEmojis = new String[] {
- "馃暃",// 鍗佷簩鐐�
- "馃暓",// 鍗佷簩鐐瑰崐
- "馃晲",// 涓�鐐归挓
- "馃暅",// 涓�鐐瑰崐
- "馃晳",// 涓ょ偣
- "馃暆",// 涓ょ偣鍗�
- "馃晵",// 涓夌偣閽�
- "馃暈",// 涓夌偣鍗�
- "馃晸",// 鍥涚偣閽�
- "馃暉",// 鍥涚偣鍗�
- "馃晹",// 浜旀椂
- "馃暊",// 浜旂偣鍗�
- "馃晻",// 鍏偣
- "馃暋",// 鍏偣鍗�
- "馃晼",// 涓冪偣
- "馃暍",// 涓冪偣鍗�
- "馃晽",// 鍏偣
- "馃暎",// 鍏偣鍗�
- "馃晿",// 涔濈偣閽�
- "馃暏",// 涔濈偣鍗�
- "馃暀",// 鐨勫崄鐐�
- "馃暐",// 鍗佺偣鍗�
- "馃暁",// 鍗佷竴鐐�
+ static final String[] timeEmojis = new String[] { "馃暃", // 鍗佷簩鐐�
+ "馃暓", // 鍗佷簩鐐瑰崐
+ "馃晲", // 涓�鐐归挓
+ "馃暅", // 涓�鐐瑰崐
+ "馃晳", // 涓ょ偣
+ "馃暆", // 涓ょ偣鍗�
+ "馃晵", // 涓夌偣閽�
+ "馃暈", // 涓夌偣鍗�
+ "馃晸", // 鍥涚偣閽�
+ "馃暉", // 鍥涚偣鍗�
+ "馃晹", // 浜旀椂
+ "馃暊", // 浜旂偣鍗�
+ "馃晻", // 鍏偣
+ "馃暋", // 鍏偣鍗�
+ "馃晼", // 涓冪偣
+ "馃暍", // 涓冪偣鍗�
+ "馃晽", // 鍏偣
+ "馃暎", // 鍏偣鍗�
+ "馃晿", // 涔濈偣閽�
+ "馃暏", // 涔濈偣鍗�
+ "馃暀", // 鐨勫崄鐐�
+ "馃暐", // 鍗佺偣鍗�
+ "馃暁", // 鍗佷竴鐐�
"馃暒",// 鍗佷竴鐐瑰崐
};
@@ -456,8 +455,8 @@
}
private static List<DaTaoKeDetail> parseCurrent(String url) {
-
- List<DaTaoKeDetail> list=new ArrayList<>();
+
+ List<DaTaoKeDetail> list = new ArrayList<>();
try {
Document doc = Jsoup.connect(url)
.userAgent(
@@ -471,7 +470,7 @@
.getElementsByTag("b").get(0).text();
System.out.println(id + "-" + currentSale);
- DaTaoKeDetail detail=new DaTaoKeDetail();
+ DaTaoKeDetail detail = new DaTaoKeDetail();
detail.setId(id);
detail.setSalesNum(Integer.parseInt(currentSale));
list.add(detail);
@@ -528,19 +527,35 @@
return parseCurrent(url);
}
+ private static String getRandomCommonEmoji() {
+ return commonEmojis[(int) (Math.random() * commonEmojis.length)];
+ }
+
public static String getDesc(DaTaoKeDetail detail) {
// 鏍囬+鍒稿悗浠�+鍖呴偖+鎻忚堪
- String desc = "馃槢" + detail.getdTitle() + "馃槢";
+ String desc = detail.getdTitle();
desc += "\n";
- desc += "馃槢" + String.format("鍒稿悗馃挵銆�%s鍏冦�戝寘閭鏉� ", MoneyBigDecimalUtil.getWithNoZera(detail.getPrice()).toString())
- + "馃槢";
+ desc += String.format("鍒稿悗浠�%s銆�%s鍏冦�戝寘閭鏉� ",Math.random()>0.5?"馃挵":"", MoneyBigDecimalUtil.getWithNoZera(detail.getPrice()).toString())
+ + (Math.random()>0.5?getRandomCommonEmoji():"");
desc += "\n";
- desc += detail.getIntroduce();
+// desc += detail.getIntroduce();
+ String introduce = detail.getIntroduce().replace("锛�", ",").replace("銆�", ",").replace("锛�", ",")
+ .replace(",", ",");
+ introduce=introduce.replace(",,,", ",").replace(",,", ",");
+
+ String[] sts = introduce.split(",");
+ introduce = "";
+ for (int i = 0; i < sts.length; i++) {
+ if (i % 2 == 1) {// 闇�瑕佹崲琛�
+ introduce += sts[i] + (Math.random()>0.5?getRandomCommonEmoji():i==sts.length-1?"":"锛�") + "\n";
+ } else
+ introduce += sts[i] + (Math.random()>0.5?getRandomCommonEmoji():i==sts.length-1?"":"锛�");
+ }
+ desc+=introduce;
return desc;
}
-
public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetail detail) {
if (detail != null) {
// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
@@ -554,5 +569,5 @@
}
return goods;
}
-
+
}
--
Gitblit v1.8.0