修改db配置

Author: saleson

spring-cloud-gray-samples/spring-cloud-gray-server-sample/pom.xml

@@ -25,6 +25,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-eureka</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
         <dependency>
             <groupId>cn.springcloud.gray</groupId>
             <artifactId>spring-cloud-starter-gray-server</artifactId>

spring-cloud-gray-samples/spring-cloud-gray-server-sample/src/main/java/cn/springcloud/gray/server/GrayServerApplication.java renamed to spring-cloud-gray-samples/spring-cloud-gray-server-sample/src/main/java/cn/springcloud/gray/server/app/GrayServerApplication.java

@@ -1,5 +1,6 @@
-package cn.springcloud.gray.server;
+package cn.springcloud.gray.server.app;
 
+import cn.springcloud.gray.server.EnableGrayServer;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;

spring-cloud-gray-samples/spring-cloud-gray-server-sample/src/test/java/cn/springcloud/gray/service/test/GrayInstanceServiceTest.java

@@ -2,7 +2,7 @@
 
 
 import cn.springcloud.gray.model.GrayStatus;
-import cn.springcloud.gray.server.GrayServerApplication;
+import cn.springcloud.gray.server.app.GrayServerApplication;
 import cn.springcloud.gray.server.module.domain.GrayInstance;
 import cn.springcloud.gray.server.module.domain.InstanceStatus;
 import cn.springcloud.gray.server.service.GrayInstanceService;

spring-cloud-gray-server/pom.xml

@@ -60,9 +60,27 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-bean-validators</artifactId>
         </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.boot</groupId>-->
+        <!--            <artifactId>spring-boot-starter-data-jpa</artifactId>-->
+        <!--        </dependency>-->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jta_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>javax.transaction-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -75,24 +93,4 @@
 
     </dependencies>
 
-    <!--    <build>-->
-    <!--        <defaultGoal>spring-boot:run</defaultGoal>-->
-    <!--        <plugins>-->
-    <!--            <plugin>-->
-    <!--                <groupId>org.apache.maven.plugins</groupId>-->
-    <!--                <artifactId>maven-compiler-plugin</artifactId>-->
-    <!--                <version>3.6.0</version>-->
-    <!--                <configuration>-->
-    <!--                    <annotationProcessorPaths>-->
-    <!--                        <path>-->
-    <!--                            <groupId>org.mapstruct</groupId>-->
-    <!--                            <artifactId>mapstruct-processor</artifactId>-->
-    <!--                            <version>${mapstruct.version}</version>-->
-    <!--                        </path>-->
-    <!--                    </annotationProcessorPaths>-->
-    <!--                </configuration>-->
-    <!--            </plugin>-->
-    <!--        </plugins>-->
-    <!--    </build>-->
-
 </project>

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/configuration/DBStorageConfiguration.java

@@ -8,26 +8,36 @@
 import cn.springcloud.gray.server.service.GrayPolicyService;
 import cn.springcloud.gray.server.service.GrayServiceService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import javax.sql.DataSource;
 
 @Configuration
+@EnableJpaRepositories(basePackages = {"cn.springcloud.gray.server.dao.repository"})
+@EntityScan(basePackages = {"cn.springcloud.gray.server.dao.model"})
 @EnableTransactionManagement
 @ConditionalOnBean(GrayServerMarkerConfiguration.GrayServerMarker.class)
 public class DBStorageConfiguration {
 
 
-    @Bean
-    public GrayServerModule grayServerModule(
-            GrayEventPublisher grayEventPublisher,
-            GrayServiceService grayServiceService, GrayInstanceService grayInstanceService,
-            GrayDecisionService grayDecisionService, GrayPolicyService grayPolicyService) {
-        return new SimpleGrayServerModule(grayEventPublisher, grayServiceService, grayInstanceService, grayDecisionService, grayPolicyService);
+    @ComponentScan(basePackages = {"cn.springcloud.gray.server.dao.mapper", "cn.springcloud.gray.server.service"})
+    @Configuration
+    public class DBGrayServrConfiguration {
+
+        @Bean
+        public GrayServerModule grayServerModule(
+                GrayEventPublisher grayEventPublisher,
+                GrayServiceService grayServiceService, GrayInstanceService grayInstanceService,
+                GrayDecisionService grayDecisionService, GrayPolicyService grayPolicyService) {
+            return new SimpleGrayServerModule(grayEventPublisher, grayServiceService, grayInstanceService, grayDecisionService, grayPolicyService);
+        }
     }
 
     @Bean

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/configuration/Swagger2Configuration.java

@@ -1,23 +1,17 @@
 package cn.springcloud.gray.server.configuration;
 
+import cn.springcloud.gray.server.configuration.apidoc.PageableParameterAlternateTypeRuleConvention;
 import com.fasterxml.classmate.TypeResolver;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.ResponseMessageBuilder;
-import springfox.documentation.schema.AlternateTypeRule;
-import springfox.documentation.schema.AlternateTypeRuleConvention;
 import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;
@@ -26,7 +20,6 @@
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -40,33 +33,18 @@
 public class Swagger2Configuration extends WebMvcConfigurerAdapter {
 
 
+//    @Bean
+//    @Order(Ordered.LOWEST_PRECEDENCE)
+//    public PageableParameterBuilderPlugin pageableParameterBuilderPlugin(
+//            TypeNameExtractor nameExtractor, TypeResolver resolver) {
+//        return new PageableParameterBuilderPlugin(nameExtractor, resolver);
+//    }
+
     @Bean
-    public AlternateTypeRuleConvention pageableConvention(final TypeResolver resolver) {
-        return new AlternateTypeRuleConvention() {
-            @Override
-            public int getOrder() {
-                return Ordered.LOWEST_PRECEDENCE;
-            }
-
-            @Override
-            public List<AlternateTypeRule> rules() {
-                return new ArrayList(Arrays.asList(new AlternateTypeRule(resolver.resolve(Pageable.class), resolver.resolve(Page.class))));
-            }
-        };
+    public PageableParameterAlternateTypeRuleConvention pageableParameterAlternateTypeRuleConvention(TypeResolver resolver) {
+        return new PageableParameterAlternateTypeRuleConvention(resolver);
     }
 
-    @ApiModel
-    @Data
-    public static class Page {
-        @ApiModelProperty("第page页,从0开始计数")
-        private Integer page;
-
-        @ApiModelProperty("每页数据数量")
-        private Integer size;
-
-        @ApiModelProperty("按属性排序,格式:属性(,asc|desc)")
-        private List<String> sort;
-    }
 
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/configuration/apidoc/PageableParameterAlternateTypeRuleConvention.java

@@ -0,0 +1,48 @@
+package cn.springcloud.gray.server.configuration.apidoc;
+
+import com.fasterxml.classmate.TypeResolver;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.core.Ordered;
+import org.springframework.data.domain.Pageable;
+import springfox.documentation.schema.AlternateTypeRule;
+import springfox.documentation.schema.AlternateTypeRuleConvention;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class PageableParameterAlternateTypeRuleConvention implements AlternateTypeRuleConvention {
+
+    private TypeResolver resolver;
+
+    public PageableParameterAlternateTypeRuleConvention(TypeResolver resolver) {
+        this.resolver = resolver;
+    }
+
+    @Override
+    public List<AlternateTypeRule> rules() {
+        return new ArrayList(Arrays.asList(new AlternateTypeRule(resolver.resolve(Pageable.class), resolver.resolve(Page.class))));
+    }
+
+    @Override
+    public int getOrder() {
+        return Ordered.LOWEST_PRECEDENCE;
+    }
+
+
+    @ApiModel
+    @Data
+    public static class Page {
+        @ApiModelProperty(value = "第page页,从0开始计数", example = "0")
+        private Integer page = 0;
+
+        @ApiModelProperty(value = "每页数据数量", example = "10")
+        private Integer size = 10;
+
+        @ApiModelProperty("按属性排序,格式:属性(,asc|desc)")
+        private List<String> sort;
+    }
+}
+

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/configuration/apidoc/PageableParameterBuilderPlugin.java

@@ -4,77 +4,91 @@
 import com.fasterxml.classmate.TypeResolver;
 import com.google.common.base.Function;
 import org.springframework.data.domain.Pageable;
+import springfox.documentation.builders.ParameterBuilder;
 import springfox.documentation.schema.ModelReference;
+import springfox.documentation.schema.ResolvedTypes;
 import springfox.documentation.schema.TypeNameExtractor;
 import springfox.documentation.service.Parameter;
 import springfox.documentation.service.ResolvedMethodParameter;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.schema.contexts.ModelContext;
-import springfox.documentation.spi.service.ParameterBuilderPlugin;
+import springfox.documentation.spi.service.OperationBuilderPlugin;
+import springfox.documentation.spi.service.contexts.OperationContext;
 import springfox.documentation.spi.service.contexts.ParameterContext;
 
 import java.util.List;
 
 import static com.google.common.collect.Lists.newArrayList;
-import static springfox.documentation.schema.ResolvedTypes.modelRefFactory;
 import static springfox.documentation.spi.schema.contexts.ModelContext.inputParam;
 
-public class PageableParameterBuilderPlugin implements ParameterBuilderPlugin {
+
+public class PageableParameterBuilderPlugin implements OperationBuilderPlugin {
     private final TypeNameExtractor nameExtractor;
     private final TypeResolver resolver;
+    private final ResolvedType pageableType;
 
     public PageableParameterBuilderPlugin(TypeNameExtractor nameExtractor, TypeResolver resolver) {
         this.nameExtractor = nameExtractor;
         this.resolver = resolver;
+        this.pageableType = resolver.resolve(Pageable.class);
+    }
+
+    @Override
+    public void apply(OperationContext context) {
+        List<ResolvedMethodParameter> methodParameters = context.getParameters();
+        List<Parameter> parameters = newArrayList();
+
+        for (ResolvedMethodParameter methodParameter : methodParameters) {
+            ResolvedType resolvedType = methodParameter.getParameterType();
+
+            if (pageableType.equals(resolvedType)) {
+                ParameterContext parameterContext = new ParameterContext(methodParameter,
+                        new ParameterBuilder(),
+                        context.getDocumentationContext(),
+                        context.getGenericsNamingStrategy(),
+                        context);
+                Function<ResolvedType, ? extends ModelReference> factory = createModelRefFactory(parameterContext);
+
+                ModelReference intModel = factory.apply(resolver.resolve(Integer.TYPE));
+                ModelReference stringModel = factory.apply(resolver.resolve(List.class, String.class));
+
+                parameters.add(new ParameterBuilder()
+                        .parameterType("query")
+                        .name("page")
+                        .modelRef(intModel)
+                        .description("Results page you want to retrieve (0..N)").build());
+                parameters.add(new ParameterBuilder()
+                        .parameterType("query")
+                        .name("size")
+                        .modelRef(intModel)
+                        .description("Number of records per page").build());
+                parameters.add(new ParameterBuilder()
+                        .parameterType("query")
+                        .name("sort")
+                        .modelRef(stringModel)
+                        .allowMultiple(true)
+                        .description("Sorting criteria in the format: property(,asc|desc). "
+                                + "Default sort order is ascending. "
+                                + "Multiple sort criteria are supported.")
+                        .build());
+                context.operationBuilder().parameters(parameters);
+            }
+        }
     }
 
     @Override
     public boolean supports(DocumentationType delimiter) {
         return true;
     }
 
-    private Function<ResolvedType, ? extends ModelReference>
-    createModelRefFactory(ParameterContext context) {
-        ModelContext modelContext = inputParam("",
+    private Function<ResolvedType, ? extends ModelReference> createModelRefFactory(ParameterContext context) {
+        ModelContext modelContext = inputParam(
+                context.getGroupName(),
                 context.resolvedMethodParameter().getParameterType(),
                 context.getDocumentationType(),
                 context.getAlternateTypeProvider(),
                 context.getGenericNamingStrategy(),
                 context.getIgnorableParameterTypes());
-        return modelRefFactory(modelContext, nameExtractor);
+        return ResolvedTypes.modelRefFactory(modelContext, nameExtractor);
     }
-
-    @Override
-    public void apply(ParameterContext context) {
-        ResolvedMethodParameter parameter = context.resolvedMethodParameter();
-        Class<?> type = parameter.getParameterType().getErasedType();
-
-        System.out.println(type);
-        if (type != null && Pageable.class.isAssignableFrom(type)) {
-            Function<ResolvedType, ? extends ModelReference> factory =
-                    createModelRefFactory(context);
-
-            ModelReference intModel = factory.apply(resolver.resolve(Integer.TYPE));
-            ModelReference stringModel = factory.apply(resolver.resolve(List.class, String.class));
-
-            List<Parameter> parameters = newArrayList(
-                    context.parameterBuilder()
-                            .parameterType("query").name("page").modelRef(intModel)
-                            .description("请求第几页,默认为0(0=第一页,以此类推)")
-                            .build(),
-                    context.parameterBuilder()
-                            .parameterType("query").name("size").modelRef(intModel)
-                            .description("每页的条数")
-                            .build(),
-                    context.parameterBuilder()
-                            .parameterType("query").name("sort").modelRef(stringModel).allowMultiple(true)
-                            .description("排序条件的格式为: 属性(,asc|desc). "
-                                    + "默认的为升序. "
-                                    + "支持多个属性的联合排序.")
-                            .build());
-
-            context.getOperationContext().operationBuilder().parameters(parameters);
-        }
-    }
-
-}
+}