!2 update CmptId、CmptName、serviceUnitId、deployUnitId to new serviceUnitId

DevAdapter/self/dep/liblog4vendor/liblog4vendor/log4upload.cpp

@@ -193,8 +193,8 @@ bool upload_helper::initialize(const cmb::log_init_config& cfg)
         pinst_log_producer_config_set_send_thread_count(config, 2);
         pinst_log_producer_config_set_persistent_max_log_count(config, 50 * 1000);
         pinst_log_producer_config_set_skyeye_servname(config, (char*)"Terminal");
-        pinst_log_producer_config_set_skyeye_cmptId(config, (char*)"LR04");
-        pinst_log_producer_config_set_skyeye_cmptname(config, (char*)"FrameworkLib");
+        pinst_log_producer_config_set_skyeye_cmptId(config, (char*)SpDefine::cmptId);
+        pinst_log_producer_config_set_skyeye_cmptname(config, (char*)SpDefine::CmptName);
         pinst_log_producer_config_set_skyeye_version(config, (char*)"1.0");
         pinst_log_producer_config_set_persistent(config, 1);
 
@@ -215,11 +215,11 @@ bool upload_helper::initialize(const cmb::log_init_config& cfg)
 #endif
 
         //мÓͳһÈÕÖ¾ÅäÖÃ
-        pinst_log_producer_config_set_united_appname(config, (char*)"LR04");
+        pinst_log_producer_config_set_united_appname(config, (char*)SpDefine::cmptId);
         pinst_log_producer_config_set_united_version(config, (char*)"2.0");
         pinst_log_producer_config_set_united_needArchived(config, 0);
-        pinst_log_producer_config_set_united_deployUnitId(config, (char*)"LR04.02@FrameworkLib_PRD_PRD");
-        pinst_log_producer_config_set_united_serviceUnitId(config, (char*)"LR04.02_FrameworkLib");
+        pinst_log_producer_config_set_united_deployUnitId(config, (char*)SpDefine::deployUnitId);
+        pinst_log_producer_config_set_united_serviceUnitId(config, (char*)SpDefine::serviceUnitId);
 
         _client = pinst_create_log_producer_client(config, NULL, NULL);
         res = (_client != nullptr);

DevAdapter/self/dep/liblog4vendor/liblog4vendor/log4upload.h

@@ -6,6 +6,7 @@
 #include <stdint.h>
 #include "log4vendor.h"
 #include "log_define.h"
+#include "SpDefine.h"
 
 #if defined(_MSC_VER)
 

Framework/Common/SpDefine.h

@@ -42,10 +42,10 @@ public:
 	static constexpr const char* topicVTMWeb = "LR18_23_VTMWebSDKUserLog";
 
 	//const log params
-	static constexpr const char* cmptId = "LR04";
-	static constexpr const char* CmptName = "FrameworkLib";
-	static constexpr const char* deployUnitId = "LR04.02@FrameworkLib_PRD_PRD";
-	static constexpr const char* serviceUnitId = "LR04.02_FrameworkLib";
+	static constexpr const char* cmptId = "LR04.02";
+	static constexpr const char* CmptName = "RVCTerminalPlus";
+	static constexpr const char* deployUnitId = "LR04.02_RVCTerminalPlus";
+	static constexpr const char* serviceUnitId = "LR04.02@RVCTerminalPlus_PRD_PRD";
 
 
 };

Framework/spbase/sp_logwithlink.cpp

@@ -24,6 +24,7 @@
 #include <winpr/file.h>
 #include <winpr/wlog.h>
 #include "sp_httpDefine.h"
+#include "SpDefine.h"
 #include <mutex>
 #define TAG SPBASE_TAG("sp_logwithlink")
 
@@ -639,11 +640,11 @@ SPBASE_API void* create_log_producer_storage(CSimpleStringA entityName, CSimpleS
     if(CmptId.GetLength() > 0)
         log_producer_config_set_skyeye_cmptId(config, (char*)CmptId.GetData());
     else
-        log_producer_config_set_skyeye_cmptId(config, (char*)"LR04");
+        log_producer_config_set_skyeye_cmptId(config, (char*)SpDefine::cmptId);
     if(CmptName.GetLength() > 0)
         log_producer_config_set_skyeye_cmptname(config, (char*)CmptName.GetData());
     else
-        log_producer_config_set_skyeye_cmptname(config, (char*)"FrameworkLib");
+        log_producer_config_set_skyeye_cmptname(config, (char*)SpDefine::CmptName);
     log_producer_config_set_skyeye_version(config, (char*)"1.0");
     log_producer_config_set_persistent(config, 1);
 
@@ -680,11 +681,11 @@ SPBASE_API void* create_log_producer_storage(CSimpleStringA entityName, CSimpleS
     }
 
     //新加统一日志配置
-    log_producer_config_set_united_appname(config, (char*)"LR04");
+    log_producer_config_set_united_appname(config, (char*)SpDefine::cmptId);
     log_producer_config_set_united_version(config, (char*)"2.0");
     log_producer_config_set_united_needArchived(config, 0);
-    log_producer_config_set_united_deployUnitId(config, (char*)"LR04.02_FrameworkLib");
-    log_producer_config_set_united_serviceUnitId(config, (char*)"LR04.02@FrameworkLib_PRD_PRD");
+    log_producer_config_set_united_deployUnitId(config, (char*)SpDefine::deployUnitId);
+    log_producer_config_set_united_serviceUnitId(config, (char*)SpDefine::serviceUnitId);
 
 #ifndef _WIN32
     //log_producer_config_set_dbgFun(logCallback);
@@ -736,8 +737,8 @@ SPBASE_API void* create_log_producer_send(CSimpleStringA endpoint, CSimpleString
     log_producer_config_set_send_thread_count(config, 1);
     log_producer_config_set_persistent_max_log_count(config, 20 * 1000);
     log_producer_config_set_skyeye_servname(config, (char*)"Terminal");
-    log_producer_config_set_skyeye_cmptId(config, (char*)"LR04");
-    log_producer_config_set_skyeye_cmptname(config, (char*)"FrameworkLib");
+    log_producer_config_set_skyeye_cmptId(config, (char*)SpDefine::cmptId);
+    log_producer_config_set_skyeye_cmptname(config, (char*)SpDefine::CmptName);
     log_producer_config_set_skyeye_version(config, (char*)"1.0");
     log_producer_config_set_persistent(config, 1);
     log_producer_config_set_openDb(config, 1);
@@ -771,11 +772,11 @@ SPBASE_API void* create_log_producer_send(CSimpleStringA endpoint, CSimpleString
     }
 
     //新加统一日志配置
-    log_producer_config_set_united_appname(config, (char*)"LR04");
+    log_producer_config_set_united_appname(config, (char*)SpDefine::cmptId);
     log_producer_config_set_united_version(config, (char*)"2.0");
     log_producer_config_set_united_needArchived(config, 0);
-    log_producer_config_set_united_deployUnitId(config, (char*)"LR04.02_FrameworkLib");
-    log_producer_config_set_united_serviceUnitId(config, (char*)"LR04.02@FrameworkLib_PRD_PRD");
+    log_producer_config_set_united_deployUnitId(config, (char*)SpDefine::deployUnitId);
+    log_producer_config_set_united_serviceUnitId(config, (char*)SpDefine::serviceUnitId);
     log_producer_config_set_enable_guard(config, 1);
 
 #ifndef _WIN32

Other/liblog4rvcother/log4upload.cpp

@@ -1,5 +1,6 @@
 #include "log4upload.h"
 #include "log4rvcother.h"
+#include "SpDefine.h"
 #include <algorithm>
 #include <string>
 #include <cctype>
@@ -193,8 +194,8 @@ bool upload_helper::initialize(const cmb::log_init_config& cfg)
         pinst_log_producer_config_set_send_thread_count(config, 1);
         pinst_log_producer_config_set_persistent_max_log_count(config, 50 * 1000);
         pinst_log_producer_config_set_skyeye_servname(config, (char*)"Terminal");
-        pinst_log_producer_config_set_skyeye_cmptId(config, (char*)"LR04");
-        pinst_log_producer_config_set_skyeye_cmptname(config, (char*)"FrameworkLib");
+        pinst_log_producer_config_set_skyeye_cmptId(config, (char*)SpDefine::cmptId);
+        pinst_log_producer_config_set_skyeye_cmptname(config, (char*)SpDefine::CmptName);
         pinst_log_producer_config_set_skyeye_version(config, (char*)"1.0");
         pinst_log_producer_config_set_persistent(config, 1);
 
@@ -215,11 +216,11 @@ bool upload_helper::initialize(const cmb::log_init_config& cfg)
 #endif
 
         //新加统一日志配置
-        pinst_log_producer_config_set_united_appname(config, (char*)"LR04");
+        pinst_log_producer_config_set_united_appname(config, (char*)SpDefine::cmptId);
         pinst_log_producer_config_set_united_version(config, (char*)"2.0");
         pinst_log_producer_config_set_united_needArchived(config, 0);
-        pinst_log_producer_config_set_united_deployUnitId(config, (char*)"LR04.02@FrameworkLib_PRD_PRD");
-        pinst_log_producer_config_set_united_serviceUnitId(config, (char*)"LR04.02_FrameworkLib");
+        pinst_log_producer_config_set_united_deployUnitId(config, (char*)SpDefine::deployUnitId);
+        pinst_log_producer_config_set_united_serviceUnitId(config, (char*)SpDefine::serviceUnitId);
 
         _client = pinst_create_log_producer_client(config, NULL, NULL);
         res = (_client != nullptr);

Other/liblog4vendor/log4upload.cpp

@@ -1,5 +1,6 @@
 #include "log4upload.h"
 #include "log4vendor.h"
+#include "SpDefine.h"
 #include <algorithm>
 #include <string>
 #include <cctype>
@@ -193,8 +194,8 @@ bool upload_helper::initialize(const cmb::log_init_config& cfg)
         pinst_log_producer_config_set_send_thread_count(config, 1);
         pinst_log_producer_config_set_persistent_max_log_count(config, 50 * 1000);
         pinst_log_producer_config_set_skyeye_servname(config, (char*)"Terminal");
-        pinst_log_producer_config_set_skyeye_cmptId(config, (char*)"LR04");
-        pinst_log_producer_config_set_skyeye_cmptname(config, (char*)"FrameworkLib");
+        pinst_log_producer_config_set_skyeye_cmptId(config, (char*)SpDefine::cmptId);
+        pinst_log_producer_config_set_skyeye_cmptname(config, (char*)SpDefine::CmptName);
         pinst_log_producer_config_set_skyeye_version(config, (char*)"1.0");
         pinst_log_producer_config_set_persistent(config, 1);
 
@@ -215,11 +216,11 @@ bool upload_helper::initialize(const cmb::log_init_config& cfg)
 #endif
 
         //新加统一日志配置
-        pinst_log_producer_config_set_united_appname(config, (char*)"LR04");
+        pinst_log_producer_config_set_united_appname(config, (char*)SpDefine::cmptId);
         pinst_log_producer_config_set_united_version(config, (char*)"2.0");
         pinst_log_producer_config_set_united_needArchived(config, 0);
-        pinst_log_producer_config_set_united_deployUnitId(config, (char*)"LR04.02@FrameworkLib_PRD_PRD");
-        pinst_log_producer_config_set_united_serviceUnitId(config, (char*)"LR04.02_FrameworkLib");
+        pinst_log_producer_config_set_united_deployUnitId(config, (char*)SpDefine::deployUnitId);
+        pinst_log_producer_config_set_united_serviceUnitId(config, (char*)SpDefine::serviceUnitId);
 
         _client = pinst_create_log_producer_client(config, NULL, NULL);
         res = (_client != nullptr);