diff --git a/json/save2json.cpp b/json/save2json.cpp index 2a7a18a..ff81adc 100644 --- a/json/save2json.cpp +++ b/json/save2json.cpp @@ -366,7 +366,7 @@ void my_rocketmq_send(Ckafka_data_t& data) rocketmq_producer_send(senddata.c_str(), topic.c_str());//lnk20250623修复偶发性doublefree } - +#if 0 void my_kafka_send(Ckafka_data_t& data) { #ifdef __GNUC__ @@ -457,6 +457,7 @@ void my_kafka_send(Ckafka_data_t& data) printf("\nFailed kafka send, monitor_id:[%s] topic:[%s]\n", key.c_str(), topic.c_str()); } +#endif void my_datahub_send(Ckafka_data_t& data) { @@ -510,7 +511,7 @@ void my_datahub_send(Ckafka_data_t& data) add_sng_log(data.strText.toAscii().data()); } - DataHub_Send_Datahub(const_cast(topic.c_str()), const_cast(senddata.c_str())); + //DataHub_Send_Datahub(const_cast(topic.c_str()), const_cast(senddata.c_str())); printf("\ndatahub send, monitor_id:[%s] topic:[%s] Success\n", key.c_str(), topic.c_str()); } @@ -544,11 +545,11 @@ void KafkaSendThread::run() QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz").toAscii().data()); if (SEND_FLAG == 1) //kafka推送 { - my_kafka_send(data); + //my_kafka_send(data); } else if (SEND_FLAG == 2)//datahub推送 { - my_datahub_send(data); + //my_datahub_send(data); } else if (SEND_FLAG == 3)//rocketmq推送lnk10-11 { diff --git a/mms/db_interface.h b/mms/db_interface.h index d60fc95..3e1d6f7 100644 --- a/mms/db_interface.h +++ b/mms/db_interface.h @@ -111,10 +111,10 @@ void TestJson(char* szJson); //void DelOSS(char* File_Name); void delete_object_new(char* File_Name); void coutTest();//CZY 2023-09-11 test -void TestOBS();//WW 20230921 测试华为云服务器 -void OBSFile(char* localpath, char* cloudpath,const char* code); -void OBSFile_del(char* cloudpath, const char* code); -void DataHub_Send_Datahub(char* topic, char* data);//datahub通讯 +//void TestOBS();//WW 20230921 测试华为云服务器 +//void OBSFile(char* localpath, char* cloudpath,const char* code); +//void OBSFile_del(char* cloudpath, const char* code); +//void DataHub_Send_Datahub(char* topic, char* data);//datahub通讯 void Nacos_GetParam(char* postgres_uid, char* postgres_pwd, char* web_clientid, char* web_clientsecret);//nacos void Nacos_GetParam_Ptr(const char* code, char** ptr); void Read_Nacos_Param_Postgres(char** database_ip, char** database_port, char** postgres_database, char** postgres_username, char** postgres_password, char** postgres_schema, char** postgres_dnsname, char** postgres_tableprefix); diff --git a/mms/mms_process.c b/mms/mms_process.c index ae31a01..0c992c4 100644 --- a/mms/mms_process.c +++ b/mms/mms_process.c @@ -2103,10 +2103,10 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info ) //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");//这里并没有上传文件流 + //OBSFile(loc_file_fullname_cfg, oss_file_fullname_cfg, "putObject");//这里并没有上传文件流 } else if(FILE_FLAG==3){ - WebAPI_Uds_Upload(UDS_UPLOAD_URL, loc_file_fullname_cfg, uuid_cfg, filename_cfg);//通过form-data上传文件 + //WebAPI_Uds_Upload(UDS_UPLOAD_URL, loc_file_fullname_cfg, uuid_cfg, filename_cfg);//通过form-data上传文件 } //LNK20241031使用JSON编码文件上传-具体的远端路径可以用原本代码的硬编码或者在配置文件中获取 else if (FILE_FLAG == 4) { @@ -2141,10 +2141,10 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info ) //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");//这里并没有上传文件流 + //OBSFile(loc_file_fullname_dat, oss_file_fullname_dat, "putObject");//这里并没有上传文件流 } else if(FILE_FLAG==3){ - WebAPI_Uds_Upload(UDS_UPLOAD_URL, loc_file_fullname_dat, uuid_dat, filename_dat);//通过form-data上传文件 + //WebAPI_Uds_Upload(UDS_UPLOAD_URL, loc_file_fullname_dat, uuid_dat, filename_dat);//通过form-data上传文件 } //LNK20241031使用JSON编码文件上传-具体的远端路径可以用原本代码的硬编码或者在配置文件中获取 else if (FILE_FLAG == 4) {