添加版本控制模块，并引入到api模块中

esua-epdc/epdc-commons/epdc-commons-api-version-control/pom.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-commons</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-commons-api-version-control</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+    </build>
+
+</project>

esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiRequestMappingHandlerMapping.java

@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.commons.api.version;
+
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.mvc.condition.RequestCondition;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+import java.lang.reflect.Method;
+
+/**
+ * @author rongchao
+ * @Date 18-11-24
+ */
+public class ApiRequestMappingHandlerMapping extends RequestMappingHandlerMapping {
+    @Override
+    protected RequestCondition<?> getCustomMethodCondition(Method method) {
+        return createCondition(method.getClass());
+    }
+
+    @Override
+    protected RequestCondition<?> getCustomTypeCondition(Class<?> handlerType) {
+        return createCondition(handlerType);
+    }
+
+    private static RequestCondition<ApiVersionCondition> createCondition(Class<?> clazz) {
+        RequestMapping classRequestMapping = AnnotationUtils.findAnnotation(clazz, RequestMapping.class);
+        if (classRequestMapping == null) {
+            return null;
+        }
+        StringBuilder mappingUrlBuilder = new StringBuilder();
+        if (classRequestMapping.value().length > 0) {
+            mappingUrlBuilder.append(classRequestMapping.value()[0]);
+        }
+        String mappingUrl = mappingUrlBuilder.toString();
+        String mappingUrlVersion = "{version}";
+        if (!mappingUrl.contains(mappingUrlVersion)) {
+            return null;
+        }
+        ApiVersion apiVersion = AnnotationUtils.findAnnotation(clazz, ApiVersion.class);
+        return apiVersion == null ? new ApiVersionCondition(1) : new ApiVersionCondition(apiVersion.value());
+    }
+}

esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiVersion.java

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.commons.api.version;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author rongchao
+ * @Date 18-11-24
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ApiVersion {
+
+    /**
+     * 版本号
+     *
+     * @return
+     */
+    int value();
+}

esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiVersionCondition.java

@@ -0,0 +1,48 @@
+package com.elink.esua.epdc.commons.api.version;
+
+import org.springframework.web.servlet.mvc.condition.RequestCondition;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author rongchao
+ * @Date 18-11-24
+ */
+public class ApiVersionCondition implements RequestCondition<ApiVersionCondition> {
+    private final static Pattern VERSION_PREFIX_PATTERN = Pattern.compile("/v(\\d+).*");
+
+    private int apiVersion;
+
+    ApiVersionCondition(int apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    public int getApiVersion() {
+        return apiVersion;
+    }
+
+
+    @Override
+    public ApiVersionCondition combine(ApiVersionCondition apiVersionCondition) {
+        return new ApiVersionCondition(apiVersionCondition.getApiVersion());
+    }
+
+    @Override
+    public ApiVersionCondition getMatchingCondition(HttpServletRequest httpServletRequest) {
+        Matcher m = VERSION_PREFIX_PATTERN.matcher(httpServletRequest.getRequestURI());
+        if (m.find()) {
+            Integer version = Integer.valueOf(m.group(1));
+            if (version >= this.apiVersion) {
+                return this;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public int compareTo(ApiVersionCondition apiVersionCondition, HttpServletRequest httpServletRequest) {
+        return apiVersionCondition.getApiVersion() - this.apiVersion;
+    }
+}

esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/config/WebMvcRegistrationsConfig.java

@@ -0,0 +1,19 @@
+package com.elink.esua.epdc.commons.api.version.config;
+
+import com.elink.esua.epdc.commons.api.version.ApiRequestMappingHandlerMapping;
+import org.springframework.boot.autoconfigure.web.servlet.WebMvcRegistrations;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+/**
+ * @author rongchao
+ * @Date 18-11-24
+ */
+@Configuration
+public class WebMvcRegistrationsConfig implements WebMvcRegistrations {
+
+    @Override
+    public RequestMappingHandlerMapping getRequestMappingHandlerMapping() {
+        return new ApiRequestMappingHandlerMapping();
+    }
+}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java

@@ -44,7 +44,7 @@ public interface Constant {
      */
     Long DICT_ROOT = 0L;
     /**
-     *  升序
+     * 升序
      */
     String ASC = "asc";
     /**
@@ -96,4 +96,8 @@ public interface Constant {
      * 移动端用户标识
      */
     String APP_USER_FLAG = "APP_USER";
+    /**
+     * 版本控制用
+     */
+    String VERSION_CONTROL = "/{version}";
 }

esua-epdc/epdc-commons/pom.xml

@@ -17,5 +17,6 @@
         <module>epdc-commons-tools</module>
         <module>epdc-commons-mybatis</module>
         <module>epdc-commons-dynamic-datasource</module>
+        <module>epdc-commons-api-version-control</module>
     </modules>
 </project>

esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@@ -41,13 +41,18 @@
             <artifactId>spring-boot-admin-starter-client</artifactId>
             <version>${spring.boot.admin.version}</version>
         </dependency>
-
         <!-- nacos start -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <!-- nacos end -->
+        <!--版本控制-->
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-api-version-control</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/rest/v2/DemoV2Controller.java

@@ -0,0 +1,18 @@
+package com.elink.esua.epdc.rest.v2;
+
+import com.elink.esua.epdc.commons.api.version.ApiVersion;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/2 14:29
+ */
+@ApiVersion(2)
+@RestController("DemoControllerV2")
+@RequestMapping("/demo" + Constant.VERSION_CONTROL)
+public class DemoV2Controller {
+
+}