补充优化代码

saleson · saleson · commit dc54c321d2c1 · 2020-08-17T16:36:33.000+08:00
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/choose/DefaultGrayPredicate.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/choose/DefaultGrayPredicate.java
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/properties/GrayHoldoutServerProperties.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/properties/GrayHoldoutServerProperties.java
@@ -1,7 +1,6 @@
 package cn.springcloud.gray.client.config.properties;
 
 import cn.springcloud.gray.model.InstanceStatus;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -12,8 +11,7 @@
 
 @Data
 @NoArgsConstructor
-@AllArgsConstructor
-@ConfigurationProperties(value = "gray.holdout-server")
+@ConfigurationProperties("gray.holdoutServer")
 public class GrayHoldoutServerProperties {
 
     private boolean enabled;
diff --git a/spring-cloud-gray-plugins/spring-cloud-gray-plugin-event-longpolling/src/main/java/cn/springcloud/gray/client/plugin/event/longpolling/configuration/GrayClientEventLongPollingAutoConfuguration.java b/spring-cloud-gray-plugins/spring-cloud-gray-plugin-event-longpolling/src/main/java/cn/springcloud/gray/client/plugin/event/longpolling/configuration/GrayClientEventLongPollingAutoConfuguration.java
@@ -1,7 +1,6 @@
 package cn.springcloud.gray.client.plugin.event.longpolling.configuration;
 
 import cn.springcloud.gray.GrayManager;
-import cn.springcloud.gray.bean.properties.EnableConfigurationProperties;
 import cn.springcloud.gray.client.plugin.event.longpolling.GrayEventLongPollingReceiver;
 import cn.springcloud.gray.client.plugin.event.longpolling.GrayEventRemoteClient;
 import cn.springcloud.gray.client.plugin.event.longpolling.GrayRefreshedSortMarkListener;
@@ -13,6 +12,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-cloud-gray-plugins/spring-cloud-gray-plugin-event-longpolling/src/main/java/cn/springcloud/gray/client/plugin/event/longpolling/configuration/properties/LongPollingProperties.java b/spring-cloud-gray-plugins/spring-cloud-gray-plugin-event-longpolling/src/main/java/cn/springcloud/gray/client/plugin/event/longpolling/configuration/properties/LongPollingProperties.java
@@ -1,7 +1,7 @@
 package cn.springcloud.gray.client.plugin.event.longpolling.configuration.properties;
 
-import cn.springcloud.gray.bean.properties.ConfigurationProperties;
 import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * @author saleson
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-apollo-config-sample/src/main/java/cn/springcloud/gray/apollo/sample/config/ApolloAutoRefreshConfiguration.java b/spring-cloud-gray-samples/spring-cloud-gray-apollo-config-sample/src/main/java/cn/springcloud/gray/apollo/sample/config/ApolloAutoRefreshConfiguration.java
@@ -13,7 +13,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.cloud.context.refresh.ContextRefresher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-cloud-gray-server-plugins/spring-cloud-gray-server-plugin-event-longpolling/src/main/java/cn/springcloud/gray/server/event/longpolling/configuration/LongPollingEventAutoConfiguration.java b/spring-cloud-gray-server-plugins/spring-cloud-gray-server-plugin-event-longpolling/src/main/java/cn/springcloud/gray/server/event/longpolling/configuration/LongPollingEventAutoConfiguration.java
@@ -1,13 +1,13 @@
 package cn.springcloud.gray.server.event.longpolling.configuration;
 
-import cn.springcloud.gray.bean.properties.EnableConfigurationProperties;
 import cn.springcloud.gray.server.event.longpolling.DefaultLongPollingManager;
 import cn.springcloud.gray.server.event.longpolling.LongPollingGrayEventSender;
 import cn.springcloud.gray.server.event.longpolling.LongPollingManager;
 import cn.springcloud.gray.server.event.longpolling.configuration.properties.EventLongPollingProperties;
 import cn.springlcoud.gray.event.server.GrayEventSender;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-cloud-gray-server-plugins/spring-cloud-gray-server-plugin-event-longpolling/src/main/java/cn/springcloud/gray/server/event/longpolling/configuration/properties/EventLongPollingProperties.java b/spring-cloud-gray-server-plugins/spring-cloud-gray-server-plugin-event-longpolling/src/main/java/cn/springcloud/gray/server/event/longpolling/configuration/properties/EventLongPollingProperties.java
@@ -1,7 +1,7 @@
 package cn.springcloud.gray.server.event.longpolling.configuration.properties;
 
-import cn.springcloud.gray.bean.properties.ConfigurationProperties;
 import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * @author saleson
diff --git a/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/dao/model/GrayPolicyDO.java b/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/dao/model/GrayPolicyDO.java
@@ -11,7 +11,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-@Table(name = "gray_policy", indexes = {@Index(columnList = "alias_name", unique = true), @Index(columnList = "namespace", unique = true)})
+@Table(name = "gray_policy", indexes = {@Index(columnList = "alias_name", unique = true), @Index(columnList = "namespace")})
 public class GrayPolicyDO {
 
     @Id
diff --git a/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/NamespaceModule.java b/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/NamespaceModule.java
@@ -4,6 +4,8 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import java.util.List;
+
 /**
  * @author saleson
  * @date 2020-03-16 23:22
@@ -27,4 +29,5 @@ public interface NamespaceModule {
     String getDefaultNamespace(String userId);
 
 
+    List<Namespace> listAll(String userId);
 }
diff --git a/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/jpa/JPANamespaceModule.java b/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/jpa/JPANamespaceModule.java
@@ -12,6 +12,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -48,6 +49,11 @@ public Page<Namespace> listAll(Pageable pageable) {
         return namespaceService.findAllModels(pageable);
     }
 
+    @Override
+    public List<Namespace> listAll(String userId) {
+        return namespaceService.findAllByUser(userId);
+    }
+
     @Override
     public Namespace getUserDefault(String userId) {
         return null;
diff --git a/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/domain/vo/NamespaceOptionVO.java b/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/domain/vo/NamespaceOptionVO.java
@@ -0,0 +1,32 @@
+package cn.springcloud.gray.server.resources.domain.vo;
+
+import cn.springcloud.gray.server.module.domain.Namespace;
+import lombok.Data;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author saleson
+ * @date 2020-03-16 23:25
+ */
+@Data
+public class NamespaceOptionVO {
+
+    private String code;
+
+    private String name;
+
+
+    public static NamespaceOptionVO of(Namespace namespace) {
+        NamespaceOptionVO vo = new NamespaceOptionVO();
+        vo.setCode(namespace.getCode());
+        vo.setName(namespace.getName());
+        return vo;
+    }
+
+    public static List<NamespaceOptionVO> of(List<Namespace> namespaces) {
+        return namespaces.stream().map(NamespaceOptionVO::of).collect(Collectors.toList());
+    }
+
+}
diff --git a/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/service/GrayServiceService.java b/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/service/GrayServiceService.java
@@ -1,10 +1,9 @@
 package cn.springcloud.gray.server.service;
 
-import cn.springcloud.gray.server.constant.AuthorityConstants;
 import cn.springcloud.gray.server.dao.mapper.GrayServiceMapper;
 import cn.springcloud.gray.server.dao.mapper.ModelMapper;
 import cn.springcloud.gray.server.dao.model.GrayServiceDO;
-import cn.springcloud.gray.server.dao.model.UserResourceAuthorityDO;
+import cn.springcloud.gray.server.dao.model.UserServiceAuthorityDO;
 import cn.springcloud.gray.server.dao.repository.GrayServiceRepository;
 import cn.springcloud.gray.server.module.gray.domain.GrayService;
 import cn.springcloud.gray.server.module.gray.domain.query.GrayServiceQuery;
@@ -71,16 +70,20 @@ public Predicate toPredicate(Root<GrayServiceDO> root, CriteriaQuery<?> query, C
                 }
                 if (StringUtils.isNotEmpty(serviceQuery.getUserId())) {
                     Subquery subQuery = query.subquery(String.class);
-                    Root from = subQuery.from(UserResourceAuthorityDO.class);
-
-                    subQuery.select(from.get("resourceId").as(String.class))
-                            .where(cb.equal(from.get("userId").as(String.class), serviceQuery.getUserId()),
-                                    cb.equal(from.get("resource").as(String.class), AuthorityConstants.RESOURCE_GRAY_SERVICE));
-
+//                    Root from = subQuery.from(UserResourceAuthorityDO.class);
+//
+//                    subQuery.select(from.get("resourceId").as(String.class))
+//                            .where(cb.equal(from.get("userId").as(String.class), serviceQuery.getUserId()),
+//                                    cb.equal(from.get("resource").as(String.class), AuthorityConstants.RESOURCE_GRAY_SERVICE));
+//
+//                    predicates.add(cb.and((root.get("serviceId")).in(subQuery)));
+
+
+                    Root from = subQuery.from(UserServiceAuthorityDO.class);
+                    subQuery.select(from.get("serviceId").as(String.class))
+                            .where(cb.equal(from.get("userId").as(String.class), serviceQuery.getUserId()));
                     predicates.add(cb.and((root.get("serviceId")).in(subQuery)));
 
-//                    Join<GrayServiceDO, UserServiceAuthorityDO> join = root.join("serviceId", JoinType.INNER);
-//                    predicates.add(cb.equal(join.get("userId").as(String.class), serviceQuery.getUserId()));
                 }
                 query.where(predicates.toArray(new Predicate[predicates.size()]));
                 return query.getRestriction();
