fix:服务列表支持服务可见性&修复服务可见性优先级判断

polarismesh · Nov 29, 2024 · a09ba84 · a09ba84
1 parent 46387bf
commit a09ba84
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/service/client_v1.go b/service/client_v1.go
@@ -183,15 +183,15 @@ func (s *Server) GetServiceWithCache(ctx context.Context, req *apiservice.Servic
 		for i := range visibleSvcs {
 			revisions = append(revisions, visibleSvcs[i].Revision)
 		}
+		svcs = append(svcs, visibleSvcs...)
+		// 需要重新计算 revison
 		if rever, err := cachetypes.CompositeComputeRevision(revisions); err != nil {
 			log.Error("[Server][Discover] list services compute multi revision",
 				zap.String("namespace", req.GetNamespace().GetValue()), zap.Error(err))
 			return api.NewDiscoverInstanceResponse(apimodel.Code_ExecuteException, req)
 		} else {
 			revision = rever
 		}
-		svcs = append(svcs, visibleSvcs...)
-		// 需要重新计算 revison
 	} else {
 		// 这里拉的是全部服务实例列表，如果客户端可以发起这个请求，应该是不需要
 		revision, svcs = s.Cache().Service().ListAllServices(ctx)