From ed4b39eab5132a6301c7fc1404a588ae147e881e Mon Sep 17 00:00:00 2001 From: lnk Date: Tue, 20 Jan 2026 15:51:41 +0800 Subject: [PATCH] compile for arm --- cfg_parse/SimpleProducer.cpp | 16 ++++-- cfg_parse/cfg_parser.cpp | 16 +++--- cfg_parse/oss_aliyun.cpp | 4 +- json/save2json.cpp | 108 +++++++++++++++++------------------ mms/mms_process.c | 4 +- 5 files changed, 77 insertions(+), 71 deletions(-) diff --git a/cfg_parse/SimpleProducer.cpp b/cfg_parse/SimpleProducer.cpp index 081a990..c25a94f 100644 --- a/cfg_parse/SimpleProducer.cpp +++ b/cfg_parse/SimpleProducer.cpp @@ -46,13 +46,19 @@ extern std::string G_ROCKETMQ_TOPIC;//topie extern std::string G_ROCKETMQ_TAG;//tag extern std::string G_ROCKETMQ_KEY;//key +extern std::string G_MQCONSUMER_TOPIC_LOG; +extern std::string G_MQCONSUMER_TOPIC_SET; +extern std::string G_MQCONSUMER_TOPIC_RC; +extern std::string G_MQCONSUMER_TOPIC_UD; +extern std::string G_MQCONSUMER_TOPIC_RT; + extern std::string FRONT_INST; #ifdef __cplusplus extern "C" { #endif -extern std::string G_MQCONSUMER_TOPIC_SET; // C++ 中的全局变量声明 + #ifdef __cplusplus } @@ -649,7 +655,7 @@ void producer_send(const char* strbody) /////////////////////////////////////////////////////////////////////////////////////////////////////////// extern "C" { -extern std::string G_MQCONSUMER_TOPIC_RT; + void rocketmq_test_rt() { Ckafka_data_t data; @@ -663,7 +669,7 @@ void rocketmq_test_rt() data.mp_id = 123123; my_rocketmq_send(data); } -extern std::string G_MQCONSUMER_TOPIC_UD; + void rocketmq_test_ud()//用来测试台账更新 { Ckafka_data_t data; @@ -706,7 +712,7 @@ void rocketmq_test_only()//用来测试进程控制脚本 my_rocketmq_send(data); } -extern std::string G_MQCONSUMER_TOPIC_RC; + void rocketmq_test_rc() { Ckafka_data_t data; @@ -721,7 +727,7 @@ void rocketmq_test_rc() my_rocketmq_send(data); } -extern std::string G_MQCONSUMER_TOPIC_LOG; + void rocketmq_test_log() { Ckafka_data_t data; diff --git a/cfg_parse/cfg_parser.cpp b/cfg_parse/cfg_parser.cpp index 2e78283..79257d9 100644 --- a/cfg_parse/cfg_parser.cpp +++ b/cfg_parse/cfg_parser.cpp @@ -529,18 +529,18 @@ void init_config() { ba = settings.value("Oss/OssEndpoint", "").toString().toLatin1(); - OSS_ENDPOINT = strdup(ba.data()); + //OSS_ENDPOINT = strdup(ba.data()); ba = settings.value("Oss/AccessKeyID", "").toString().toLatin1(); - ACCESS_KEY_ID = strdup(ba.data()); + //ACCESS_KEY_ID = strdup(ba.data()); ba = settings.value("Oss/AccessKeySecret", "").toString().toLatin1(); - ACCESS_KEY_SECRET = strdup(ba.data()); + //ACCESS_KEY_SECRET = strdup(ba.data()); ba = settings.value("Oss/BucketName", "").toString().toLatin1(); - BUCKET_NAME = strdup(ba.data()); + //BUCKET_NAME = strdup(ba.data()); - qDebug() << "Read OSS_ENDPOINT:" << OSS_ENDPOINT << endl; - qDebug() << "Read ACCESS_KEY_ID:" << ACCESS_KEY_ID << endl; - qDebug() << "Read ACCESS_KEY_SECRET:" << ACCESS_KEY_SECRET << endl; - qDebug() << "Read BUCKET_NAME:" << BUCKET_NAME << endl; + //qDebug() << "Read OSS_ENDPOINT:" << OSS_ENDPOINT << endl; + //qDebug() << "Read ACCESS_KEY_ID:" << ACCESS_KEY_ID << endl; + //qDebug() << "Read ACCESS_KEY_SECRET:" << ACCESS_KEY_SECRET << endl; + //qDebug() << "Read BUCKET_NAME:" << BUCKET_NAME << endl; ba = settings.value("Kafka/brokerlist", "").toString().toLatin1(); BROKER_LIST = strdup(ba.data()); diff --git a/cfg_parse/oss_aliyun.cpp b/cfg_parse/oss_aliyun.cpp index 0c4268f..c8dc0a0 100644 --- a/cfg_parse/oss_aliyun.cpp +++ b/cfg_parse/oss_aliyun.cpp @@ -40,7 +40,7 @@ void get_object_to_file(); void get_object_to_file_new(char* File_Name, char* savepath); void delete_object(); void delete_object_new(char* File_Name); - +#if 0 void TestOSS() { apr_file_t *output = NULL; @@ -136,7 +136,7 @@ void DelOSS(char* File_Name) return; } - +#endif void coutTest() { std:: cout << "OSS_ENDPOINT:" << OSS_ENDPOINT << std::endl; diff --git a/json/save2json.cpp b/json/save2json.cpp index 6a6b7d5..32c2229 100644 --- a/json/save2json.cpp +++ b/json/save2json.cpp @@ -972,7 +972,7 @@ int parse_set(const std::string& json_str) { //进程号为0或者进程号匹配上 std::cout << "msg index:"<< index_value <<" self index:" << g_front_seg_index << std::endl; - DIY_INFOLOG("process","前置的%s%d号进程处理topic:%s_%s的进程控制消息",get_front_msg_from_subdir(), g_front_seg_index,FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_SET.c_str()); + DIY_INFOLOG("process","【NORMAL】前置的%s%d号进程处理topic:%s_%s的进程控制消息",get_front_msg_from_subdir(), g_front_seg_index,FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_SET.c_str()); if (code_str == "set_process") { @@ -998,7 +998,7 @@ int parse_set(const std::string& json_str) { } execute_bash(fun, processNum, frontType); - DIY_WARNLOG_CODE("process",LOG_CODE_PROCESS_CONTROL,"前置的%s%d号进程执行指令:%s,reset表示重启所有进程,add表示添加进程",get_front_msg_from_subdir(), g_front_seg_index,fun.c_str()); + DIY_WARNLOG_CODE("process",LOG_CODE_PROCESS_CONTROL,"【WARN】前置的%s%d号进程执行指令:%s,reset表示重启所有进程,add表示添加进程",get_front_msg_from_subdir(), g_front_seg_index,fun.c_str()); //脚本在3秒后执行 //回复消息 @@ -1020,7 +1020,7 @@ int parse_set(const std::string& json_str) { send_reply_to_kafka(guid,"1","收到删除进程指令,这个进程将会重启 "); //上送日志 - DIY_WARNLOG_CODE("process",LOG_CODE_PROCESS_CONTROL,"前置的%s%d号进程执行指令:%s,即将重启",get_front_msg_from_subdir(), g_front_seg_index,fun.c_str()); + DIY_WARNLOG_CODE("process",LOG_CODE_PROCESS_CONTROL,"【WARN】前置的%s%d号进程执行指令:%s,即将重启",get_front_msg_from_subdir(), g_front_seg_index,fun.c_str()); apr_sleep(apr_time_from_sec(10)); ::_exit(-1039); //进程退出 @@ -1061,7 +1061,7 @@ int parse_set(const std::string& json_str) { (proindex >= 10 && proindex < 100)){ //单连测试用的进程号应该大于10小于100 execute_bash_debug(fun, ip, frontType,proindex); - DIY_WARNLOG("process","前置的%s%d号进程执行指令:%s,start开启单连进程,delete杀死单连进程",get_front_msg_from_subdir(), g_front_seg_index,fun.c_str()); + DIY_WARNLOG("process","【WARN】前置的%s%d号进程执行指令:%s,start开启单连进程,delete杀死单连进程",get_front_msg_from_subdir(), g_front_seg_index,fun.c_str()); } else{ std::cout << "param is not executable" <type == cJSON_String) - std::strncpy(json_data.terminal_id, id->valuestring, sizeof(json_data.terminal_id) - 1); + ::strncpy(json_data.terminal_id, id->valuestring, sizeof(json_data.terminal_id) - 1); else - std::strncpy(json_data.terminal_id, "N/A", sizeof(json_data.terminal_id) - 1); + ::strncpy(json_data.terminal_id, "N/A", sizeof(json_data.terminal_id) - 1); cJSON* name = cJSON_GetObjectItem(item, "name"); // terminal_code if (name && name->type == cJSON_String) - std::strncpy(json_data.terminal_code, name->valuestring, sizeof(json_data.terminal_code) - 1); + ::strncpy(json_data.terminal_code, name->valuestring, sizeof(json_data.terminal_code) - 1); else - std::strncpy(json_data.terminal_code, "N/A", sizeof(json_data.terminal_code) - 1); + ::strncpy(json_data.terminal_code, "N/A", sizeof(json_data.terminal_code) - 1); cJSON* org_name = cJSON_GetObjectItem(item, "org_name"); // org_name if (org_name && org_name->type == cJSON_String) - std::strncpy(json_data.org_name, org_name->valuestring, sizeof(json_data.org_name) - 1); + ::strncpy(json_data.org_name, org_name->valuestring, sizeof(json_data.org_name) - 1); else - std::strncpy(json_data.org_name, "N/A", sizeof(json_data.org_name) - 1); + ::strncpy(json_data.org_name, "N/A", sizeof(json_data.org_name) - 1); cJSON* maint_name = cJSON_GetObjectItem(item, "maint_name"); // maint_name if (maint_name && maint_name->type == cJSON_String) - std::strncpy(json_data.maint_name, maint_name->valuestring, sizeof(json_data.maint_name) - 1); + ::strncpy(json_data.maint_name, maint_name->valuestring, sizeof(json_data.maint_name) - 1); else - std::strncpy(json_data.maint_name, "N/A", sizeof(json_data.maint_name) - 1); + ::strncpy(json_data.maint_name, "N/A", sizeof(json_data.maint_name) - 1); cJSON* station_name = cJSON_GetObjectItem(item, "stationName"); // station_name if (station_name && station_name->type == cJSON_String) - std::strncpy(json_data.station_name, station_name->valuestring, sizeof(json_data.station_name) - 1); + ::strncpy(json_data.station_name, station_name->valuestring, sizeof(json_data.station_name) - 1); else - std::strncpy(json_data.station_name, "N/A", sizeof(json_data.station_name) - 1); + ::strncpy(json_data.station_name, "N/A", sizeof(json_data.station_name) - 1); cJSON* manufacturer = cJSON_GetObjectItem(item, "manufacturer"); // tmnl_factory if (manufacturer && manufacturer->type == cJSON_String) - std::strncpy(json_data.tmnl_factory, manufacturer->valuestring, sizeof(json_data.tmnl_factory) - 1); + ::strncpy(json_data.tmnl_factory, manufacturer->valuestring, sizeof(json_data.tmnl_factory) - 1); else - std::strncpy(json_data.tmnl_factory, "N/A", sizeof(json_data.tmnl_factory) - 1); + ::strncpy(json_data.tmnl_factory, "N/A", sizeof(json_data.tmnl_factory) - 1); cJSON* status = cJSON_GetObjectItem(item, "status"); // tmnl_status if (status && status->type == cJSON_String) - std::strncpy(json_data.tmnl_status, status->valuestring, sizeof(json_data.tmnl_status) - 1); + ::strncpy(json_data.tmnl_status, status->valuestring, sizeof(json_data.tmnl_status) - 1); else - std::strncpy(json_data.tmnl_status, "N/A", sizeof(json_data.tmnl_status) - 1); + ::strncpy(json_data.tmnl_status, "N/A", sizeof(json_data.tmnl_status) - 1); cJSON* dev_type = cJSON_GetObjectItem(item, "devType"); // dev_type if (dev_type && dev_type->type == cJSON_String) - std::strncpy(json_data.dev_type, dev_type->valuestring, sizeof(json_data.dev_type) - 1); + ::strncpy(json_data.dev_type, dev_type->valuestring, sizeof(json_data.dev_type) - 1); else - std::strncpy(json_data.dev_type, "N/A", sizeof(json_data.dev_type) - 1); + ::strncpy(json_data.dev_type, "N/A", sizeof(json_data.dev_type) - 1); cJSON* dev_key = cJSON_GetObjectItem(item, "devKey"); // dev_key if (dev_key && dev_key->type == cJSON_String) - std::strncpy(json_data.dev_key, dev_key->valuestring, sizeof(json_data.dev_key) - 1); + ::strncpy(json_data.dev_key, dev_key->valuestring, sizeof(json_data.dev_key) - 1); else - std::strncpy(json_data.dev_key, "N/A", sizeof(json_data.dev_key) - 1); + ::strncpy(json_data.dev_key, "N/A", sizeof(json_data.dev_key) - 1); cJSON* dev_series = cJSON_GetObjectItem(item, "series"); // dev_series if (dev_series && dev_series->type == cJSON_String) - std::strncpy(json_data.dev_series, dev_series->valuestring, sizeof(json_data.dev_series) - 1); + ::strncpy(json_data.dev_series, dev_series->valuestring, sizeof(json_data.dev_series) - 1); else - std::strncpy(json_data.dev_series, "N/A", sizeof(json_data.dev_series) - 1); + ::strncpy(json_data.dev_series, "N/A", sizeof(json_data.dev_series) - 1); //lnk20250210台账进程号 cJSON* processNo = cJSON_GetObjectItem(item, "processNo"); // processNo转为字符串 @@ -1595,21 +1595,21 @@ int parse_control(const std::string& json_str, const std::string& output_dir) { cJSON* ip = cJSON_GetObjectItem(item, "ip"); // addr_str if (ip && ip->type == cJSON_String) - std::strncpy(json_data.addr_str, ip->valuestring, sizeof(json_data.addr_str) - 1); + ::strncpy(json_data.addr_str, ip->valuestring, sizeof(json_data.addr_str) - 1); else - std::strncpy(json_data.addr_str, "N/A", sizeof(json_data.addr_str) - 1); + ::strncpy(json_data.addr_str, "N/A", sizeof(json_data.addr_str) - 1); cJSON* port = cJSON_GetObjectItem(item, "port"); // port if (port && port->type == cJSON_String) - std::strncpy(json_data.port, port->valuestring, sizeof(json_data.port) - 1); + ::strncpy(json_data.port, port->valuestring, sizeof(json_data.port) - 1); else - std::strncpy(json_data.port, "N/A", sizeof(json_data.port) - 1); + ::strncpy(json_data.port, "N/A", sizeof(json_data.port) - 1); cJSON* updateTime = cJSON_GetObjectItem(item, "updateTime"); // timestamp if (updateTime && updateTime->type == cJSON_String) - std::strncpy(json_data.timestamp, updateTime->valuestring, sizeof(json_data.timestamp) - 1); + ::strncpy(json_data.timestamp, updateTime->valuestring, sizeof(json_data.timestamp) - 1); else - std::strncpy(json_data.timestamp, "N/A", sizeof(json_data.timestamp) - 1); + ::strncpy(json_data.timestamp, "N/A", sizeof(json_data.timestamp) - 1); // monitorData 解析，填充到 line 数组中 cJSON* monitorData = cJSON_GetObjectItem(item, "monitorData"); @@ -1622,44 +1622,44 @@ int parse_control(const std::string& json_str, const std::string& output_dir) { cJSON* monitor_id = cJSON_GetObjectItem(monitor_item, "id"); // monitor_id if (monitor_id && monitor_id->type == cJSON_String) - std::strncpy(monitor_data.monitor_id, monitor_id->valuestring, sizeof(monitor_data.monitor_id) - 1); + ::strncpy(monitor_data.monitor_id, monitor_id->valuestring, sizeof(monitor_data.monitor_id) - 1); else - std::strncpy(monitor_data.monitor_id, "N/A", sizeof(monitor_data.monitor_id) - 1); + ::strncpy(monitor_data.monitor_id, "N/A", sizeof(monitor_data.monitor_id) - 1); cJSON* monitor_name = cJSON_GetObjectItem(monitor_item, "name"); // monitor_name if (monitor_name && monitor_name->type == cJSON_String) - std::strncpy(monitor_data.monitor_name, monitor_name->valuestring, sizeof(monitor_data.monitor_name) - 1); + ::strncpy(monitor_data.monitor_name, monitor_name->valuestring, sizeof(monitor_data.monitor_name) - 1); else - std::strncpy(monitor_data.monitor_name, "N/A", sizeof(monitor_data.monitor_name) - 1); + ::strncpy(monitor_data.monitor_name, "N/A", sizeof(monitor_data.monitor_name) - 1); cJSON* voltage_level = cJSON_GetObjectItem(monitor_item, "voltageLevel"); // voltage_level if (voltage_level && voltage_level->type == cJSON_String) - std::strncpy(monitor_data.voltage_level, voltage_level->valuestring, sizeof(monitor_data.voltage_level) - 1); + ::strncpy(monitor_data.voltage_level, voltage_level->valuestring, sizeof(monitor_data.voltage_level) - 1); else - std::strncpy(monitor_data.voltage_level, "N/A", sizeof(monitor_data.voltage_level) - 1); + ::strncpy(monitor_data.voltage_level, "N/A", sizeof(monitor_data.voltage_level) - 1); cJSON* monitor_status = cJSON_GetObjectItem(monitor_item, "status"); // status if (monitor_status && monitor_status->type == cJSON_String) - std::strncpy(monitor_data.status, monitor_status->valuestring, sizeof(monitor_data.status) - 1); + ::strncpy(monitor_data.status, monitor_status->valuestring, sizeof(monitor_data.status) - 1); else - std::strncpy(monitor_data.status, "N/A", sizeof(monitor_data.status) - 1); + ::strncpy(monitor_data.status, "N/A", sizeof(monitor_data.status) - 1); cJSON* lineNo = cJSON_GetObjectItem(monitor_item, "lineNo"); // logical_device_seq if (lineNo && lineNo->type == cJSON_String) - std::strncpy(monitor_data.logical_device_seq, lineNo->valuestring, sizeof(monitor_data.logical_device_seq) - 1); + ::strncpy(monitor_data.logical_device_seq, lineNo->valuestring, sizeof(monitor_data.logical_device_seq) - 1); else - std::strncpy(monitor_data.logical_device_seq, "N/A", sizeof(monitor_data.logical_device_seq) - 1); + ::strncpy(monitor_data.logical_device_seq, "N/A", sizeof(monitor_data.logical_device_seq) - 1); cJSON* ptType = cJSON_GetObjectItem(monitor_item, "ptType"); // terminal_connect if (ptType && ptType->type == cJSON_String) - std::strncpy(monitor_data.terminal_connect, ptType->valuestring, sizeof(monitor_data.terminal_connect) - 1); + ::strncpy(monitor_data.terminal_connect, ptType->valuestring, sizeof(monitor_data.terminal_connect) - 1); else - std::strncpy(monitor_data.terminal_connect, "N/A", sizeof(monitor_data.terminal_connect) - 1); + ::strncpy(monitor_data.terminal_connect, "N/A", sizeof(monitor_data.terminal_connect) - 1); - std::strncpy(monitor_data.timestamp, json_data.timestamp, sizeof(monitor_data.timestamp) - 1); - std::strncpy(monitor_data.terminal_code, json_data.terminal_code, sizeof(monitor_data.terminal_code) - 1); + ::strncpy(monitor_data.timestamp, json_data.timestamp, sizeof(monitor_data.timestamp) - 1); + ::strncpy(monitor_data.terminal_code, json_data.terminal_code, sizeof(monitor_data.terminal_code) - 1); // 填充到 line 数组 json_data.line[j] = monitor_data; @@ -1701,7 +1701,7 @@ int parse_control(const std::string& json_str, const std::string& output_dir) { cJSON* id = cJSON_GetObjectItem(item, "id"); if (id != nullptr) { terminal json_data; - std::strncpy(json_data.terminal_id, cJSON_GetObjectItem(item, "id")->valuestring, sizeof(json_data.terminal_id) - 1); + ::strncpy(json_data.terminal_id, cJSON_GetObjectItem(item, "id")->valuestring, sizeof(json_data.terminal_id) - 1); // 准备 XML 内容并写入文件 std::string xmlContent = prepare_update(code_str, json_data,guid);//添加guid20250506 if(xmlContent != ""){ @@ -1777,7 +1777,7 @@ int myMessageCallbackrtdata(CPushConsumer* consumer, CMessageExt* msg) } else{ //记录日志 - DIY_INFOLOG("process","前置消费topic:%s_%s的实时触发消息",FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_RT.c_str()); + DIY_INFOLOG("process","【NORMAL】前置消费topic:%s_%s的实时触发消息",FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_RT.c_str()); // 处理消息（例如，打印消息内容） std::cout << "rt data Callback received message: " << body << std::endl; @@ -1796,7 +1796,7 @@ int myMessageCallbackrtdata(CPushConsumer* consumer, CMessageExt* msg) if (!parseJsonMessageRT(body, devid, line, realData, soeData, limit)) { std::cerr << "Failed to parse the JSON message." << std::endl; //记录日志 - DIY_ERRORLOG_CODE("process",LOG_CODE_RT_DATA,"前置消费topic:%s_%s的实时触发消息失败,消息的json格式不正确",FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_RT.c_str()); + DIY_ERRORLOG_CODE("process",LOG_CODE_RT_DATA,"【ERROR】前置消费topic:%s_%s的实时触发消息失败,消息的json格式不正确",FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_RT.c_str()); return E_RECONSUME_LATER; } @@ -1814,7 +1814,7 @@ int myMessageCallbackrtdata(CPushConsumer* consumer, CMessageExt* msg) } // 创建 XML 文件 if (!createXmlFile(dev_index, mp_index, realData, soeData, limit,"new")) { - DIY_ERRORLOG_CODE("process",LOG_CODE_RT_DATA,"前置无法创建实时数据触发文件"); + DIY_ERRORLOG_CODE("process",LOG_CODE_RT_DATA,"【ERROR】前置无法创建实时数据触发文件"); std::cerr << "Failed to create the XML file." << std::endl; return E_RECONSUME_LATER; } @@ -1855,7 +1855,7 @@ int myMessageCallbackupdate(CPushConsumer* consumer, CMessageExt* msg) //处理台账更新消息 std::string updatefilepath = "/home/pq/FeProject/etc/ledgerupdate"; if(parse_control(body,updatefilepath)){ - DIY_ERRORLOG_CODE("process",LOG_CODE_LEDGER_UPDATE,"前置的%s%d号进程处理topic:%s_%s的台账更新消息失败,消息的json结构不正确",get_front_msg_from_subdir(), g_front_seg_index,FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_UD.c_str()); + DIY_ERRORLOG_CODE("process",LOG_CODE_LEDGER_UPDATE,"【ERROR】前置的%s%d号进程处理topic:%s_%s的台账更新消息失败,消息的json结构不正确",get_front_msg_from_subdir(), g_front_seg_index,FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_UD.c_str()); } } @@ -1891,7 +1891,7 @@ int myMessageCallbackset(CPushConsumer* consumer, CMessageExt* msg) //处理进程更新消息 if(parse_set(body)){ - DIY_ERRORLOG_CODE("process",LOG_CODE_PROCESS_CONTROL,"前置的%s%d号进程处理topic:%s_%s的进程控制消息失败,消息的json结构不正确",get_front_msg_from_subdir(), g_front_seg_index,FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_SET.c_str()); + DIY_ERRORLOG_CODE("process",LOG_CODE_PROCESS_CONTROL,"【ERROR】前置的%s%d号进程处理topic:%s_%s的进程控制消息失败,消息的json结构不正确",get_front_msg_from_subdir(), g_front_seg_index,FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_SET.c_str()); } } @@ -1927,7 +1927,7 @@ int myMessageCallbacklog(CPushConsumer* consumer, CMessageExt* msg) //处理进程更新消息 if(parse_log(body)){ - DIY_ERRORLOG_CODE("process",LOG_CODE_LOG_REQUEST,"前置的%s%d号进程处理topic:%s_%s的日志上送消息失败,消息的json结构不正确",get_front_msg_from_subdir(), g_front_seg_index,FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_LOG.c_str()); + DIY_ERRORLOG_CODE("process",LOG_CODE_LOG_REQUEST,"【ERROR】前置的%s%d号进程处理topic:%s_%s的日志上送消息失败,消息的json结构不正确",get_front_msg_from_subdir(), g_front_seg_index,FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_LOG.c_str()); } } @@ -1976,7 +1976,7 @@ int myMessageCallbackrecall(CPushConsumer* consumer, CMessageExt* msg) } else{ std::cerr << "recall data is NULL." << std::endl; - DIY_ERRORLOG_CODE("process",LOG_CODE_RECALL,"前置的%s%d号进程处理topic:%s_%s的补招触发消息失败,消息的json结构不正确",get_front_msg_from_subdir(), g_front_seg_index,FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_RC.c_str()); + DIY_ERRORLOG_CODE("process",LOG_CODE_RECALL,"【ERROR】前置的%s%d号进程处理topic:%s_%s的补招触发消息失败,消息的json结构不正确",get_front_msg_from_subdir(), g_front_seg_index,FRONT_INST.c_str(),G_MQCONSUMER_TOPIC_RC.c_str()); } } diff --git a/mms/mms_process.c b/mms/mms_process.c index 1b5793c..2166cfd 100644 --- a/mms/mms_process.c +++ b/mms/mms_process.c @@ -2091,7 +2091,7 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info ) memset(oss_file_fullname_cfg, 0, sizeof(oss_file_fullname_cfg)); apr_snprintf(oss_file_fullname_cfg, sizeof(oss_file_fullname_cfg), "comtrade/wave/%s/%s", LD_info->mp_id, cfg_only_filename_ret); if (FILE_FLAG == 1) { - PutOSS(oss_file_fullname_cfg, loc_file_fullname_cfg);//使用buffer推送文件 + //PutOSS(oss_file_fullname_cfg, loc_file_fullname_cfg);//使用buffer推送文件 } else if (FILE_FLAG == 2) { OBSFile(loc_file_fullname_cfg, oss_file_fullname_cfg, "putObject");//这里并没有上传文件流 @@ -2129,7 +2129,7 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info ) memset(oss_file_fullname_dat, 0, sizeof(oss_file_fullname_dat)); apr_snprintf(oss_file_fullname_dat, sizeof(oss_file_fullname_dat), "comtrade/wave/%s/%s", LD_info->mp_id, dat_only_filename_ret); if (FILE_FLAG == 1) { - PutOSS(oss_file_fullname_dat, loc_file_fullname_dat);//使用buffer推送文件 + //PutOSS(oss_file_fullname_dat, loc_file_fullname_dat);//使用buffer推送文件 } else if (FILE_FLAG == 2) { OBSFile(loc_file_fullname_dat, oss_file_fullname_dat, "putObject");//这里并没有上传文件流