Merge branch 'master' into eureka

README.md

@@ -80,7 +80,7 @@ SOP封装了开放平台大部分功能包括：签名验证、统一异常处
 ## 分支说明
 
 - master：发版分支
-- spring-cloud-gateway：Spring Cloud Gateway作为网关
+- spring-cloud-gateway：Spring Cloud Gateway作为网关（不推荐）
 - develop：日常开发分支
 - eureka：使用eureka注册中心
 - 1.x：老的1.x版本代码

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

@@ -31,9 +31,7 @@ public class ApiMappingHandlerMapping extends RequestMappingHandlerMapping imple
         if (apiMapping != null || apiAbility != null) {
             valueResolver = isMvc ? stringValueResolverMVC : stringValueResolver;
         }
-        if (valueResolver != null) {
-            this.setEmbeddedValueResolver(valueResolver);
-        }
+        this.setEmbeddedValueResolver(valueResolver);
         return super.getMappingForMethod(method, handlerType);
     }