From a9b7fab63c4345a6b183bffdab1bb0884f4202b5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 八月 2019 15:22:19 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 97a67ef..d8b914e 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
@@ -374,7 +374,7 @@
List<DingDongQiangDTO> list = new ArrayList<>();
Document doc = null;
try {
- doc = Jsoup.connect("http://www.dataoke.com/ddq").get();
+ doc = Jsoup.connect("http://www.dataoke.com/ddq").userAgent("").get();
} catch (IOException e1) {
e1.printStackTrace();
}
@@ -395,9 +395,11 @@
for (Iterator<String> its = dataJson.keys(); its.hasNext();) {
String key = its.next();
JSONArray array = dataJson.optJSONArray(key);
- List<DaTaoKeDetail> detailList = new ArrayList<>();
+ List<DaTaoKeDetailV2> detailList = new ArrayList<>();
for (int n = 0; n < array.size(); n++) {
- detailList.add(new DaTaoKeDetail(array.optJSONObject(n).optLong("id")));
+ DaTaoKeDetailV2 v2 = new DaTaoKeDetailV2();
+ v2.setId(array.optJSONObject(n).optLong("id"));
+ detailList.add(v2);
}
list.add(new DingDongQiangDTO(key, detailList));
}
@@ -574,7 +576,5 @@
return detail;
}
-
-
}
--
Gitblit v1.8.0