From 3e4ef41ffacd7f5fda2e81c3810cd11a6375b83c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:32:35 +0800
Subject: [PATCH] 好单库转链支持
---
fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java | 114 +++++++++++++++-----------------------------------------
1 files changed, 31 insertions(+), 83 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java
index 358cbfc..00321c8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java
@@ -23,14 +23,10 @@
import net.sf.json.JSONObject;
public class AitaokerApiUtil {
-
public static String APP_KEY = "1077080250";
public static String SECRET_KEY = "7c6118bd-7aa5-65b8-c6d4-058728e9446f";
-
// 璇锋眰杩炴帴
private static String SERVER_URL = "http://router.itaoke.org/api";
-
-
private static String baseRequest(String method, Map<String, String> param) {
@@ -53,9 +49,7 @@
baseMap.put(key, param.get(key));
}
}
-
url+= "sign=" + getSign(baseMap);
-
return HttpUtil.post(url, param);
}
@@ -105,12 +99,9 @@
* @return
*/
public static QrcodeLoginDTO getQrcodeMaclogin(int robotId) {
- // 璇锋眰鍙傛暟
Map<String, String> map = new HashMap<>();
map.put("robot_id", robotId +"");
- // 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.qrcode.maclogin", map);
-
JSONObject resultJson = JSONObject.fromObject(result);
resultJson = resultJson.optJSONObject("data");
if (resultJson != null) {
@@ -120,30 +111,6 @@
return null;
}
- /**
- * 妫�鏌ユ槸鍚︽壂鐮�
- * @param robotId
- * @return
- */
- public static Boolean getQrcodeStatus(int robotId) {
- // 璇锋眰鍙傛暟
- Map<String, String> map = new HashMap<>();
- map.put("robot_id", robotId +"");
- // 璇锋眰缁撴灉
- String result = baseRequest("itaoke.robot.qrcode.status", map);
- JSONObject resultJson = JSONObject.fromObject(result);
- resultJson = resultJson.optJSONObject("data");
- if (resultJson != null && !StringUtil.isNullOrEmpty(resultJson.optString("status"))) {
- int optInt = resultJson.optInt("status");
- if (optInt == 1) {
- return true;
- } else {
- return false;
- }
- }
- return null;
- }
-
/**
* 妫�鏌ユ槸鍚︾櫥闄嗭紙鐪熸鐨勭櫥褰曟帴鍙ｏ級
@@ -157,12 +124,14 @@
map.put("robot_id", robotId +"");
map.put("uuid", wId);
// 璇锋眰缁撴灉
- String result = baseRequest("itaoke.robot.check.maclogin", map);
+ String result = baseRequest("itaoke.robot.async.mlogin", map);
JSONObject resultJson = JSONObject.fromObject(result);
- resultJson = resultJson.optJSONObject("data");
- if (resultJson != null && !StringUtil.isNullOrEmpty(resultJson.optString("wcId"))) {
- Type type = new TypeToken<QrcodeLoginDTO>() {}.getType();
- return new Gson().fromJson(resultJson.toString(), type);
+ if ("0000".equals(resultJson.optString("status"))) {
+ resultJson = resultJson.optJSONObject("data");
+ if (resultJson != null) {
+ Type type = new TypeToken<QrcodeLoginDTO>() {}.getType();
+ return new Gson().fromJson(resultJson.toString(), type);
+ }
}
return null;
}
@@ -173,14 +142,15 @@
* @return
*/
public static boolean onlineCheck(int robotId) {
- // 璇锋眰鍙傛暟
Map<String, String> map = new HashMap<>();
map.put("robot_id", robotId +"");
- // 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.check.online", map);
JSONObject resultJson = JSONObject.fromObject(result);
- if ("0000".equals(resultJson.optString("code"))) {
- return true;
+ if ("0000".equals(resultJson.optString("status"))) {
+ resultJson = resultJson.optJSONObject("data");
+ if (resultJson != null) {
+ return resultJson.optBoolean("isOnline");
+ }
}
return false;
}
@@ -198,30 +168,12 @@
// 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.force.offline", map);
JSONObject resultJson = JSONObject.fromObject(result);
- if ("0000".equals(resultJson.optString("code"))) {
+ if ("0000".equals(resultJson.optString("status"))) {
return true;
}
return false;
}
-
- /**
- * 鎺夌嚎閲嶈繛
- * @param robotId 鏈哄櫒浜篿d
- * @return
- */
- public static boolean loseReconnet(int robotId) {
- // 璇锋眰鍙傛暟
- Map<String, String> map = new HashMap<>();
- map.put("robot_id", robotId +"");
- // 璇锋眰缁撴灉
- String result = baseRequest("itaoke.robot.lose.reconnet", map);
- JSONObject resultJson = JSONObject.fromObject(result);
- if ("0000".equals(resultJson.optString("code"))) {
- return true;
- }
- return false;
- }
/**
* 鍒涘缓鏈哄櫒浜�
@@ -319,7 +271,7 @@
/**
- * 鑾峰彇濂藉弸-缇ゅ垪琛�
+ * 鑾峰彇缇ゅ垪琛�
* @param robotId
* @return
*/
@@ -328,25 +280,15 @@
Map<String, String> map = new HashMap<>();
map.put("robot_id", robotId +"");
// 璇锋眰缁撴灉
- String result = baseRequest("itaoke.robot.get.contract", map);
+ String result = baseRequest("itaoke.robot.room.list", map);
JSONObject resultJson = JSONObject.fromObject(result);
- if ("0000".equals(resultJson.optString("code"))) {
- resultJson = resultJson.optJSONObject("data");
- // 璁㈤槄鍙�
- //JSONArray publicArray = resultJson.optJSONArray("public");
-
- // 濂藉弸鍒楄〃
- //JSONArray friendArray = resultJson.optJSONArray("friend");
-
- // 缇ゅ垪琛�
- JSONArray groupArray = resultJson.optJSONArray("group");
+ if ("0000".equals(resultJson.optString("status"))) {
+ JSONArray groupArray = resultJson.optJSONArray("data");
if (groupArray != null && groupArray.size() > 0) {
- List<WeiXinGroupDTO> listGroup = new ArrayList<>();
- Type type = new TypeToken<RobotInfoDTO>() {}.getType();
- Gson gson = new Gson();
- for (int i = 0 ;i < groupArray.size(); i ++) {
- listGroup.add(gson.fromJson(groupArray.get(i).toString(), type));
- }
+ Type type = new TypeToken<ArrayList<WeiXinGroupDTO>>() {
+ }.getType();
+ List<WeiXinGroupDTO> goodsList = new Gson().fromJson(groupArray.toString(), type);
+ return goodsList;
}
}
return null;
@@ -369,9 +311,14 @@
// 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.macsend.circle", map);
JSONObject resultJson = JSONObject.fromObject(result);
- if ("1000".equals(resultJson.optString("code"))) {
+ if ("0000".equals(resultJson.optString("status"))) {
resultJson = resultJson.optJSONObject("data");
- return resultJson.optString("id");
+ if (resultJson != null) {
+ resultJson = resultJson.optJSONObject("object");
+ if (resultJson != null) {
+ return resultJson.optString("id");
+ }
+ }
}
return null;
}
@@ -415,10 +362,11 @@
map.put("wx_id", wxId);
map.put("msg_id", msgId);
map.put("content", content);
+ map.put("comment_id", "0");
// 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.macsend.circlecomment", map);
JSONObject resultJson = JSONObject.fromObject(result);
- if ("1000".equals(resultJson.optString("code"))) {
+ if ("0000".equals(resultJson.optString("status"))) {
return true;
}
return false;
@@ -442,7 +390,7 @@
// 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.macsend.text", map);
JSONObject resultJson = JSONObject.fromObject(result);
- if (resultJson.optInt("code") == 1000) {
+ if ("0000".equals(resultJson.optString("status"))) {
return true;
}
return false;
--
Gitblit v1.8.0