From daee57167b8e09be18dee172c0694508856dfdf4 Mon Sep 17 00:00:00 2001
From: zengqiao <zengqiao@didiglobal.com>
Date: Sun, 8 Nov 2020 15:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8F=91=E7=8E=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GatewayServiceDiscoveryController.java    | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/gateway/GatewayServiceDiscoveryController.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/gateway/GatewayServiceDiscoveryController.java
index 699b30f0..0d4e899b 100644
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/gateway/GatewayServiceDiscoveryController.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/gateway/GatewayServiceDiscoveryController.java
@@ -60,6 +60,9 @@ public class GatewayServiceDiscoveryController {
         if (ValidateUtils.isNull(config) || ValidateUtils.isNull(config.getClusterIdBootstrapServersMap())) {
             return Result.buildFailure("call init kafka bootstrap servers failed");
         }
+        if (ValidateUtils.isEmptyMap(config.getClusterIdBootstrapServersMap())) {
+            return Result.buildSuc();
+        }
         return Result.buildSuc(JSON.toJSONString(config.getClusterIdBootstrapServersMap()));
     }
 
@@ -73,7 +76,9 @@ public class GatewayServiceDiscoveryController {
         if (ValidateUtils.isNull(config) || ValidateUtils.isNull(config.getClusterIdBootstrapServersMap())) {
             return Result.buildFailure("call update kafka bootstrap servers failed");
         }
-
+        if (ValidateUtils.isEmptyMap(config.getClusterIdBootstrapServersMap())) {
+            return Result.buildSuc();
+        }
         return Result.buildSuc(JSON.toJSONString(new GatewayConfigVO(
                 String.valueOf(config.getVersion()),
                 JSON.toJSONString(config.getClusterIdBootstrapServersMap())
@@ -89,7 +94,9 @@ public class GatewayServiceDiscoveryController {
         if (ValidateUtils.isNull(config)) {
             return Result.buildFailure("call get request queue size config failed");
         }
-
+        if (ValidateUtils.isNull(config.getMaxRequestQueueSize())) {
+            return Result.buildSuc();
+        }
         return Result.buildSuc(JSON.toJSONString(
                 new GatewayConfigVO(
                         String.valueOf(config.getVersion()),
@@ -107,7 +114,9 @@ public class GatewayServiceDiscoveryController {
         if (ValidateUtils.isNull(config)) {
             return Result.buildFailure("call get app rate config failed");
         }
-
+        if (ValidateUtils.isNull(config.getAppRateLimit())) {
+            return Result.buildSuc();
+        }
         return Result.buildSuc(JSON.toJSONString(
                 new GatewayConfigVO(
                         String.valueOf(config.getVersion()),
@@ -125,6 +134,9 @@ public class GatewayServiceDiscoveryController {
         if (ValidateUtils.isNull(config)) {
             return Result.buildFailure("call get ip rate config failed");
         }
+        if (ValidateUtils.isNull(config.getIpRateLimit())) {
+            return Result.buildSuc();
+        }
         return Result.buildSuc(JSON.toJSONString(
                 new GatewayConfigVO(
                         String.valueOf(config.getVersion()),
@@ -143,7 +155,9 @@ public class GatewayServiceDiscoveryController {
         if (ValidateUtils.isNull(config) || ValidateUtils.isNull(config.getSpRateMap())) {
             return Result.buildFailure("call update kafka bootstrap servers failed");
         }
-
+        if (ValidateUtils.isEmptyMap(config.getSpRateMap())) {
+            return Result.buildSuc();
+        }
         List<String> strList = new ArrayList<>();
         for (Map.Entry<String, Long> entry: config.getSpRateMap().entrySet()) {
             strList.add(entry.getKey() + "#" + String.valueOf(entry.getValue()));