diff --git a/jsonparse/cmt_parse.cpp b/jsonparse/cmt_parse.cpp index 9c6a657..21ccbcc 100644 --- a/jsonparse/cmt_parse.cpp +++ b/jsonparse/cmt_parse.cpp @@ -33,8 +33,9 @@ void JsonData::CmtCmd_80(char* send_data,int& send_length) #ifdef WIFI_MODULE 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)); + memcpy(gateway_ver.comm_mode,"以太网",sizeof(gateway_ver.comm_mode)); + 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); diff --git a/jsonparse/mqtt_cmd_parse.cpp b/jsonparse/mqtt_cmd_parse.cpp index 3de62a5..b7036f6 100644 --- a/jsonparse/mqtt_cmd_parse.cpp +++ b/jsonparse/mqtt_cmd_parse.cpp @@ -491,7 +491,7 @@ int JsonData::JsonCmd_29() { jsonVal["GateWayVersion"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayVersion"); jsBody["localIP"] = GlobalConfig::IpAddr_G; jsBody["dataNodeGatewayType"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayProduct"); - jsBody["CommMode"] = "有线"; + jsBody["CommMode"] = "以太网"; #ifdef NR5G_MODULE jsBody["CommMode"] = "5G"; #endif