#IQBX #comment [CMake] 内容优化

CMakeLists.txt

@@ -207,15 +207,6 @@ endif(BUILD_SHARED_LIBS)
 
 set(RVC_COMPANY "China Merchants Bank" CACHE STRING "China Merchants Bank Corporation")
 set(RVC_PRODUCT "VTM")
-if(DEVOPS_ON_CMAKE_ST)
-	set(RVC_PRODUCT "VTM-ST")
-endif(DEVOPS_ON_CMAKE_ST)
-if(DEVOPS_ON_CMAKE_UAT)
-	set(RVC_PRODUCT "VTM-UAT")
-endif(DEVOPS_ON_CMAKE_UAT)
-if(DEVOPS_ON_CMAKE_DEV)
-	set(RVC_PRODUCT "VTM-DEV")
-endif(DEVOPS_ON_CMAKE_DEV)
 set(RVC_AUTHOR "CCDG")
 set(RVC_COPYRIGHT "Copyright (C) ${BUILD_YEAR}")
 set(RVC_DESCRIPTION "${BUILD_YEAR}.${BUILD_MONTH}")

Module/mod_healthmanager/mod_healthmanager.cpp

@@ -2871,16 +2871,6 @@ void CHealthManagerEntity::DeployTerminal(SpReqAnsContext<HealthManagerService_D
 
 			} else if (ctx->Req.param1 == 1) { //走总行服务
 
-				/** 考虑到测试环境数据不准确，这里加一个开关跳过 [Gifur@2023421]*/
-				bool criticialCheck(true);
-#ifndef DEVOPS_ON_PRD
-                CSmartPointer<IConfigInfo> spConfigShell;
-                GetFunction()->OpenConfig(Config_Shell, spConfigShell);
-				int nValue(0);
-				spConfigShell->ReadConfigValueInt("InstallProc", "SkipTerminalInfoCheck", nValue);
-				if (!!nValue) criticialCheck = false;
-#endif // !DEVOPS_ON_PRD
-
 				fHeadOfficeMode = true;
 				HttpClientRequestConfig config(serverIP.GetData());
 				HttpClientResponseResult result;
@@ -2994,6 +2984,18 @@ void CHealthManagerEntity::DeployTerminal(SpReqAnsContext<HealthManagerService_D
 						} else {
 
 							bool bMatched(true);
+                            /** 考虑到测试环境数据不准确，这里加一个开关跳过 [Gifur@2023421]*/
+                            bool criticialCheck(true);
+#ifndef DEVOPS_ON_PRD
+                            CSmartPointer<IConfigInfo> spConfigShell;
+                            GetFunction()->OpenConfig(Config_Shell, spConfigShell);
+                            int nValue(0);
+                            spConfigShell->ReadConfigValueInt("InstallProc", "SkipTerminalInfoCheck", nValue);
+							if (!!nValue) {
+								criticialCheck = false;
+								DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Skip terminal info check task!!");
+							}
+#endif // !DEVOPS_ON_PRD
 
 							if (criticialCheck) {
                                 if (strTerminalType.Compare(terminalRegistInfo.machineType.c_str()) != 0) {

addin/cmake/debian.cmake

@@ -1,7 +1,16 @@
 set(CPACK_GENERATOR "DEB")	
 set(CPACK_DEBIAN_PACKAGE_NAME ${RVC_PRODUCT})
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64")# dpkg --print-architecture
-set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${RVC_COMPANY} ${RVC_COPYRIGHT})
+set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${RVC_COMPANY} ${RVC_COPYRIGHT}")
+if(DEVOPS_ON_CMAKE_ST)
+	set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${RVC_COMPANY} ${RVC_COPYRIGHT} ST°æ±¾")
+elseif(DEVOPS_ON_CMAKE_UAT)
+	set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${RVC_COMPANY} ${RVC_COPYRIGHT} UAT°æ±¾")
+elseif(DEVOPS_ON_CMAKE_DEV)
+	set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${RVC_COMPANY} ${RVC_COPYRIGHT} DEV°æ±¾")
+elseif(NOT DEVOPS_ON_CMAKE_PRD)
+	set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${RVC_COMPANY} ${RVC_COPYRIGHT} ·ÇDevOps°æ±¾")
+endif(DEVOPS_ON_CMAKE_ST)
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${RVC_COMPANY})
 set(CPACK_PACKAGE_CONTACT ${RVC_AUTHOR})
 
@@ -9,9 +18,10 @@ set(CPACK_DEBIAN_ARCHIVE_TYPE "gnutar")
 set(CPACK_DEBIAN_PACAKGE_SECTION "utils")
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
 
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtkglext1 (>= 1.2.0-9), org.deepin.browser (>= 5.3.52-1)")
+# set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtkglext1 (>= 1.2.0-9), org.deepin.browser (>= 5.3.52-1)")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtkglext1 (>= 1.2.0-9)")
 
- install(CODE "execute_process(COMMAND 'chmod 0777 ${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/*')")
+install(CODE "execute_process(COMMAND 'chmod 0777 ${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/*')")
 #var/lib/dpkg/info
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
   # ${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/conffiles