Refactoring

This commit is contained in:
Changhua 2025-02-03 21:40:22 +08:00
parent b79e163cc9
commit 0fd3449894

View File

@ -45,6 +45,7 @@ static nng_socket cmdSock = NNG_SOCKET_INITIALIZER; // TODO: 断开检测
static nng_socket msgSock = NNG_SOCKET_INITIALIZER; // TODO: 断开检测 static nng_socket msgSock = NNG_SOCKET_INITIALIZER; // TODO: 断开检测
auto &msgHandler = MessageHandler::getInstance(); auto &msgHandler = MessageHandler::getInstance();
auto &sendMgr = SendMsgManager::get_instance();
static std::string BuildUrl(int port) { return "tcp://0.0.0.0:" + std::to_string(port); } static std::string BuildUrl(int port) { return "tcp://0.0.0.0:" + std::to_string(port); }
@ -145,7 +146,7 @@ static bool func_send_txt(TextMsg txt, uint8_t *out, size_t *len)
std::string msg(txt.msg); std::string msg(txt.msg);
std::string receiver(txt.receiver); std::string receiver(txt.receiver);
std::string aters(txt.aters ? txt.aters : ""); std::string aters(txt.aters ? txt.aters : "");
SendMsgManager::send_text(receiver, msg, aters); sendMgr.send_text(receiver, msg, aters);
rsp.msg.status = 0; rsp.msg.status = 0;
} }
}); });
@ -161,7 +162,7 @@ static bool func_send_img(char *path, char *receiver, uint8_t *out, size_t *len)
LOG_ERROR("Path does not exist: {}", path); LOG_ERROR("Path does not exist: {}", path);
rsp.msg.status = -2; rsp.msg.status = -2;
} else { } else {
SendMsgManager::send_image(receiver, path); sendMgr.send_image(receiver, path);
rsp.msg.status = 0; rsp.msg.status = 0;
} }
}); });
@ -177,7 +178,7 @@ static bool func_send_file(char *path, char *receiver, uint8_t *out, size_t *len
LOG_ERROR("Path does not exist: {}", path); LOG_ERROR("Path does not exist: {}", path);
rsp.msg.status = -2; rsp.msg.status = -2;
} else { } else {
SendMsgManager::send_file(receiver, path); sendMgr.send_file(receiver, path);
rsp.msg.status = 0; rsp.msg.status = 0;
} }
}); });
@ -190,7 +191,7 @@ static bool func_send_emotion(char *path, char *receiver, uint8_t *out, size_t *
LOG_ERROR("Empty path or receiver."); LOG_ERROR("Empty path or receiver.");
rsp.msg.status = -1; rsp.msg.status = -1;
} else { } else {
SendMsgManager::send_emotion(receiver, path); sendMgr.send_emotion(receiver, path);
rsp.msg.status = 0; rsp.msg.status = 0;
} }
}); });
@ -207,7 +208,7 @@ static bool func_send_xml(XmlMsg xml, uint8_t *out, size_t *len)
std::string content(xml.content); std::string content(xml.content);
std::string path(xml.path ? xml.path : ""); std::string path(xml.path ? xml.path : "");
uint64_t type = static_cast<uint64_t>(xml.type); uint64_t type = static_cast<uint64_t>(xml.type);
SendMsgManager::send_xml(receiver, content, path, type); sendMgr.send_xml(receiver, content, path, type);
rsp.msg.status = 0; rsp.msg.status = 0;
} }
}); });
@ -229,7 +230,7 @@ static bool func_send_rich_txt(RichText rt, uint8_t *out, size_t *len)
rtt.title = std::string(rt.title ? rt.title : ""); rtt.title = std::string(rt.title ? rt.title : "");
rtt.url = std::string(rt.url ? rt.url : ""); rtt.url = std::string(rt.url ? rt.url : "");
rsp.msg.status = SendMsgManager::send_rich_text(rtt); rsp.msg.status = sendMgr.send_rich_text(rtt);
} }
}); });
} }
@ -241,7 +242,7 @@ static bool func_send_pat_msg(char *roomid, char *wxid, uint8_t *out, size_t *le
LOG_ERROR("Empty roomid or wxid."); LOG_ERROR("Empty roomid or wxid.");
rsp.msg.status = -1; rsp.msg.status = -1;
} else { } else {
rsp.msg.status = SendMsgManager::send_pat(roomid, wxid); rsp.msg.status = sendMgr.send_pat(roomid, wxid);
} }
}); });
} }
@ -253,7 +254,7 @@ static bool func_forward_msg(uint64_t id, char *receiver, uint8_t *out, size_t *
LOG_ERROR("Empty receiver."); LOG_ERROR("Empty receiver.");
rsp.msg.status = -1; rsp.msg.status = -1;
} else { } else {
rsp.msg.status = SendMsgManager::forward(id, receiver); rsp.msg.status = sendMgr.forward(id, receiver);
} }
}); });
} }