From 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 10 九月 2019 16:54:11 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 0a75e85..6bb2c43 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
@@ -189,6 +189,7 @@
taoBaoShopDTO.setSellerId(item.optLong("seller_id"));
taoBaoShopDTO.setBrandId(item.optString("brand_id"));
taoBaoShopDTO.setBrandDes(item.optString("brand_des"));
+ taoBaoShopDTO.setShopIcon(item.optString("brand_logo"));
taoBaoShopDTO.setUserType(0);
// 鍟嗗搧淇℃伅
@@ -542,6 +543,39 @@
return detail;
}
+
+ /**
+ * 鍚勫ぇ姒滃崟
+ *
+ * @param type
+ * @return
+ */
+ public static String getHotWords() {
+ TaoKeAppInfo app = getRandomApp();
+ Map<String, String> params = new TreeMap<>();
+ params.put("version", "v1.0.1");
+ params.put("appKey", app.getAppKey());
+ params.put("sign", getSign(params, app.getAppSecret()));
+
+ String result = null;
+ try {
+ result = HttpUtil.get("https://openapi.dataoke.com/api/category/get-top100", params, new HashMap<>());
+ } catch (Exception e) {
+ result = HttpUtil.get("https://openapi.dataoke.com/api/category/get-top100", params, new HashMap<>());
+ }
+
+ String hotWords = null;
+ JSONObject json = JSONObject.fromObject(result);
+ if (json != null) {
+ json = json.getJSONObject("data");
+ if (json != null) {
+ hotWords = json.optString("hotWords");
+ }
+ }
+ return hotWords;
+ }
+
+
class DaTaoKeResult {
Date updateTime;
List<DaTaoKeDetail> dataList;
@@ -555,5 +589,4 @@
}
}
-
}
--
Gitblit v1.8.0