From 1438dcce3df6b5189993622e4713cf0ed4057ea1 Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Sat, 8 Feb 2025 11:16:30 +0800 Subject: [PATCH] modify code --- jsonparse/cmt_parse.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jsonparse/cmt_parse.cpp b/jsonparse/cmt_parse.cpp index 6fdca51..8804989 100644 --- a/jsonparse/cmt_parse.cpp +++ b/jsonparse/cmt_parse.cpp @@ -34,7 +34,8 @@ void JsonData::CmtCmd_80(char* send_data,int& send_length) memcpy(gateway_ver.comm_mode,"WiFi",sizeof(gateway_ver.comm_mode)); #endif memcpy(gateway_ver.comm_mode,"以太网",sizeof(gateway_ver.comm_mode)); - memcpy(gateway_ver.terminal_name,ReadStrByOpt(NETWORKCONFIG, "eth0", "hostName").c_str(),sizeof(gateway_ver.terminal_name)); + std::string gatewayLocation = sqlite_db_ctrl::instance().GetData(T_GATEWAY_INFO(TNAME), "gatewayLocation", NULL); + memcpy(gateway_ver.terminal_name,gatewayLocation.c_str(),sizeof(gateway_ver.terminal_name)); GetSysStatusCMT(gateway_ver.cpu_use,gateway_ver.memory_use,gateway_ver.disk_remain,gateway_ver.temperature); memcpy(send_data,&gateway_ver,sizeof(GatewayVersion)); send_length = sizeof(GatewayVersion);