From 558c29912d0d1a8d43dd30528c7f5b025efda50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E6=98=BE=E4=BC=98?= <237809796@qq.com>
Date: Sat, 15 Apr 2023 01:02:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Arpc=20=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E6=96=B9=E6=B3=95=20render=20=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=20=E8=BF=87=E6=97=B6=EF=BC=9Arpc=20?=
 =?UTF-8?q?build=20=E7=B3=BB=E5=88=97=E6=96=B9=E6=B3=95=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/zdemo/zhub/Rpc.java        | 46 +++++++++++++++++++++++++++++-
 src/com/zdemo/zhub/ZHubClient.java |  1 +
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/com/zdemo/zhub/Rpc.java b/src/com/zdemo/zhub/Rpc.java
index 0eff756..d251223 100644
--- a/src/com/zdemo/zhub/Rpc.java
+++ b/src/com/zdemo/zhub/Rpc.java
@@ -2,6 +2,7 @@ package com.zdemo.zhub;
 
 import org.redkale.convert.ConvertColumn;
 import org.redkale.convert.json.JsonConvert;
+import org.redkale.service.RetResult;
 
 public class Rpc<T> {
     private String ruk;     // request unique key:
@@ -13,7 +14,7 @@ public class Rpc<T> {
     public Rpc() {
     }
 
-    public Rpc(String appname, String ruk, String topic, Object value) {
+    protected Rpc(String appname, String ruk, String topic, Object value) {
         this.ruk = appname + "::" + ruk;
         this.topic = topic;
         this.value = (T) JsonConvert.root().convertTo(value);
@@ -57,12 +58,14 @@ public class Rpc<T> {
         return ruk.split("::")[0];
     }
 
+    @Deprecated(since = "2023.04.15")
     public <R> RpcResult<R> buildResp() {
         RpcResult<R> response = new RpcResult<>();
         response.setRuk(ruk);
         return response;
     }
 
+    @Deprecated(since = "2023.04.15")
     public <R> RpcResult<R> buildResp(int retcode, String retinfo) {
         RpcResult<R> response = new RpcResult<>();
         response.setRuk(ruk);
@@ -71,6 +74,7 @@ public class Rpc<T> {
         return response;
     }
 
+    @Deprecated(since = "2023.04.15")
     public <R> RpcResult<R> buildError(String retinfo) {
         RpcResult<R> response = new RpcResult<>();
         response.setRuk(ruk);
@@ -79,10 +83,50 @@ public class Rpc<T> {
         return response;
     }
 
+    @Deprecated(since = "2023.04.15")
     public <R> RpcResult<R> buildResp(R result) {
         RpcResult<R> response = new RpcResult<>();
         response.setRuk(ruk);
         response.setResult(result);
         return response;
     }
+
+    public <R> RpcResult<R> render() {
+        RpcResult<R> response = new RpcResult<>();
+        response.setRuk(ruk);
+        return response;
+    }
+
+    public RpcResult render(RetResult result) {
+        RpcResult resp = new RpcResult<>();
+        resp.setRuk(ruk);
+        resp.setRetcode(result.getRetcode());
+        resp.setRetinfo(result.getRetinfo());
+        resp.setResult(result.getResult());
+        return resp;
+    }
+
+    public <R> RpcResult<R> render(R result) {
+        RpcResult<R> response = new RpcResult<>();
+        response.setRuk(ruk);
+        response.setResult(result);
+        return response;
+    }
+
+    public <R> RpcResult<R> retError(String retinfo) {
+        RpcResult<R> response = new RpcResult<>();
+        response.setRuk(ruk);
+        response.setRetcode(100);
+        response.setRetinfo(retinfo);
+        return response;
+    }
+
+    public <R> RpcResult<R> retError(int retcode, String retinfo) {
+        RpcResult<R> response = new RpcResult<>();
+        response.setRuk(ruk);
+        response.setRetcode(retcode);
+        response.setRetinfo(retinfo);
+        return response;
+    }
+
 }
diff --git a/src/com/zdemo/zhub/ZHubClient.java b/src/com/zdemo/zhub/ZHubClient.java
index ca7b1fb..9a30e65 100644
--- a/src/com/zdemo/zhub/ZHubClient.java
+++ b/src/com/zdemo/zhub/ZHubClient.java
@@ -504,6 +504,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         send("timer", name);
     }
 
+    @Deprecated
     public void reloadTimer() {
         send("cmd", "reload-timer");
     }