WebRequest

src/main/java/org/redkale/mq/spi/HttpMessageRequest.java

@@ -33,7 +33,7 @@ public class HttpMessageRequest extends HttpRequest {
     }
 
     protected HttpMessageRequest prepare(MessageRecord message) {
-        super.initSimpleRequest(message.decodeContent(WebRequestCoder.getInstance()), false);
+        super.initWebRequest(message.decodeContent(WebRequestCoder.getInstance()), false);
         this.message = message;
         this.currentUserid = message.getUserid();
         this.createTime = System.currentTimeMillis();

src/main/java/org/redkale/net/http/HttpRequest.java

@@ -197,14 +197,14 @@ public class HttpRequest extends Request<HttpContext> {
         this.localParameter = null;
         this.rpcAuthenticator = null;
         if (req != null) {
-            initSimpleRequest(req, true);
+            initWebRequest(req, true);
         }
     }
 
-    protected HttpRequest initSimpleRequest(WebRequest req, boolean needPath) {
+    protected HttpRequest initWebRequest(WebRequest req, boolean needPath) {
         if (req != null) {
             this.rpc = req.rpc;
-            this.traceid = req.traceid;
+            this.traceid = req.getTraceid();
             if (req.getBody() != null) {
                 this.array.put(req.getBody());
             }

src/main/java/org/redkale/net/http/WebClient.java

@@ -85,22 +85,6 @@ public class WebClient extends Client<WebConnection, WebRequest, WebResult> {
         return this;
     }
 
-    public int getReadTimeoutSeconds() {
-        return readTimeoutSeconds;
-    }
-
-    public void setReadTimeoutSeconds(int readTimeoutSeconds) {
-        this.readTimeoutSeconds = readTimeoutSeconds;
-    }
-
-    public int getWriteTimeoutSeconds() {
-        return writeTimeoutSeconds;
-    }
-
-    public void setWriteTimeoutSeconds(int writeTimeoutSeconds) {
-        this.writeTimeoutSeconds = writeTimeoutSeconds;
-    }
-
     public CompletableFuture<HttpResult<byte[]>> getAsync(String url) {
         return sendAsync("GET", url, null, (byte[]) null);
     }
@@ -425,7 +409,7 @@ public class WebClient extends Client<WebConnection, WebRequest, WebResult> {
             }
             if (this.readState == READ_STATE_BODY) {
                 if (this.contentLength > 0) {
-                    array.put(buffer, Math.min((int) this.contentLength, buffer.remaining()));
+                    array.put(buffer, Math.min(this.contentLength, buffer.remaining()));
                     int lr = (int) this.contentLength - array.length();
                     if (lr == 0) {
                         this.readState = READ_STATE_END;

src/main/java/org/redkale/net/http/WebRequest.java

@@ -38,14 +38,10 @@ public class WebRequest extends ClientRequest implements java.io.Serializable {
 
     private static final Function<WebRequest, WebRequest> copyFunc = Copier.func(WebRequest.class, WebRequest.class);
 
-    @ConvertColumn(index = 12)
+    @ConvertColumn(index = 13)
     @Comment("是否RPC请求, 该类通常是为RPC创建的，故默认是true")
     protected boolean rpc = true;
 
-    @ConvertColumn(index = 13)
-    @Comment("链路ID")
-    protected String traceid;
-
     @ConvertColumn(index = 14)
     @Comment("请求参数的ConvertType")
     protected ConvertType reqConvertType;
@@ -257,6 +253,7 @@ public class WebRequest extends ClientRequest implements java.io.Serializable {
         return this;
     }
 
+    @Override
     public WebRequest traceid(String traceid) {
         if (traceid != null) {
             if (traceid.indexOf(' ') >= 0 || traceid.indexOf('\r') >= 0 || traceid.indexOf('\n') >= 0) {
@@ -484,10 +481,6 @@ public class WebRequest extends ClientRequest implements java.io.Serializable {
         rpc(rpc);
     }
 
-    public String getTraceid() {
-        return traceid;
-    }
-
     public void setTraceid(String traceid) {
         traceid(traceid);
     }