同步arm修改

This commit is contained in:
lnk
2026-04-03 16:03:25 +08:00
parent 6f7ee762ec
commit c78bc592a8
4 changed files with 22 additions and 18 deletions

View File

@@ -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;

View File

@@ -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());