#IQRV #comment [Merge] 合并良瑜的新master版本

CMakeLists.txt

@@ -284,7 +284,7 @@ if(CONAN_CACHE_CLEAR)
 	conan_local_remove()
 endif(CONAN_CACHE_CLEAR)
 
-conan_cmake_run(REQUIRES RvcFramework/1.0.8-dev18@LR04.02_FrameworkLib/testing
+conan_cmake_run(REQUIRES RvcFramework/1.2.0.7@LR04.02_FrameworkLib/dev
 	Audio/2023.0509.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
 include(DependencyConanFiles)

Module/mod_DeviceControl/mod_DeviceControl.cpp

@@ -599,11 +599,6 @@ std::pair<ErrorCodeEnum, CSimpleStringA> CDeviceControlEntity::__ReadCenterConfi
         CSmartPointer<IConfigInfo> pConfigShell;
         GetFunction()->OpenConfig(Config_Shell, pConfigShell);
         CSimpleStringA section("CenterSettingsDownloadUrl");
-#ifdef DEVOPS_ON_ST /*DevOps流水线编译，ST环境*/
-        section.Append("_ST");
-#elif defined(DEVOPS_ON_UAT)/*DevOps流水线编译，UAT环境*/
-        section.Append("_UAT");
-#endif
         pConfigShell->ReadConfigValue(section, "LAN", str);
         if (Error_Succeed != err && !str.IsNullOrEmpty()) {
             err = Error_Succeed;

Module/mod_guiconsole/mod_GuiConsole.h

@@ -37,7 +37,9 @@ public:
 	virtual CServerSessionBase *OnNewSession(const char* /*pszRemoteEntityName*/, const char * /*pszParam*/);
 	virtual void OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,const LogTypeEnum eLogType, const SeverityLevelEnum eLevel,
 		const DWORD dwSysError,const DWORD dwUserCode,const DWORD dwEntityInstanceID, const WORD wEntityDevelID, 
-		const CAutoArray<DWORD> &Param, const char *pszEntityName, const char *pszModuleName,const char *pszMessage, const linkContext& pLinkInfo);
+		const CAutoArray<DWORD> &Param, const char *pszEntityName, const char *pszModuleName,const char *pszMessage, const linkContext &pLinkInfo);
+
+	void printCfg();
 	
 	void OnTimeout(DWORD dwTimerID);
 

addin/cfg/env.ini

@@ -0,0 +1,2 @@
+[MicroServiceURL]
+env=ST