study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
小马哥 2019-03-16 00:38:06 +08:00
parent 10f06bec1e
commit 8a8097ce00
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestHeadersMatcher.java
View File

@ -18,6 +18,7 @@ package org.springframework.cloud.alibaba.dubbo.http.matcher;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest; import org.springframework.http.HttpRequest;
import org.springframework.util.CollectionUtils;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;

4
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcher.java
View File

@ -17,6 +17,7 @@
package org.springframework.cloud.alibaba.dubbo.http.matcher; package org.springframework.cloud.alibaba.dubbo.http.matcher;
import org.springframework.http.HttpRequest; import org.springframework.http.HttpRequest;
import org.springframework.util.CollectionUtils;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
@ -44,6 +45,9 @@ public class HttpRequestParamsMatcher extends AbstractHttpRequestMatcher {
@Override @Override
public boolean match(HttpRequest request) { public boolean match(HttpRequest request) {
if (CollectionUtils.isEmpty(expressions)) {
return true;
}
for (ParamExpression paramExpression : expressions) { for (ParamExpression paramExpression : expressions) {
if (paramExpression.match(request)) { if (paramExpression.match(request)) {
return true; return true;

3
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java
View File

@ -20,6 +20,7 @@ import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.ConversionService;
import org.springframework.format.support.DefaultFormattingConversionService;
import org.springframework.format.support.FormattingConversionService; import org.springframework.format.support.FormattingConversionService;
import static org.springframework.context.ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME; import static org.springframework.context.ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME;
@ -37,7 +38,7 @@ public abstract class AbstractDubboGenericServiceParameterResolver implements Du
@Autowired(required = false) @Autowired(required = false)
@Qualifier(CONVERSION_SERVICE_BEAN_NAME) @Qualifier(CONVERSION_SERVICE_BEAN_NAME)
private ConversionService conversionService = new FormattingConversionService(); private ConversionService conversionService = new DefaultFormattingConversionService();
private ClassLoader classLoader; private ClassLoader classLoader;