添加Client Policy Infos查看

saleson · saleson · commit d34a7be6627c · 2020-09-25T01:41:19.000+08:00
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/DefaultCachePolicyDecisionManager.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/DefaultCachePolicyDecisionManager.java
@@ -5,6 +5,7 @@
 import cn.springcloud.gray.model.DecisionDefinition;
 import cn.springcloud.gray.model.PolicyDefinition;
 
+import java.util.Map;
 import java.util.function.Supplier;
 
 /**
@@ -92,6 +93,11 @@ public boolean testPolicyPredicate(String predicateType, DecisionInputArgs decis
         return delegater.testPolicyPredicate(predicateType, decisionInputArgs, defaultResult);
     }
 
+    @Override
+    public Map<String, PolicyInfo> getAllPolicyInfos() {
+        return delegater.getAllPolicyInfos();
+    }
+
 
     protected Policy getCachePolicy(String key, Supplier<Policy> supplier) {
         return policyCache.get(key, k -> supplier.get());
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/DefaultPolicyDecisionManager.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/DefaultPolicyDecisionManager.java
@@ -4,10 +4,7 @@
 import cn.springcloud.gray.model.DecisionDefinition;
 import cn.springcloud.gray.model.PolicyDefinition;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -107,6 +104,11 @@ public boolean testPolicyPredicate(String predicateType, DecisionInputArgs decis
         return policyPredicate.test(decisionInputArgs);
     }
 
+    @Override
+    public Map<String, PolicyInfo> getAllPolicyInfos() {
+        return Collections.unmodifiableMap(policyInfos);
+    }
+
     private PolicyInfo getExistingPolicyInfo(String policyId) {
         PolicyInfo policyInfo = getPolicyInfo(policyId);
         assertPolicyInfo(policyInfo);
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/PolicyDecisionManager.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/PolicyDecisionManager.java
@@ -6,6 +6,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -60,4 +61,6 @@ default boolean testPolicyPredicate(String predicateType, DecisionInputArgs deci
     }
 
     boolean testPolicyPredicate(String predicateType, DecisionInputArgs decisionInputArgs, boolean defaultResult);
+
+    Map<String, PolicyInfo> getAllPolicyInfos();
 }
diff --git a/spring-cloud-gray-plugins/spring-cloud-gray-plugin-webflux/src/main/java/cn/springcloud/gray/web/resources/GrayListResource.java b/spring-cloud-gray-plugins/spring-cloud-gray-plugin-webflux/src/main/java/cn/springcloud/gray/web/resources/GrayListResource.java
@@ -2,6 +2,8 @@
 
 import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.api.ApiRes;
+import cn.springcloud.gray.decision.PolicyDecisionManager;
+import cn.springcloud.gray.decision.PolicyInfo;
 import cn.springcloud.gray.model.GrayInstance;
 import cn.springcloud.gray.model.GrayTrackDefinition;
 import cn.springcloud.gray.request.track.GrayTrackHolder;
@@ -25,7 +27,8 @@ public class GrayListResource {
 
     @Autowired
     private GrayTrackHolder grayTrackHolder;
-
+    @Autowired
+    private PolicyDecisionManager policyDecisionManager;
 
     @Autowired
     private GrayManager grayManager;
@@ -44,6 +47,20 @@ public Mono<ApiRes<Map<String, Collection<GrayInstance>>>> getAllGrayServiceInfo
                         .build());
     }
 
+    /**
+     * 返回维护的所有策略信息
+     *
+     * @return
+     */
+    @GetMapping("/policy/allInfos")
+    public Mono<ApiRes<Map<String, PolicyInfo>>> getAllPolicyInfos() {
+        return Mono.just(
+                ApiRes.<Map<String, PolicyInfo>>builder()
+                        .code(ApiRes.CODE_SUCCESS)
+                        .data(policyDecisionManager.getAllPolicyInfos())
+                        .build());
+    }
+
     /**
      * 返回维护的所有灰度追踪信息
      *
diff --git a/spring-cloud-gray-plugins/spring-cloud-gray-plugin-webmvc/src/main/java/cn/springcloud/gray/web/resources/GrayListResource.java b/spring-cloud-gray-plugins/spring-cloud-gray-plugin-webmvc/src/main/java/cn/springcloud/gray/web/resources/GrayListResource.java
@@ -2,6 +2,8 @@
 
 import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.api.ApiRes;
+import cn.springcloud.gray.decision.PolicyDecisionManager;
+import cn.springcloud.gray.decision.PolicyInfo;
 import cn.springcloud.gray.model.GrayInstance;
 import cn.springcloud.gray.model.GrayTrackDefinition;
 import cn.springcloud.gray.request.track.GrayTrackHolder;
@@ -24,7 +26,8 @@ public class GrayListResource {
 
     @Autowired
     private GrayTrackHolder grayTrackHolder;
-
+    @Autowired
+    private PolicyDecisionManager policyDecisionManager;
 
     @Autowired
     private GrayManager grayManager;
@@ -42,6 +45,19 @@ public ApiRes<Map<String, Collection<GrayInstance>>> getAllGrayServiceInfos() {
                 .build();
     }
 
+    /**
+     * 返回维护的所有策略信息
+     *
+     * @return
+     */
+    @GetMapping("/policy/allInfos")
+    public ApiRes<Map<String, PolicyInfo>> getAllPolicyInfos() {
+        return ApiRes.<Map<String, PolicyInfo>>builder()
+                .code(ApiRes.CODE_SUCCESS)
+                .data(policyDecisionManager.getAllPolicyInfos())
+                .build();
+    }
+
     /**
      * 返回维护的所有灰度追踪信息
      *
diff --git a/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/dao/repository/GrayDecisionRepository.java b/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/dao/repository/GrayDecisionRepository.java
@@ -11,7 +11,7 @@
 
 @Repository
 public interface GrayDecisionRepository extends JpaRepository<GrayDecisionDO, Long>, JpaSpecificationExecutor<GrayDecisionDO> {
-    List<GrayDecisionDO> findByPolicyId(Long policyId);
+    List<GrayDecisionDO> findByPolicyIdAndDelFlag(Long policyId, boolean delFlag);
 
     void deleteAllByPolicyId(Long id);
 
diff --git a/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/rest/ClientGrayListResource.java b/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/rest/ClientGrayListResource.java
@@ -4,6 +4,8 @@
 import cn.springcloud.gray.model.GrayInstance;
 import cn.springcloud.gray.model.GrayTrackDefinition;
 import cn.springcloud.gray.server.module.client.ClientRemoteModule;
+import cn.springcloud.gray.server.utils.ApiResHelper;
+import cn.springcloud.gray.utils.StringUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +16,8 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +36,12 @@ public class ClientGrayListResource {
     private RestTemplate restTemplate;
 
     private ObjectMapper objectMapper = new ObjectMapper();
+    private Map<String, String> infoUrls = new HashMap<>();
+
+    @PostConstruct
+    public void init() {
+        infoUrls.put("POLICY", "/gray/list/policy/allInfos");
+    }
 
     @GetMapping("/track/allDefinitions")
     public ApiRes<List<GrayTrackDefinition>> getAllGrayTracks(
@@ -60,4 +70,23 @@ public ApiRes<Map<String, List<GrayInstance>>> getAllGrayServiceInfos(
                 });
     }
 
+    @GetMapping("/infos")
+    public ApiRes<Object> getGrayClientInfos(
+            @RequestParam("serviceId") String serviceId,
+            @RequestParam("instanceId") String instanceId,
+            @RequestParam("infoType") String infoType) {
+        String uri = infoUrls.get(infoType);
+        if (StringUtils.isEmpty(uri)) {
+            return ApiResHelper.notFound(String.format("没有找到type为'%s'的info", infoType));
+        }
+        return clientRemoteModule.callClient(serviceId, instanceId,
+                uri, url -> {
+                    return restTemplate.execute(url, HttpMethod.GET, null, res -> {
+                        return objectMapper.readValue(res.getBody(), new TypeReference<ApiRes<Object>>() {
+                        });
+                    });
+                });
+    }
+
+
 }
diff --git a/spring-cloud-gray-webui/src/api/gray-client.js b/spring-cloud-gray-webui/src/api/gray-client.js
@@ -20,3 +20,12 @@ export function getServiceAllInfos(serviceId, instanceId) {
     params: params
   })
 }
+
+export function getClientInfos(serviceId, instanceId, infoType) {
+  var params = { 'serviceId': serviceId, 'instanceId': instanceId, 'infoType': infoType }
+  return request({
+    url: '/gray/client/grayList/infos',
+    method: 'get',
+    params: params
+  })
+}
diff --git a/spring-cloud-gray-webui/src/views/gray-instance/complex-table.vue b/spring-cloud-gray-webui/src/views/gray-instance/complex-table.vue
@@ -136,6 +136,7 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="showGrayInfos(row, 'SERVICES')">服务/实例</el-dropdown-item>
               <el-dropdown-item @click.native="showGrayInfos(row, 'TRACKS')">追踪</el-dropdown-item>
+              <el-dropdown-item @click.native="showGrayInfos(row, 'POLICY')">策略</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -204,7 +205,7 @@
 <script>
 import { fetchList, deleteInstance, createInstance, updateInstance, tryChangeInstanceStatus } from '@/api/gray-instance'
 import { putData } from '@/api/api-request'
-import { getServiceAllInfos, getAllDefinitions } from '@/api/gray-client'
+import { getServiceAllInfos, getAllDefinitions, getClientInfos } from '@/api/gray-client'
 import waves from '@/directive/waves' // waves directive
 import { parseTime } from '@/utils'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
@@ -519,6 +520,11 @@ export default {
           this.grayInfo.content = res.data
           this.grayInfo.loading = false
         })
+      } else {
+        getClientInfos(this.listQuery.serviceId, this.grayInfo.instanceId, this.grayInfo.type).then(res => {
+          this.grayInfo.content = res.data
+          this.grayInfo.loading = false
+        })
       }
     },
     handleDownload() {
diff --git a/spring-cloud-gray-webui/src/views/gray-instance/discovery-instances.vue b/spring-cloud-gray-webui/src/views/gray-instance/discovery-instances.vue
@@ -75,6 +75,7 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="showGrayInfos(row, 'SERVICES')">服务/实例</el-dropdown-item>
               <el-dropdown-item @click.native="showGrayInfos(row, 'TRACKS')">追踪</el-dropdown-item>
+              <el-dropdown-item @click.native="showGrayInfos(row, 'POLICY')">策略</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -99,7 +100,7 @@
 <script>
 import { fetchList, createInstance, tryChangeInstanceStatus } from '@/api/discovery-instance'
 import waves from '@/directive/waves' // waves directive
-import { getServiceAllInfos, getAllDefinitions } from '@/api/gray-client'
+import { getServiceAllInfos, getAllDefinitions, getClientInfos } from '@/api/gray-client'
 import { parseTime } from '@/utils'
 
 export default {
@@ -278,6 +279,11 @@ export default {
           this.grayInfo.content = res.data
           this.grayInfo.loading = false
         })
+      } else {
+        getClientInfos(this.listQuery.serviceId, this.grayInfo.instanceId, this.grayInfo.type).then(res => {
+          this.grayInfo.content = res.data
+          this.grayInfo.loading = false
+        })
       }
     },
     formatJson(filterVal, jsonData) {

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`import java.util.Collection;`
`8`	`8`	`import java.util.List;`
	`9`	`+import java.util.Map;`
`9`	`10`	`import java.util.Objects;`
`10`	`11`	`import java.util.stream.Collectors;`
`11`	`12`
`@@ -60,4 +61,6 @@ default boolean testPolicyPredicate(String predicateType, DecisionInputArgs deci`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`boolean testPolicyPredicate(String predicateType, DecisionInputArgs decisionInputArgs, boolean defaultResult);`
	`64`	`+`
	`65`	`+ Map<String, PolicyInfo> getAllPolicyInfos();`
`63`	`66`	`}`