feat(jsonrpc):1.12.25, 将StrIdRpc与IntIdRpc合并为Rpc

Author: hevake

examples/jsonrpc/message/int_id/Makefile

@@ -18,7 +18,7 @@
 # of the source tree.
 #
 
-PROJECT := examples/jsonrpc/message/str_id/ping
+PROJECT := examples/jsonrpc/message/ping
 EXE_NAME := ${PROJECT}
 
 CPP_SRC_FILES := ping.cpp

examples/jsonrpc/message/int_id/pong/Makefile

@@ -28,6 +28,7 @@
  * 如此周而复始，直至与pong端断开，或者接收到了SIGINT停止信号
  */
 
+#include <iostream>
 #include <tbox/base/log.h>  //! 打印日志
 #include <tbox/base/log_output.h>   //! 使能日志输出
 #include <tbox/base/scope_exit.hpp> //! 使用 SetScopeExitAction()
@@ -38,12 +39,24 @@
 #include <tbox/network/tcp_client.h>    //! 导入TcpClient模块
 #include <tbox/util/json.h>     //! 使用JSON操作的辅助函数 GetField()
 #include <tbox/jsonrpc/protos/raw_stream_proto.h>   //! 导入 jsonrpc::RawStreamProto
-#include <tbox/jsonrpc/int_id_rpc.h>    //! 导入 jsonrpc::IntIdRpc
+#include <tbox/jsonrpc/rpc.h>    //! 导入 jsonrpc::Rpc
 
 using namespace tbox;
 
 int main(int argc, char **argv)
 {
+    jsonrpc::Rpc::IdType id_type = jsonrpc::Rpc::IdType::kInt;
+    if (argc >= 2) {
+        std::string type_str(argv[1]);
+        if (type_str == "str") {
+            id_type = jsonrpc::Rpc::IdType::kString;
+        } else if (type_str != "int") {
+            std::cout << "id_type invalid!" << std::endl
+                << "Usage: " << argv[0] << " int|str" << std::endl;
+            return 0;
+        }
+    }
+
     LogOutput_Enable();
 
     LogInfo("enter");
@@ -61,7 +74,7 @@ int main(int argc, char **argv)
 
     network::TcpClient tcp_client(loop);
     jsonrpc::RawStreamProto proto;
-    jsonrpc::IntIdRpc rpc(loop);
+    jsonrpc::Rpc rpc(loop, id_type);
 
     rpc.initialize(&proto, 3);
     std::string srv_addr = "/tmp/ping_pong.sock";

examples/jsonrpc/message/str_id/ping/Makefile renamed to examples/jsonrpc/message/ping/Makefile

@@ -18,7 +18,7 @@
 # of the source tree.
 #
 
-PROJECT := examples/jsonrpc/req_rsp/int_id/pong
+PROJECT := examples/jsonrpc/message/pong
 EXE_NAME := ${PROJECT}
 
 CPP_SRC_FILES := pong.cpp

examples/jsonrpc/message/int_id/ping/ping.cpp renamed to examples/jsonrpc/message/ping/ping.cpp

@@ -25,6 +25,7 @@
  * 当收到ping请求后，将参数中的count提取出来作为结果直接回复。
  */
 
+#include <iostream>
 #include <tbox/base/log.h>  //! 打印日志
 #include <tbox/base/log_output.h>   //! LogOutput_Enable()
 #include <tbox/base/scope_exit.hpp> //! SetScopeExitAction()
@@ -35,12 +36,24 @@
 #include <tbox/event/signal_event.h>    //! ctrl+c信号事件
 #include <tbox/network/tcp_server.h>    //! TcpServer
 #include <tbox/jsonrpc/protos/raw_stream_proto.h> //! jsonrpc::RawStreamProto
-#include <tbox/jsonrpc/int_id_rpc.h>    //! jsonrpc::IntIdRpc
+#include <tbox/jsonrpc/rpc.h>   //! jsonrpc::Rpc
 
 using namespace tbox;
 
 int main(int argc, char **argv)
 {
+    jsonrpc::Rpc::IdType id_type = jsonrpc::Rpc::IdType::kInt;
+    if (argc >= 2) {
+        std::string type_str(argv[1]);
+        if (type_str == "str") {
+            id_type = jsonrpc::Rpc::IdType::kString;
+        } else if (type_str != "int") {
+            std::cout << "id_type invalid!" << std::endl
+                << "Usage: " << argv[0] << " int|str" << std::endl;
+            return 0;
+        }
+    }
+
     LogOutput_Enable();
 
     LogInfo("enter");
@@ -58,7 +71,7 @@ int main(int argc, char **argv)
 
     network::TcpServer tcp_server(loop);
     jsonrpc::RawStreamProto proto;
-    jsonrpc::IntIdRpc rpc(loop);
+    jsonrpc::Rpc rpc(loop, id_type);
 
     rpc.initialize(&proto, 3);
     std::string srv_addr = "/tmp/ping_pong.sock";