Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-common/liquidnet-common-swagger/src/main/java/com/liquidnet/common/swagger/config/Swagger2Config.java

@@ -4,10 +4,9 @@ import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
-import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -17,9 +16,9 @@ import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-@EnableSwagger2
+@Configuration
 @EnableKnife4j
-@Import(BeanValidatorPluginsConfiguration.class)
+@EnableSwagger2
 public class Swagger2Config {
     @Autowired
     private Environment environment;

liquidnet-bus-common/pom.xml

@@ -126,13 +126,8 @@
             <dependency>
                 <groupId>com.github.xiaoymin</groupId>
                 <artifactId>knife4j-spring-boot-starter</artifactId>
-                <version>3.0.2</version>
+                <version>2.0.4</version>
             </dependency>
-<!--            <dependency>-->
-<!--                <groupId>io.swagger</groupId>-->
-<!--                <artifactId>swagger-annotations</artifactId>-->
-<!--                <version>1.5.22</version>-->
-<!--            </dependency>-->
             <dependency>
                 <groupId>com.belerweb</groupId>
                 <artifactId>pinyin4j</artifactId>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/config/AdamSwagger2Config.java

-package com.liquidnet.service.adam.config;
-
-import com.liquidnet.common.swagger.config.Swagger2Config;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author AnJiabin <jiabin.an@lightnet.io>
- * @version V1.0
- * @Description: TODO
- * @class: Swagger2Config
- * @Package com.liquidnet.stellar.configuration
- * @Copyright: LightNet @ Copyright (c) 2020
- * @date 2020/9/10 13:55
- */
-@Configuration
-class AdamSwagger2Config extends Swagger2Config {
-
-}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/config/swagger/AdamSwaggerApiTags.java

-package com.liquidnet.service.adam.config.swagger;
-import com.liquidnet.common.swagger.config.SwaggerApiTags;
-
-/**
- * Swagger tags标签管理
- *
- * @author Li Chen
- */
-public interface AdamSwaggerApiTags extends SwaggerApiTags {
-
-}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/config/swagger/AdamSwaggerApiVersionConstant.java

-package com.liquidnet.service.adam.config.swagger;
-
-import com.liquidnet.common.swagger.config.SwaggerApiVersionConstant;
-
-/**
- * swagger-api版本号常量类
- *
- * @author lichen
- */
-public interface AdamSwaggerApiVersionConstant extends SwaggerApiVersionConstant {
-
-}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/config/KylinSwagger2Config.java

-package com.liquidnet.service.kylin.config;
-
-import com.liquidnet.common.swagger.config.Swagger2Config;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * ExampleSwagger2Config.class
- *
- * @author zhanggb
- * Created by IntelliJ IDEA at 2020/9/25
- */
-@Configuration
-public class KylinSwagger2Config extends Swagger2Config {
-}

liquidnet-bus-support/liquidnet-support-zuul/src/main/java/com/liquidnet/support/zuul/config/swagger/ZuulSwagger2Config.java

-package com.liquidnet.support.zuul.config.swagger;
-
-import com.liquidnet.common.swagger.config.Swagger2Config;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class ZuulSwagger2Config extends Swagger2Config {
-
-//    @Override
-//    public ApiInfo apiInfo() {
-//        return new ApiInfoBuilder()
-//                .title("LiquidNet Services")
-//                .description("LiquidNet接口文档说明")
-//                .contact(new Contact("liquidnet", "", "**@liquidnet.io"))
-//                .version("1.0")
-//                .termsOfServiceUrl("http://localhost:8081")
-//                .build();
-//    }
-//
-//    @Bean
-//    UiConfiguration uiConfig() {
-//        return new UiConfiguration(null, "list", "alpha", "schema",
-//                UiConfiguration.Constants.DEFAULT_SUBMIT_METHODS, false, true, 60000L);
-//    }
-
-}