From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并

---
 fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
index e02f9d1..30904b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
@@ -15,17 +15,22 @@
 
 public class DaTaoKeApiUtil {
 	final static String API_KEY = "a083abb893";
+	final static String API_KEY_2 = "b7a5ea2cd9";
 	static Gson gson = new Gson();
 
 	public static DaTaoKeApiResult goodsList(int page) {
 		List<DaTaoKeDetail> list = new ArrayList<>();
 		String url = String.format("http://api.dataoke.com/index.php?r=Port/index&type=total&appkey=%s&v=2&page=%s",
-				API_KEY, page + "");
+				Math.random() > 0.5 ? API_KEY : API_KEY_2, page + "");
 		String result = HttpUtil.get(url);
 		JSONObject resultJson = JSONObject.fromObject(result);
+		System.out.println(resultJson);
 		JSONArray array = resultJson.optJSONArray("result");
 		for (int i = 0; i < array.size(); i++) {
-			list.add(gson.fromJson(array.optJSONObject(i).toString(), DaTaoKeDetail.class));
+			DaTaoKeDetail detail = gson.fromJson(array.optJSONObject(i).toString(), DaTaoKeDetail.class);
+			if (detail != null && !detail.getPic().startsWith("http"))
+				detail.setPic("https:" + detail.getPic());
+			list.add(detail);
 		}
 		return new DaTaoKeApiResult(resultJson.optJSONObject("data").optInt("total_num"),
 				resultJson.optJSONObject("data").optString("update_time"), list);

--
Gitblit v1.8.0