From 6a47350594a4843f6cc36e5c94902d6fa97a6d4a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java | 95 ++++++++++++++++++++++++++++++++---------------
1 files changed, 65 insertions(+), 30 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 00321c8..b1692c6 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
@@ -194,8 +194,35 @@
// 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.create.get", map);
+
+// String result = "{\r\n" +
+// " \"status\":\"0000\",\r\n" +
+// " \"msg\":\"浜�,娣诲姞鎴愬姛\",\r\n" +
+// " \"data\":{\r\n" +
+// " \"id\":11770,\r\n" +
+// " \"uid\":1625,\r\n" +
+// " \"wechatrobot\":\"wechatrobot\",\r\n" +
+// " \"wx_id\":\"\",\r\n" +
+// " \"amount_used\":0,\r\n" +
+// " \"group_num\":20,\r\n" +
+// " \"passwd\":\"\",\r\n" +
+// " \"nickname\":\"\",\r\n" +
+// " \"c_uid\":1625,\r\n" +
+// " \"login_status\":0,\r\n" +
+// " \"end_time\":1594785534,\r\n" +
+// " \"remark\":null,\r\n" +
+// " \"wc_id\":\"\",\r\n" +
+// " \"agent_uid\":null,\r\n" +
+// " \"is_enabled\":0,\r\n" +
+// " \"robot_type\":4,\r\n" +
+// " \"ip\":\"http://49.234.36.129:10002/\",\r\n" +
+// " \"is_new\":1\r\n" +
+// " }\r\n" +
+// "}\r\n" +
+// "";
JSONObject resultJson = JSONObject.fromObject(result);
- if ("0000".equals(resultJson.optString("code"))) {
+
+ if ("0000".equals(resultJson.optString("status"))) {
resultJson = resultJson.optJSONObject("data");
Type type = new TypeToken<RobotInfoDTO>() {}.getType();
return new Gson().fromJson(resultJson.toString(), type);
@@ -203,29 +230,6 @@
return null;
}
-
-
- /**
- * 鏈哄櫒浜烘洿鎹㈠井淇″彿
- * @param robotId 鏈哄櫒浜篿d
- * @param wxid 寰俊鍙�
- * @return
- */
- public static RobotInfoDTO robotChangeWeiXin(int robotId, String wxid) {
- // 璇锋眰鍙傛暟
- Map<String, String> map = new HashMap<>();
- map.put("robot_id", robotId +"");
- map.put("wechatrobot", wxid);
- // 璇锋眰缁撴灉
- String result = baseRequest("itaoke.robot.change.get", map);
- JSONObject resultJson = JSONObject.fromObject(result);
- if ("0000".equals(resultJson.optString("code"))) {
- resultJson = resultJson.optJSONObject("data");
- Type type = new TypeToken<RobotInfoDTO>() {}.getType();
- return new Gson().fromJson(resultJson.toString(), type);
- }
- return null;
- }
/**
@@ -241,8 +245,34 @@
map.put("month", month +"");
// 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.change.get", map);
+
+// String result = "{\r\n" +
+// " \"status\":\"0000\",\r\n" +
+// " \"msg\":\"\\u4eb2,\\u6dfb\\u52a0\\u6210\\u529f\",\r\n" +
+// " \"data\":{\r\n" +
+// " \"id\":11770,\r\n" +
+// " \"uid\":1625,\r\n" +
+// " \"wechatrobot\":\"fxdaka\",\r\n" +
+// " \"wx_id\":\"wxid_vm6eb5i0in0622\",\r\n" +
+// " \"amount_used\":0,\r\n" +
+// " \"group_num\":20,\r\n" +
+// " \"passwd\":\"\",\r\n" +
+// " \"nickname\":\"\\u5206\\u4eab\\u5927\\u5496??\",\r\n" +
+// " \"c_uid\":1625,\r\n" +
+// " \"login_status\":1,\r\n" +
+// " \"end_time\":1597377534,\r\n" +
+// " \"remark\":null,\r\n" +
+// " \"wc_id\":\"246124e9-9a8c-4da6-a77e-7f7f88049731\",\r\n" +
+// " \"agent_uid\":null,\r\n" +
+// " \"is_enabled\":0,\r\n" +
+// " \"robot_type\":4,\r\n" +
+// " \"ip\":\"http:\\/\\/49.234.36.129:10002\\/\",\r\n" +
+// " \"is_new\":1\r\n" +
+// " }\r\n" +
+// "}";
+//
JSONObject resultJson = JSONObject.fromObject(result);
- if ("0000".equals(resultJson.optString("code"))) {
+ if ("0000".equals(resultJson.optString("status"))) {
resultJson = resultJson.optJSONObject("data");
Type type = new TypeToken<RobotInfoDTO>() {}.getType();
return new Gson().fromJson(resultJson.toString(), type);
@@ -263,7 +293,7 @@
// 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.delete.get", map);
JSONObject resultJson = JSONObject.fromObject(result);
- if ("0000".equals(resultJson.optString("code"))) {
+ if ("0000".equals(resultJson.optString("status"))) {
return true;
}
return false;
@@ -340,9 +370,14 @@
// 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.macsend.videocircle", 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;
}
@@ -414,7 +449,7 @@
// 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.macsend.base64", map);
JSONObject resultJson = JSONObject.fromObject(result);
- if (resultJson.optInt("code") == 1000) {
+ if ("0000".equals(resultJson.optString("status"))) {
return true;
}
return false;
@@ -443,7 +478,7 @@
// 璇锋眰缁撴灉
String result = baseRequest("itaoke.robot.macsend.card", 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