From 774d09246525cfccb7aa1329222e85eea34673ab Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 23 Dec 2019 11:13:51 +0800 Subject: [PATCH] 2.5.8 --- README.md | 2 +- .../sop/servercommon/mapping/ApiMappingHandlerMapping.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e6033a7b..e549fdee 100644 --- a/README.md +++ b/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版本代码 diff --git a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingHandlerMapping.java b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingHandlerMapping.java index 76f24c78..17f4b765 100644 --- a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingHandlerMapping.java +++ b/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); }