Merge branch 'master' into eureka

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/bean/ServiceContext.java

@@ -13,6 +13,7 @@ public class ServiceContext extends ConcurrentHashMap<String, Object> {
     public static final String REQUEST_KEY = "request";
     public static final String RESPONSE_KEY = "response";
     public static final String OPEN_CONTEXT_KEY = "openContext";
+    public static final String SOP_MVC = "sop.mvc";
 
     public static final String RESTFUL_KEY = "sop-restful";
 

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/SpringMvcServiceConfiguration.java

@@ -1,6 +1,7 @@
 package com.gitee.sop.servercommon.configuration;
 
 import com.gitee.sop.servercommon.bean.ServiceConfig;
+import com.gitee.sop.servercommon.bean.ServiceContext;
 import com.gitee.sop.servercommon.manager.EnvironmentContext;
 import com.gitee.sop.servercommon.manager.ServiceRouteController;
 import com.gitee.sop.servercommon.mapping.ApiMappingHandlerMapping;
@@ -22,6 +23,10 @@ import javax.annotation.PostConstruct;
 @Slf4j
 public class SpringMvcServiceConfiguration {
 
+    static {
+        System.setProperty(ServiceContext.SOP_MVC, "true");
+    }
+
     public SpringMvcServiceConfiguration() {
         ServiceConfig.getInstance().getI18nModules().add("i18n/isp/bizerror");
     }

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingHandlerMapping.java

@@ -3,6 +3,7 @@ package com.gitee.sop.servercommon.mapping;
 import com.gitee.sop.servercommon.annotation.ApiAbility;
 import com.gitee.sop.servercommon.annotation.ApiMapping;
 import com.gitee.sop.servercommon.bean.ServiceConfig;
+import com.gitee.sop.servercommon.bean.ServiceContext;
 import org.springframework.core.PriorityOrdered;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.StringValueResolver;
@@ -18,13 +19,17 @@ import java.lang.reflect.Method;
 public class ApiMappingHandlerMapping extends RequestMappingHandlerMapping implements PriorityOrdered {
 
     private static StringValueResolver stringValueResolver = new ApiMappingStringValueResolver();
+    private static StringValueResolver stringValueResolverMVC = new ApiMappingStringValueResolverMVC();
 
     @Override
     protected RequestMappingInfo getMappingForMethod(Method method, Class<?> handlerType) {
+        String sopMvc = System.getProperty(ServiceContext.SOP_MVC);
+        boolean isMvc = sopMvc != null;
         ApiMapping apiMapping = method.getAnnotation(ApiMapping.class);
+        ApiAbility apiAbility = method.getAnnotation(ApiAbility.class);
         StringValueResolver valueResolver = null;
-        if (apiMapping != null) {
+        if (apiMapping != null || apiAbility != null) {
-            valueResolver = stringValueResolver;
+            valueResolver = isMvc ? stringValueResolverMVC : stringValueResolver;
         }
         this.setEmbeddedValueResolver(valueResolver);
         return super.getMappingForMethod(method, handlerType);

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingStringValueResolver.java

@@ -7,8 +7,13 @@ import org.springframework.util.StringValueResolver;
  */
 public class ApiMappingStringValueResolver implements StringValueResolver {
 
+    private static final String END = "/";
+
     @Override
     public String resolveStringValue(String strVal) {
-        return strVal;
+        if (strVal == null) {
+            return null;
+        }
+        return strVal + END;
     }
 }

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingStringValueResolverMVC.java

@@ -0,0 +1,14 @@
+package com.gitee.sop.servercommon.mapping;
+
+import org.springframework.util.StringValueResolver;
+
+/**
+ * @author tanghc
+ */
+public class ApiMappingStringValueResolverMVC implements StringValueResolver {
+
+    @Override
+    public String resolveStringValue(String strVal) {
+        return strVal;
+    }
+}