x86 and arm use same code

cfg_parse/SimpleProducer.cpp

@@ -46,14 +46,18 @@ 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
 }
 #endif
@@ -649,7 +653,7 @@ void producer_send(const char* strbody)
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 extern "C" {
-extern std::string G_MQCONSUMER_TOPIC_RT;
+//extern std::string G_MQCONSUMER_TOPIC_RT;
 void rocketmq_test_rt()
 {
     Ckafka_data_t data;
@@ -663,7 +667,7 @@ void rocketmq_test_rt()
     data.mp_id = 123123;
     my_rocketmq_send(data);
 }
-extern std::string G_MQCONSUMER_TOPIC_UD;
+//extern std::string G_MQCONSUMER_TOPIC_UD;
 void rocketmq_test_ud()//用来测试台账更新
 {
     Ckafka_data_t data;
@@ -706,7 +710,7 @@ void rocketmq_test_only()//用来测试进程控制脚本
     my_rocketmq_send(data);
 }
 
-extern std::string G_MQCONSUMER_TOPIC_RC;
+//extern std::string G_MQCONSUMER_TOPIC_RC;
 void rocketmq_test_rc()
 {
     Ckafka_data_t data;
@@ -721,7 +725,7 @@ void rocketmq_test_rc()
     my_rocketmq_send(data);
 }
 
-extern std::string G_MQCONSUMER_TOPIC_LOG;
+//extern std::string G_MQCONSUMER_TOPIC_LOG;
 void rocketmq_test_log()
 {
     Ckafka_data_t data;

cfg_parse/cfg_parser.cpp

@@ -540,7 +540,7 @@ void init_config() {
 	qDebug() << "Read POSTGRES_DNSNAME:" << POSTGRES_DNSNAME << endl;
 	qDebug() << "Read POSTGRES_TABLEPREFIX:" << POSTGRES_TABLEPREFIX << endl;
 
-
+/*
 	ba = settings.value("Oss/OssEndpoint", "").toString().toLatin1();
 	OSS_ENDPOINT = strdup(ba.data());
 	ba = settings.value("Oss/AccessKeyID", "").toString().toLatin1();
@@ -549,11 +549,11 @@ void init_config() {
 	ACCESS_KEY_SECRET = strdup(ba.data());
 	ba = settings.value("Oss/BucketName", "").toString().toLatin1();
 	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;
+*/
 
 	ba = settings.value("Kafka/brokerlist", "").toString().toLatin1();
 	BROKER_LIST = strdup(ba.data());

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<char*>(topic.c_str()), const_cast<char*>(senddata.c_str()));
+	//DataHub_Send_Datahub(const_cast<char*>(topic.c_str()), const_cast<char*>(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
 			{

mms/db_interface.h

@@ -45,10 +45,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
-extern	char* OSS_ENDPOINT;
-extern	char* ACCESS_KEY_ID;
-extern	char* ACCESS_KEY_SECRET;
-extern	char* BUCKET_NAME;
+//extern	char* OSS_ENDPOINT;
+//extern	char* ACCESS_KEY_ID;
+//extern	char* ACCESS_KEY_SECRET;
+//extern	char* BUCKET_NAME;
 
 extern char* POSTGRES_SCHEMA;
 extern char* POSTGRES_TABLEPREFIX;
@@ -105,16 +105,16 @@ void TestToken();
 void TestBodyPost();//WW 测试qt post
 void TestSMSPost();//WW 测试qt post
 void TestJson(char* szJson);
-void TestOSS();//WW 测试
-void PutOSS(char* File_Name, char* data); //zw修改 2023-9-7 上送oss文件
-void GetOSS(char* File_Name, char* savepath); //zw修改 2023-9-7 获取oss文件
-void DelOSS(char* File_Name);
+//void TestOSS();//WW 测试
+//void PutOSS(char* File_Name, char* data); //zw修改 2023-9-7 上送oss文件
+//void GetOSS(char* File_Name, char* savepath); //zw修改 2023-9-7 获取oss文件
+//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);

mms/mms_process.c

@@ -2100,13 +2100,13 @@ 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");//这里并没有上传文件流
+							 //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) {
@@ -2138,13 +2138,13 @@ 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");//这里并没有上传文件流
+							 //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) {