From d0da0aa5e01dd73b7fca8e59ff2664d7e6076802 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 24 六月 2020 10:09:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 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 6c84500..4bcbb55 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
@@ -700,7 +700,7 @@
* @throws
*/
public static String convertLink(Long auctionId, String pid) {
- TaoKeAppInfo app = APP_KEYS[1];
+ TaoKeAppInfo app = APP_KEYS[0];
Map<String, String> params = new TreeMap<>();
params.put("version", "v1.1.1");
params.put("goodsId", auctionId + "");
@@ -728,4 +728,42 @@
}
return null;
}
+
+ /**
+ *
+ * @param pageId
+ * @return
+ */
+ public static DaTaoKeGoodsResult getFriendsFircleList(String pageId, int pageSize) {
+ DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+
+ TaoKeAppInfo app = getRandomApp();
+ Map<String, String> params = new TreeMap<>();
+ params.put("version", "v1.2.2");
+ params.put("appKey", app.getAppKey());
+ params.put("pageSize", pageSize + "");
+ if (!StringUtil.isNullOrEmpty(pageId))
+ params.put("pageId", pageId);
+ params.put("sign", getSign(params, app.getAppSecret()));
+
+ String result = null;
+ try {
+ result = HttpUtil.get("https://openapi.dataoke.com/api/goods/friends-circle-list", params, new HashMap<>());
+ } catch (Exception e) {
+ result = HttpUtil.get("https://openapi.dataoke.com/api/goods/friends-circle-list", params, new HashMap<>());
+ }
+ JSONObject json = JSONObject.fromObject(result);
+ JSONObject dataJson = json.optJSONObject("data");
+ if (dataJson != null) {
+ JSONArray array = dataJson.optJSONArray("list");
+ if (array != null) {
+ List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array);
+ daTaoKeGoodsResult.setGoodsList(list);
+ }
+ daTaoKeGoodsResult.setPageId(dataJson.optString("pageId"));
+ daTaoKeGoodsResult.setTotalCount(dataJson.optLong("totalNum"));
+ }
+ return daTaoKeGoodsResult;
+ }
+
}
--
Gitblit v1.8.0