From 7f8d6f96f10d16b34f20a8690bc5a91d1633222b Mon Sep 17 00:00:00 2001 From: redkale Date: Tue, 7 Nov 2023 23:27:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Rest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redkale/cluster/HttpClusterRpcClient.java | 15 +- .../org/redkale/cluster/HttpRpcClient.java | 2 +- .../redkale/mq/HttpSimpleRequestCoder.java | 5 +- .../org/redkale/net/http/HttpRequest.java | 151 +----------------- .../redkale/net/http/HttpSimpleRequest.java | 24 +-- src/main/java/org/redkale/net/http/Rest.java | 20 ++- .../test/rest/_DynHelloRestServlet1.java | 22 +-- .../test/rest/_DynHelloRestServlet2.java | 10 +- 8 files changed, 37 insertions(+), 212 deletions(-) diff --git a/src/main/java/org/redkale/cluster/HttpClusterRpcClient.java b/src/main/java/org/redkale/cluster/HttpClusterRpcClient.java index 83115b40d..998ecc1e6 100644 --- a/src/main/java/org/redkale/cluster/HttpClusterRpcClient.java +++ b/src/main/java/org/redkale/cluster/HttpClusterRpcClient.java @@ -83,7 +83,7 @@ public class HttpClusterRpcClient extends HttpRpcClient { module = module.substring(1); //去掉/ module = module.substring(0, module.indexOf('/')); Map headers = req.getHeaders(); - String resname = headers == null ? "" : headers.getOrDefault(Rest.REST_HEADER_RESOURCE_NAME, ""); + String resname = headers == null ? "" : headers.getOrDefault(Rest.REST_HEADER_RESNAME, ""); final String localModule = module; if (logger.isLoggable(Level.FINEST)) { logger.log(Level.FINEST, "httpAsync.queryHttpAddress: module=" + localModule + ", resname=" + resname); @@ -104,14 +104,11 @@ public class HttpClusterRpcClient extends HttpRpcClient { if (isNotEmpty(req.getTraceid())) { clientHeaders.put(Rest.REST_HEADER_TRACEID, req.getTraceid()); } - if (req.isFrombody()) { - clientHeaders.put(Rest.REST_HEADER_PARAM_FROM_BODY, "true"); - } if (req.getReqConvertType() != null) { - clientHeaders.put(Rest.REST_HEADER_REQ_CONVERT_TYPE, req.getReqConvertType().toString()); + clientHeaders.put(Rest.REST_HEADER_REQ_CONVERT, req.getReqConvertType().toString()); } if (req.getRespConvertType() != null) { - clientHeaders.put(Rest.REST_HEADER_RESP_CONVERT_TYPE, req.getRespConvertType().toString()); + clientHeaders.put(Rest.REST_HEADER_RESP_CONVERT, req.getRespConvertType().toString()); } if (userid != null) { clientHeaders.put(Rest.REST_HEADER_CURRUSERID, "" + userid); @@ -196,14 +193,14 @@ public class HttpClusterRpcClient extends HttpRpcClient { // module = module.substring(1); //去掉/ // module = module.substring(0, module.indexOf('/')); // Map headers = req.getHeaders(); -// String resname = headers == null ? "" : headers.getOrDefault(Rest.REST_HEADER_RESOURCE_NAME, ""); +// String resname = headers == null ? "" : headers.getOrDefault(Rest.REST_HEADER_RESNAME, ""); // return clusterAgent.queryHttpAddress("http", module, resname).thenCompose(addrs -> { // if (addrs == null || addrs.isEmpty()) return new HttpResult().status(404).toAnyFuture(); // java.net.http.HttpRequest.Builder builder = java.net.http.HttpRequest.newBuilder().timeout(Duration.ofMillis(30000)); // if (req.isRpc()) builder.header(Rest.REST_HEADER_RPC_NAME, "true"); // if (req.isFrombody()) builder.header(Rest.REST_HEADER_PARAM_FROM_BODY, "true"); -// if (req.getReqConvertType() != null) builder.header(Rest.REST_HEADER_REQ_CONVERT_TYPE, req.getReqConvertType().toString()); -// if (req.getRespConvertType() != null) builder.header(Rest.REST_HEADER_RESP_CONVERT_TYPE, req.getRespConvertType().toString()); +// if (req.getReqConvertType() != null) builder.header(Rest.REST_HEADER_REQ_CONVERT, req.getReqConvertType().toString()); +// if (req.getRespConvertType() != null) builder.header(Rest.REST_HEADER_RESP_CONVERT, req.getRespConvertType().toString()); // if (userid != 0) builder.header(Rest.REST_HEADER_CURRUSERID, "" + userid); // if (headers != null) headers.forEach((n, v) -> { // if (!DISALLOWED_HEADERS_SET.contains(n.toLowerCase())) builder.header(n, v); diff --git a/src/main/java/org/redkale/cluster/HttpRpcClient.java b/src/main/java/org/redkale/cluster/HttpRpcClient.java index ae851c031..9be7d9467 100644 --- a/src/main/java/org/redkale/cluster/HttpRpcClient.java +++ b/src/main/java/org/redkale/cluster/HttpRpcClient.java @@ -113,7 +113,7 @@ public abstract class HttpRpcClient implements ClusterRpcClient headers = request.getHeaders(); - String resname = headers == null ? "" : headers.getOrDefault(Rest.REST_HEADER_RESOURCE_NAME, ""); + String resname = headers == null ? "" : headers.getOrDefault(Rest.REST_HEADER_RESNAME, ""); return Rest.generateHttpReqTopic(module, resname, getNodeid()); } diff --git a/src/main/java/org/redkale/mq/HttpSimpleRequestCoder.java b/src/main/java/org/redkale/mq/HttpSimpleRequestCoder.java index 7e19f5edf..0ab50854d 100644 --- a/src/main/java/org/redkale/mq/HttpSimpleRequestCoder.java +++ b/src/main/java/org/redkale/mq/HttpSimpleRequestCoder.java @@ -46,7 +46,7 @@ public class HttpSimpleRequestCoder implements MessageCoder { byte[] params = MessageCoder.getBytes(data.getParams()); byte[] body = MessageCoder.getBytes(data.getBody()); byte[] userid = MessageCoder.encodeUserid(data.getCurrentUserid()); - int count = 1 //rpc + frombody + int count = 1 //rpc + 4 //reqConvertType + 4 //respConvertType + 2 + traceid.length @@ -60,7 +60,7 @@ public class HttpSimpleRequestCoder implements MessageCoder { + 4 + body.length; byte[] bs = new byte[count]; ByteBuffer buffer = ByteBuffer.wrap(bs); - buffer.put((byte) ((data.isRpc() ? 0b01 : 0) | (data.isFrombody() ? 0b10 : 0))); + buffer.put((byte) (data.isRpc() ? 0b01 : 0)); buffer.putInt(data.getReqConvertType() == null ? 0 : data.getReqConvertType().getValue()); buffer.putInt(data.getRespConvertType() == null ? 0 : data.getRespConvertType().getValue()); buffer.putChar((char) traceid.length); @@ -109,7 +109,6 @@ public class HttpSimpleRequestCoder implements MessageCoder { HttpSimpleRequest req = new HttpSimpleRequest(); byte opt = buffer.get(); req.setRpc((opt & 0b01) > 0); - req.setFrombody((opt & 0b10) > 0); int reqformat = buffer.getInt(); int respformat = buffer.getInt(); if (reqformat != 0) { diff --git a/src/main/java/org/redkale/net/http/HttpRequest.java b/src/main/java/org/redkale/net/http/HttpRequest.java index 22e3cd0e9..2120c923b 100644 --- a/src/main/java/org/redkale/net/http/HttpRequest.java +++ b/src/main/java/org/redkale/net/http/HttpRequest.java @@ -113,9 +113,6 @@ public class HttpRequest extends Request { protected Supplier currentUserSupplier; - //参数是否从body中取 - protected boolean frombody; - protected ConvertType reqConvertType; protected Convert reqConvert; @@ -212,7 +209,6 @@ public class HttpRequest extends Request { if (req.getHeaders() != null) { this.headers.putAll(req.getHeaders()); } - this.frombody = req.isFrombody(); this.reqConvertType = req.getReqConvertType(); this.reqConvert = req.getReqConvertType() == null ? null : ConvertFactory.findConvert(req.getReqConvertType()); this.respConvertType = req.getRespConvertType(); @@ -323,7 +319,6 @@ public class HttpRequest extends Request { this.rpc = httplast.rpc; this.traceid = httplast.traceid; this.currentUserid = httplast.currentUserid; - this.frombody = httplast.frombody; this.reqConvertType = httplast.reqConvertType; this.reqConvert = httplast.reqConvert; this.respConvertType = httplast.respConvertType; @@ -823,19 +818,13 @@ public class HttpRequest extends Request { this.currentUserid = value; headers.put(name, value); break; - case Rest.REST_HEADER_PARAM_FROM_BODY: //rest-param-from-body - this.frombody = vlen == 4 && content[0] == 't' && content[1] == 'r' && content[2] == 'u' && content[3] == 'e'; - headers.put(name, this.frombody ? "true" - : (vlen == 5 && content[0] == 'f' && content[1] == 'a' && content[2] == 'l' && content[3] == 's' && content[4] == 'e' - ? "false" : bytes.toString(true, charset))); - break; - case Rest.REST_HEADER_REQ_CONVERT_TYPE: //rest-req-convert-type + case Rest.REST_HEADER_REQ_CONVERT: //rest-req-convert-type value = bytes.toString(true, charset); reqConvertType = ConvertType.valueOf(value); reqConvert = ConvertFactory.findConvert(reqConvertType); headers.put(name, value); break; - case Rest.REST_HEADER_RESP_CONVERT_TYPE: //rest-resp-convert-type + case Rest.REST_HEADER_RESP_CONVERT: //rest-resp-convert-type value = bytes.toString(true, charset); respConvertType = ConvertType.valueOf(value); respConvert = ConvertFactory.findConvert(respConvertType); @@ -948,7 +937,6 @@ public class HttpRequest extends Request { req.traceid = this.traceid; req.currentUserid = this.currentUserid; req.currentUserSupplier = this.currentUserSupplier; - req.frombody = this.frombody; req.reqConvertType = this.reqConvertType; req.reqConvert = this.reqConvert; req.respConvert = this.respConvert; @@ -985,7 +973,6 @@ public class HttpRequest extends Request { this.readState = READ_STATE_ROUTE; this.currentUserid = CURRUSERID_NIL; this.currentUserSupplier = null; - this.frombody = false; this.reqConvertType = null; this.reqConvert = null; this.respConvert = jsonConvert; @@ -1542,7 +1529,6 @@ public class HttpRequest extends Request { public String toString() { parseBody(); return this.getClass().getSimpleName() + "{\r\n method: " + this.method + ", \r\n requestURI: " + this.requestURI - + (this.frombody ? (", \r\n frombody: " + this.frombody) : "") + (this.reqConvertType != null ? (", \r\n reqConvertType: " + this.reqConvertType) : "") + (this.respConvertType != null ? (", \r\n respConvertType: " + this.respConvertType) : "") + (this.currentUserid != CURRUSERID_NIL ? (", \r\n currentUserid: " + (this.currentUserid == CURRUSERID_NIL ? null : this.currentUserid)) : "") @@ -2566,16 +2552,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public String getParameter(String name) { - if (this.frombody) { - if (array.isEmpty()) { - return null; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (String) convert.convertFrom(String.class, array.content()); - } parseBody(); return params.get(name); } @@ -2589,16 +2565,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public String getParameter(String name, String defaultValue) { - if (this.frombody) { - if (array.isEmpty()) { - return defaultValue; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (String) convert.convertFrom(String.class, array.content()); - } parseBody(); return params.getOrDefault(name, defaultValue); } @@ -2613,19 +2579,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public T getJsonParameter(java.lang.reflect.Type type, String name) { - if (this.frombody) { - if (array.isEmpty()) { - return null; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - if (type == byte[].class) { - return (T) array.getBytes(); - } - return (T) convert.convertFrom(type, array.content()); - } String v = getParameter(name); return v == null || v.isEmpty() ? null : jsonConvert.convertFrom(type, v); } @@ -2654,16 +2607,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public boolean getBooleanParameter(String name, boolean defaultValue) { - if (this.frombody) { - if (array.isEmpty()) { - return defaultValue; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (boolean) convert.convertFrom(boolean.class, array.content()); - } parseBody(); String value = params.get(name); return value == null || value.length() == 0 ? defaultValue : Boolean.parseBoolean(value); @@ -2678,16 +2621,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public short getShortParameter(String name, short defaultValue) { - if (this.frombody) { - if (array.isEmpty()) { - return defaultValue; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (short) convert.convertFrom(short.class, array.content()); - } parseBody(); String value = params.get(name); if (value == null || value.length() == 0) { @@ -2710,16 +2643,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public short getShortParameter(int radix, String name, short defaultValue) { - if (this.frombody) { - if (array.isEmpty()) { - return (short) defaultValue; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (short) convert.convertFrom(short.class, array.content()); - } parseBody(); String value = params.get(name); if (value == null || value.length() == 0) { @@ -2741,16 +2664,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public short getShortParameter(String name, int defaultValue) { - if (this.frombody) { - if (array.isEmpty()) { - return (short) defaultValue; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (short) convert.convertFrom(short.class, array.content()); - } parseBody(); String value = params.get(name); if (value == null || value.length() == 0) { @@ -2772,16 +2685,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public int getIntParameter(String name, int defaultValue) { - if (this.frombody) { - if (array.isEmpty()) { - return defaultValue; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (int) convert.convertFrom(int.class, array.content()); - } parseBody(); String value = params.get(name); if (value == null || value.length() == 0) { @@ -2804,16 +2707,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public int getIntParameter(int radix, String name, int defaultValue) { - if (this.frombody) { - if (array.isEmpty()) { - return defaultValue; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (int) convert.convertFrom(int.class, array.content()); - } parseBody(); String value = params.get(name); if (value == null || value.length() == 0) { @@ -2835,16 +2728,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public long getLongParameter(String name, long defaultValue) { - if (this.frombody) { - if (array.isEmpty()) { - return defaultValue; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (long) convert.convertFrom(long.class, array.content()); - } parseBody(); String value = params.get(name); if (value == null || value.length() == 0) { @@ -2867,16 +2750,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public long getLongParameter(int radix, String name, long defaultValue) { - if (this.frombody) { - if (array.isEmpty()) { - return defaultValue; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (long) convert.convertFrom(long.class, array.content()); - } parseBody(); String value = params.get(name); if (value == null || value.length() == 0) { @@ -2898,16 +2771,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public float getFloatParameter(String name, float defaultValue) { - if (this.frombody) { - if (array.isEmpty()) { - return defaultValue; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (float) convert.convertFrom(float.class, array.content()); - } parseBody(); String value = params.get(name); if (value == null || value.length() == 0) { @@ -2929,16 +2792,6 @@ public class HttpRequest extends Request { * @return 参数值 */ public double getDoubleParameter(String name, double defaultValue) { - if (this.frombody) { - if (array.isEmpty()) { - return defaultValue; - } - Convert convert = this.reqConvert; - if (convert == null) { - convert = jsonConvert; - } - return (double) convert.convertFrom(double.class, array.content()); - } parseBody(); String value = params.get(name); if (value == null || value.length() == 0) { diff --git a/src/main/java/org/redkale/net/http/HttpSimpleRequest.java b/src/main/java/org/redkale/net/http/HttpSimpleRequest.java index 41eb8953d..55d1ac1e3 100644 --- a/src/main/java/org/redkale/net/http/HttpSimpleRequest.java +++ b/src/main/java/org/redkale/net/http/HttpSimpleRequest.java @@ -30,14 +30,10 @@ import org.redkale.util.Traces; */ public class HttpSimpleRequest extends ClientRequest implements java.io.Serializable { - @ConvertColumn(index = 1) + @ConvertColumn(index = 2) @Comment("是否RPC请求, 该类通常是为RPC创建的，故默认是true") protected boolean rpc = true; - @ConvertColumn(index = 2) - @Comment("是否从body中获取参数，比如protobuf数据格式") - protected boolean frombody; - @ConvertColumn(index = 3) @Comment("链路ID") protected String traceid; @@ -163,16 +159,6 @@ public class HttpSimpleRequest extends ClientRequest implements java.io.Serializ return this; } - public HttpSimpleRequest requestURI(boolean frombody) { - this.frombody = frombody; - return this; - } - - public HttpSimpleRequest frombody(boolean frombody) { - this.frombody = frombody; - return this; - } - public HttpSimpleRequest bothConvertType(ConvertType convertType) { this.reqConvertType = convertType; this.respConvertType = convertType; @@ -464,14 +450,6 @@ public class HttpSimpleRequest extends ClientRequest implements java.io.Serializ this.body = body; } - public boolean isFrombody() { - return frombody; - } - - public void setFrombody(boolean frombody) { - this.frombody = frombody; - } - public ConvertType getReqConvertType() { return reqConvertType; } diff --git a/src/main/java/org/redkale/net/http/Rest.java b/src/main/java/org/redkale/net/http/Rest.java index a793d1903..a92af0dd2 100644 --- a/src/main/java/org/redkale/net/http/Rest.java +++ b/src/main/java/org/redkale/net/http/Rest.java @@ -38,27 +38,25 @@ import org.redkale.util.*; @SuppressWarnings("unchecked") public final class Rest { - //请求所需的RestService的资源名，值类型: 字符串 - public static final String REST_HEADER_RESOURCE_NAME = "rest-resource-name"; - //请求是否为rpc协议，值类型: 布尔，取值为true、false - public static final String REST_HEADER_RPC = "rest-rpc"; + public static final String REST_HEADER_RPC = "Rest-Rpc"; //traceid，值类型: 字符串 - public static final String REST_HEADER_TRACEID = "rest-traceid"; + public static final String REST_HEADER_TRACEID = "Rest-Traceid"; //当前用户ID值，值类型: 字符串 - public static final String REST_HEADER_CURRUSERID = "rest-curruserid"; + public static final String REST_HEADER_CURRUSERID = "Rest-Curruserid"; - //参数是否从body中获取，值类型: 布尔，取值为true、false - public static final String REST_HEADER_PARAM_FROM_BODY = "rest-param-from-body"; + //请求所需的RestService的资源名，值类型: 字符串 + public static final String REST_HEADER_RESNAME = "Rest-Resname"; //请求参数的反序列化种类，值类型: 字符串，取值为ConvertType枚举值名 - public static final String REST_HEADER_REQ_CONVERT_TYPE = "rest-req-convert-type"; + public static final String REST_HEADER_REQ_CONVERT = "Rest-Req-Convert"; //响应结果的序列化种类，值类型: 字符串，取值为ConvertType枚举值名 - public static final String REST_HEADER_RESP_CONVERT_TYPE = "rest-resp-convert-type"; + public static final String REST_HEADER_RESP_CONVERT = "Rest-Resp-Convert"; + //--------------------------------------------------------------------------------------------------- static final String REST_TOSTRINGOBJ_FIELD_NAME = "_redkale_tostringsupplier"; static final String REST_CONVERT_FIELD_PREFIX = "_redkale_restconvert_"; @@ -1914,7 +1912,7 @@ public final class Rest { mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn(GETFIELD, newDynName, REST_SERVICEMAP_FIELD_NAME, "Ljava/util/Map;"); mv.visitVarInsn(ALOAD, 1); - mv.visitLdcInsn(REST_HEADER_RESOURCE_NAME); + mv.visitLdcInsn(REST_HEADER_RESNAME); mv.visitLdcInsn(""); mv.visitMethodInsn(INVOKEVIRTUAL, reqInternalName, "getHeader", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", false); mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); diff --git a/src/test/java/org/redkale/test/rest/_DynHelloRestServlet1.java b/src/test/java/org/redkale/test/rest/_DynHelloRestServlet1.java index 7d39b87c6..bc848f87d 100644 --- a/src/test/java/org/redkale/test/rest/_DynHelloRestServlet1.java +++ b/src/test/java/org/redkale/test/rest/_DynHelloRestServlet1.java @@ -35,7 +35,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { entity.setHelloname("my name"); Map headers = new HashMap<>(); headers.put("hello-res", "my res"); - //headers.put(Rest.REST_HEADER_RESOURCE_NAME, "my-res"); + //headers.put(Rest.REST_HEADER_RESNAME, "my-res"); String url = "http://127.0.0.1:" + port + "/pipes/hello/update?entity={}&bean2={}"; System.out.println(Utility.postHttpContent(url, headers, null)); url = "http://127.0.0.1:" + port + "/pipes/hello/update2?entity={}&bean2={}"; @@ -61,7 +61,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { @HttpMapping(url = "/hello/create", auth = false) public void create(HttpRequest req, HttpResponse resp) throws IOException { - HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); HelloEntity bean = req.getJsonParameter(HelloEntity.class, "bean"); bean.setClientaddr(req.getRemoteAddr()); bean.setResname(req.getHeader("hello-res")); @@ -72,7 +72,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { @HttpMapping(url = "/hello/delete/", auth = false) public void delete(HttpRequest req, HttpResponse resp) throws IOException { - HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); int id = Integer.parseInt(req.getRequstURILastPath()); service.deleteHello(id); resp.finishJson(RetResult.success()); @@ -80,7 +80,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { @HttpMapping(url = "/hello/update", auth = false) public void update(HttpRequest req, HttpResponse resp) throws IOException { - HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); String clientaddr = req.getRemoteAddr(); HelloEntity bean = req.getJsonParameter(HelloEntity.class, "bean"); bean.setClientaddr(req.getRemoteAddr()); @@ -91,7 +91,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { @HttpMapping(url = "/hello/partupdate", auth = false) public void partupdate(HttpRequest req, HttpResponse resp) throws IOException { - HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); HelloEntity bean = req.getJsonParameter(HelloEntity.class, "bean"); bean.setClientaddr(req.getRemoteAddr()); bean.setResname(req.getHeader("hello-res")); @@ -102,7 +102,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { @HttpMapping(url = "/hello/query", auth = false) public void query(HttpRequest req, HttpResponse resp) throws IOException { - HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); HelloBean bean = req.getJsonParameter(HelloBean.class, "bean"); bean.setClientaddr(req.getRemoteAddr()); bean.setUseragent(req.getHeader("User-Agent")); @@ -115,7 +115,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { @HttpMapping(url = "/hello/list", auth = false) public void list(HttpRequest req, HttpResponse resp) throws IOException { - HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); HelloBean bean = req.getJsonParameter(HelloBean.class, "bean"); bean.setClientaddr(req.getRemoteAddr()); bean.setUseragent(req.getHeader("User-Agent")); @@ -127,7 +127,7 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { @HttpMapping(url = "/hello/find/", auth = false) public void find(HttpRequest req, HttpResponse resp) throws IOException { - HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); int id = Integer.parseInt(req.getRequstURILastPath()); HelloEntity bean = service.findHello(id); resp.finishJson(bean); @@ -135,21 +135,21 @@ public class _DynHelloRestServlet1 extends SimpleRestServlet { @HttpMapping(url = "/hello/asyncfind/", auth = false) public void asyncfind(HttpRequest req, HttpResponse resp) throws IOException { - HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); int id = Integer.parseInt(req.getRequstURILastPath()); resp.finishJson(service.asyncFindHello(id)); } @HttpMapping(url = "/hello/asyncfind2/", auth = false) public void asyncfind2(HttpRequest req, HttpResponse resp) throws IOException { - HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); int id = Integer.parseInt(req.getRequstURILastPath()); service.asyncFindHello(resp.createAsyncHandler(), id); } @HttpMapping(url = "/hello/asyncfind3/", auth = false) public void asyncfind3(HttpRequest req, HttpResponse resp) throws IOException { - HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); int id = Integer.parseInt(req.getRequstURILastPath()); service.asyncFindHello(resp.createAsyncHandler(HelloAsyncHandler.class), id); } diff --git a/src/test/java/org/redkale/test/rest/_DynHelloRestServlet2.java b/src/test/java/org/redkale/test/rest/_DynHelloRestServlet2.java index 2f0f7900b..41fc85971 100644 --- a/src/test/java/org/redkale/test/rest/_DynHelloRestServlet2.java +++ b/src/test/java/org/redkale/test/rest/_DynHelloRestServlet2.java @@ -29,7 +29,7 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet { @HttpMapping(url = "/hello/create", auth = false, comment = "创建Hello对象") @HttpParam(name = "bean", type = HelloEntity.class, comment = "Hello对象") public void create(HttpRequest req, HttpResponse resp) throws IOException { - HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); HelloEntity bean = req.getJsonParameter(HelloEntity.class, "bean"); bean.setClientaddr(req.getRemoteAddr()); bean.setResname(req.getHeader("hello-res")); @@ -43,7 +43,7 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet { @HttpMapping(url = "/hello/delete/", auth = false, comment = "根据id删除Hello对象") @HttpParam(name = "#", type = int.class, comment = "Hello对象id") public void delete(HttpRequest req, HttpResponse resp) throws IOException { - HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); int id = Integer.parseInt(req.getRequstURILastPath()); service.deleteHello(id); resp.finishJson(RetResult.success()); @@ -52,7 +52,7 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet { @HttpMapping(url = "/hello/update", auth = false, comment = "修改Hello对象") @HttpParam(name = "bean", type = HelloEntity.class, comment = "Hello对象") public void update(HttpRequest req, HttpResponse resp) throws IOException { - HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); HelloEntity bean = req.getJsonParameter(HelloEntity.class, "bean"); bean.setClientaddr(req.getRemoteAddr()); bean.setResname(req.getHeader("hello-res")); @@ -65,7 +65,7 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet { @HttpMapping(url = "/hello/query", auth = false, comment = "查询Hello对象列表") @HttpParam(name = "bean", type = HelloBean.class, comment = "过滤条件") public void query(HttpRequest req, HttpResponse resp) throws IOException { - HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); HelloBean bean = req.getJsonParameter(HelloBean.class, "bean"); bean.setClientaddr(req.getRemoteAddr()); bean.setUseragent(req.getHeader("User-Agent")); @@ -79,7 +79,7 @@ public class _DynHelloRestServlet2 extends SimpleRestServlet { @HttpMapping(url = "/hello/find/", auth = false, comment = "根据id删除Hello对象") @HttpParam(name = "#", type = int.class, comment = "Hello对象id") public void find(HttpRequest req, HttpResponse resp) throws IOException { - HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESOURCE_NAME, "")); + HelloService2 service = _redkale_servicemap == null ? _redkale_service : _redkale_servicemap.get(req.getHeader(Rest.REST_HEADER_RESNAME, "")); int id = Integer.parseInt(req.getRequstURILastPath()); HelloEntity bean = service.findHello(id); resp.finishJson(bean);