diff --git a/src/main/java/org/redkale/net/http/HttpRequest.java b/src/main/java/org/redkale/net/http/HttpRequest.java index 18bc0932e..c3fc505b3 100644 --- a/src/main/java/org/redkale/net/http/HttpRequest.java +++ b/src/main/java/org/redkale/net/http/HttpRequest.java @@ -112,6 +112,7 @@ public class HttpRequest extends Request { protected Supplier currentUserSupplier; + //参数是否从body中取 protected boolean frombody; protected ConvertType reqConvertType; @@ -242,13 +243,12 @@ public class HttpRequest extends Request { HttpSimpleRequest req = new HttpSimpleRequest(); req.setBody(array.length() == 0 ? null : array.getBytes()); if (!getHeaders().isEmpty()) { - if (headers.containsKey(Rest.REST_HEADER_RPC) - || headers.containsKey(Rest.REST_HEADER_CURRUSERID)) { //外部request不能包含RPC的header信息 - req.setHeaders(new HashMap<>(headers)); + req.setHeaders(new HashMap<>(headers)); + if (headers.containsKey(Rest.REST_HEADER_RPC)) { //外部request不能包含RPC的header信息 req.removeHeader(Rest.REST_HEADER_RPC); + } + if (headers.containsKey(Rest.REST_HEADER_CURRUSERID)) { //外部request不能包含RPC的header信息 req.removeHeader(Rest.REST_HEADER_CURRUSERID); - } else { - req.setHeaders(headers); } } parseBody(); diff --git a/src/main/java/org/redkale/net/http/RestLocale.java b/src/main/java/org/redkale/net/http/RestLocale.java index 89e9d4b56..c59367c58 100644 --- a/src/main/java/org/redkale/net/http/RestLocale.java +++ b/src/main/java/org/redkale/net/http/RestLocale.java @@ -9,7 +9,7 @@ import static java.lang.annotation.ElementType.*; /** * 只能注解于Service类的方法的String参数或参数内的String字段 *

- * 用于获取HTTP请求端的IP地址 HttpRequest.getLocale + * 用于获取HTTP请求端的Locale国际化 HttpRequest.getLocale * *

* 详情见: https://redkale.org