From d44a97ad0162dd0de1619ac1b568f25b003a956e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 19 八月 2022 15:34:10 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
index 37e99bb..1388cab 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.utils;
import com.alibaba.fastjson.JSON;
+import com.sandu.common.execption.BusinessException;
import com.sandu.ximon.admin.config.VnnoxConstant;
import com.sandu.ximon.admin.config.VnnoxUrl;
import com.sandu.ximon.admin.utils.request.*;
@@ -12,10 +13,7 @@
import org.springframework.stereotype.Component;
import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Component("VnnoxAPIUtil")
@AllArgsConstructor
@@ -206,8 +204,6 @@
}
-
-
/**
* 鎵归噺灞忓箷鎴浘
*
@@ -224,9 +220,28 @@
request.toJson(),
new CommonHeader(CommonHeader.JSON, true)
);
- VnnoxResultResponse response = JSON.parseObject(result, VnnoxResultResponse.class);
- return response.getData();
+ //TODO
+ System.out.println("result+ " + result);
+// result+ {"logid":1660889486514,"status":2,"errmsg":"playerIds must be array and is not empty"}
+// {"logid":1660889534521,"status":0,"data":{"success":["f788af56421f3e8e8da39a63238fd212"],"fail":[]}}
+
+ if (result.startsWith("{") && result.endsWith("}")) {
+ VnnoxResultResponse response = JSON.parseObject(result, VnnoxResultResponse.class);
+ if (response.getStatus() == 0) {
+ return response.getData();
+ } else {
+ System.out.println(response.getErrmsg());
+ VnnoxResult vnnoxResult = new VnnoxResult();
+ vnnoxResult.getFail().addAll(players);
+ return vnnoxResult;
+ }
+ } else {
+ System.out.println("鏁版嵁瑙ｆ瀽寮傚父!");
+ VnnoxResult vnnoxResult = new VnnoxResult();
+ vnnoxResult.getFail().addAll(players);
+ return vnnoxResult;
+ }
}
/**
--
Gitblit v1.9.3