lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2020-09-20 16:21:47 +08:00
parent 8df5b45525
commit 98531d6b2f
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/redkale/net/http/HttpRequest.java
View File

@@ -106,7 +106,12 @@ public class HttpRequest extends Request<HttpContext> {
if (req != null) {
this.rpc = req.rpc;
if (req.getBody() != null) this.array.write(req.getBody());
if (req.getHeaders() != null) this.headers.putAll(req.getHeaders());
if (req.getHeaders() != null) {
this.headers.putAll(req.getHeaders());
if (this.headers.containsKey(Rest.REST_HEADER_CONVERT_TYPE)) {
this.respConvert = ConvertFactory.findConvert(ConvertType.valueOf(this.headers.get(Rest.REST_HEADER_CONVERT_TYPE)));
}
}
if (req.getParams() != null) this.params.putAll(req.getParams());
if (req.getCurrentUserid() != 0) this.currentUserid = req.getCurrentUserid();
this.contentType = req.getContentType();
@@ -216,9 +221,6 @@ public class HttpRequest extends Request<HttpContext> {
case "content-length":
this.contentLength = Long.decode(value);
break;
case "convert-type": //redkale特有的
respConvert = ConvertFactory.findConvert(ConvertType.valueOf(value));
break;
case "Host":
case "host":
this.host = value;
@@ -249,6 +251,10 @@ public class HttpRequest extends Request<HttpContext> {
this.currentUserid = value;
headers.put(name, value);
break;
case Rest.REST_HEADER_CONVERT_TYPE:
respConvert = ConvertFactory.findConvert(ConvertType.valueOf(value));
headers.put(name, value);
break;
default:
headers.put(name, value);
}

2
src/org/redkale/net/http/Rest.java
View File

@@ -44,6 +44,8 @@ public final class Rest {
public static final String REST_HEADER_CURRUSERID_NAME = "rest-curruserid-name";
public static final String REST_HEADER_CONVERT_TYPE = "rest-convert-type";
static final String REST_SERVICE_FIELD_NAME = "_redkale_service";
static final String REST_TOSTRINGOBJ_FIELD_NAME = "_redkale_tostringsupplier";