Browse Source

update

disinfection_machine
zhaohe 2 years ago
parent
commit
419371f959
  1. 20
      src/iflytop/components/iflytop_front_end_service/iflytop_front_end_service.cpp

20
src/iflytop/components/iflytop_front_end_service/iflytop_front_end_service.cpp

@ -10,7 +10,8 @@ using namespace core;
using namespace ix; using namespace ix;
void IflytopFrontEndService::initialize(string ip) { void IflytopFrontEndService::initialize(string ip) {
logger->info("IflytopFrontEndService initialize {}", 19001);
logger->info("IflytopFrontEndService initialize {}:{}", ip, 19001);
logger->info("IflytopFrontEndService initialize {}:{}", ip, 19002);
m_server.reset(new WebSocketServer(19001, ip)); m_server.reset(new WebSocketServer(19001, ip));
m_server->setOnConnectionCallback([this](weak_ptr<WebSocket> webSocket, shared_ptr<ConnectionState> connectionState) { m_server->setOnConnectionCallback([this](weak_ptr<WebSocket> webSocket, shared_ptr<ConnectionState> connectionState) {
@ -27,6 +28,13 @@ void IflytopFrontEndService::initialize(string ip) {
}); });
m_report_server.reset(new WebSocketServer(19002, ip)); m_report_server.reset(new WebSocketServer(19002, ip));
m_report_server->setOnConnectionCallback([this](weak_ptr<WebSocket> webSocket, shared_ptr<ConnectionState> connectionState) {
logger->info("Remote ip: {}", connectionState->getRemoteIp());
auto ws = webSocket.lock();
if (!ws) return;
ws->setOnMessageCallback([this, webSocket, connectionState](const ix::WebSocketMessagePtr& msg) {});
});
m_initialized = true; m_initialized = true;
} }
void IflytopFrontEndService::startListen() { void IflytopFrontEndService::startListen() {
@ -47,7 +55,7 @@ void IflytopFrontEndService::startListen() {
m_report_server->disablePerMessageDeflate(); m_report_server->disablePerMessageDeflate();
m_report_server->start(); m_report_server->start();
logger->info("IflytopFrontEndService initialize done");
logger->info("IflytopFrontEndService startListen");
} }
// void IflytopFrontEndService::sendMessage(const string& message) { // void IflytopFrontEndService::sendMessage(const string& message) {
@ -127,18 +135,18 @@ void IflytopFrontEndService::processRxMessage(weak_ptr<WebSocket> webSocket, con
receipt["timeStamp"] = duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count(); receipt["timeStamp"] = duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
try { try {
onMessage(webSocket, command, receipt); onMessage(webSocket, command, receipt);
if (command["need_receipt"]) {
if (command.find("need_receipt") == command.end() || command["need_receipt"]) {
shared_ptr<WebSocket> ws = webSocket.lock(); shared_ptr<WebSocket> ws = webSocket.lock();
if (ws) ws->sendText(receipt.dump());
if (ws) ws->sendText(receipt.dump(1));
} }
} catch (const std::exception& e) { } catch (const std::exception& e) {
logger->error("m_iflytopWSService:onMessag,process rx json failed,exception:{},{}", e.what(), msgtext); logger->error("m_iflytopWSService:onMessag,process rx json failed,exception:{},{}", e.what(), msgtext);
if (command["need_receipt"]) {
if (command.find("need_receipt") == command.end() || command["need_receipt"]) {
shared_ptr<WebSocket> ws = webSocket.lock(); shared_ptr<WebSocket> ws = webSocket.lock();
receipt["ackcode"] = err::error_code_get_get_ecode(err::kcommon_error_code, err::kparse_json_err); receipt["ackcode"] = err::error_code_get_get_ecode(err::kcommon_error_code, err::kparse_json_err);
receipt["ackcodeInfo"] = err::error_code_get_desc(err::kcommon_error_code, err::kparse_json_err, e.what()); receipt["ackcodeInfo"] = err::error_code_get_desc(err::kcommon_error_code, err::kparse_json_err, e.what());
if (ws) ws->sendText(receipt.dump());
if (ws) ws->sendText(receipt.dump(1));
} }
} }

Loading…
Cancel
Save