gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

fix: 2.5.0

Browse Source 
1. 修复服务端请求客户端路径多余/
This commit is contained in:
byteblogs168 2023-11-16 09:19:14 +08:00
parent f0dcef6a04
commit 10f4bef51c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/client/RpcClientInvokeHandler.java
View File

@ -1,6 +1,7 @@
package com.aizuda.easy.retry.server.common.client; package com.aizuda.easy.retry.server.common.client;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil; import cn.hutool.core.util.URLUtil;
import com.aizuda.easy.retry.common.core.constant.SystemConstants; import com.aizuda.easy.retry.common.core.constant.SystemConstants;
import com.aizuda.easy.retry.common.core.context.SpringContext; import com.aizuda.easy.retry.common.core.context.SpringContext;
@ -42,6 +43,7 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
/** /**
* 请求处理器 * 请求处理器
@ -214,8 +216,9 @@ public class RpcClientInvokeHandler implements InvocationHandler {
} }
private StringBuilder getUrl(Mapping mapping, Map<String, Object> paramMap) { private StringBuilder getUrl(Mapping mapping, Map<String, Object> paramMap) {
StringBuilder url = new StringBuilder(MessageFormat.format(URL, hostIp, hostPort.toString(), contextPath)); StringBuilder url = new StringBuilder();
url.append(mapping.path()); String format = MessageFormat.format(URL, hostIp, hostPort.toString(), contextPath).replaceAll("/+$", StrUtil.EMPTY);
url.append(format).append(StrUtil.SLASH).append(mapping.path().replaceFirst("^/+", StrUtil.EMPTY));
if (!CollectionUtils.isEmpty(paramMap)) { if (!CollectionUtils.isEmpty(paramMap)) {
String query = URLUtil.buildQuery(paramMap, null); String query = URLUtil.buildQuery(paramMap, null);
url.append("?").append(query); url.append("?").append(query);