Merge branch 'master' into k8s

src/main/java/cn/qg/holmes/controller/k8s/K8sController.java

@@ -652,7 +652,6 @@ public class K8sController {
                                @RequestParam String serviceType,
                                @RequestParam String serviceName,
                                @RequestParam String key) {
-        log.info("获取dubbo接口收到参数：{}, {}, {}, {}", namespace, serviceType, serviceName, key);
         List<ServicePort> servicePortList = k8sService.getServiceDetail(namespace, serviceName).getSpec().getPorts();
         Map<String, Object> serviceMap = new HashMap<>();
         List<Map<String, Object>> portMappingList = new ArrayList<>();
@@ -673,7 +672,10 @@ public class K8sController {
         serviceMap.put("portMappings", portMappingList);
         serviceMap.put("serviceName", serviceName);
         serviceMap.put("namespace", namespace);
-        log.info("返回结果为：{}", JSON.toJSONString(serviceMap));
+        if (serviceMap.containsKey(key)) {
             return serviceMap.get(key).toString();
+        } else {
+            return JSON.toJSONString(serviceMap);
+        }
     }
 }