Z991239-1057 #comment other:临时提交编译脚本

CMakeLists.txt

@@ -394,7 +394,7 @@ else()
 
 endif(SIMULATE_ON)#end simulate
 
-add_subdirectory(Other)
+#add_subdirectory(Other)
 add_subdirectory(Module)
 #add_subdirectory(DevAdapter)
 

CMakeSettings.json

@@ -22,7 +22,7 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "--output-on-failure",
       "inheritEnvironments": [ "linux_x64" ],
-      "remoteMachineName": "-530210665;10.42.0.1 (username=root, port=1022, authentication=Password)",
+      "remoteMachineName": "-1872074873;99.12.23.77 (username=leizm, port=22, authentication=Password)",
       "remoteCMakeListsRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/src",
       "remoteBuildRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/out/build/${name}",
       "remoteInstallRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/out/install/${name}",
@@ -31,7 +31,13 @@
       "remoteCopyBuildOutput": false,
       "remoteCopySourcesMethod": "rsync",
       "addressSanitizerRuntimeFlags": "detect_leaks=0",
-      "variables": []
+      "variables": [
+        {
+          "name": "SIMULATE_ON",
+          "value": "False",
+          "type": "BOOL"
+        }
+      ]
     },
     {
       "name": "x86-Release",
@@ -55,7 +61,7 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "--output-on-failure",
       "inheritEnvironments": [ "linux_x64" ],
-      "remoteMachineName": "-530210665;10.42.0.1 (username=root, port=1022, authentication=Password)",
+      "remoteMachineName": "-1872074873;99.12.23.77 (username=leizm, port=22, authentication=Password)",
       "remoteCMakeListsRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/src",
       "remoteBuildRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/out/build/${name}",
       "remoteInstallRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/out/install/${name}",

Module/CMakeLists.txt

@@ -141,7 +141,9 @@ set(MODULE_CONAN_DEP_LIBS)
 # ±éÀúʵÌå
  file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
 
- add_subdirectory(mod_Initializer)
+ #add_subdirectory(mod_Initializer)
+ add_subdirectory(mod_accessauth)
+ #add_subdirectory(mod_validityVertifier)
 #foreach(dir ${all_valid_subdirs})
 # 	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
 # 		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})

Other/CMakeLists.txt

@@ -8,6 +8,6 @@ foreach(dir ${all_valid_subdirs})
 	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
 		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
 		message(STATUS "Adding other component ${dir_trimmed}")
-		add_subdirectory(${dir_trimmed})
+		#add_subdirectory(${dir_trimmed})
 	endif()
 endforeach(dir)

addin/cfg/CenterSetting.LAN.ini

@@ -1,10 +1,10 @@
 [CenterSetting]
-Server=99.12.98.156 6024
-Server_Backup=99.12.98.156 6024
+Server=99.12.98.157 6024
+Server_Backup=99.12.98.157 6024
 
 [AccessAuthorization]
-Server=99.12.98.156 6031
-Server_Backup=99.12.98.156 6031
+Server=99.12.98.157 6031
+Server_Backup=99.12.98.157 6031
 CheckMD5=0
 
 [LivenessDetection]
@@ -15,8 +15,8 @@ LeastActiveShowTime=5
 SendInfoInterval=1000
 
 [Alarm]
-Server=99.12.98.156 6025
-Server_Backup=99.12.98.156 6025
+Server=99.12.98.157 6025
+Server_Backup=99.12.98.157 6025
 DealWarningTime=1
 
 [CounterConnector]
@@ -76,16 +76,16 @@ keba=Trace
 All=Info
 
 [CustMngrAuth]
-Server=99.12.98.156 6640 
-Server_Backup=99.12.98.156 6640 
+Server=99.12.98.157 6640 
+Server_Backup=99.12.98.157 6640 
 
 [Download]
-Server=99.12.98.156 6027
-Server_Backup=99.12.98.156 6027
+Server=99.12.98.157 6027
+Server_Backup=99.12.98.157 6027
 
 [GUIConsole]
-Server=99.12.98.156 6036
-Server_Backup=99.12.98.156 6036
+Server=99.12.98.157 6036
+Server_Backup=99.12.98.157 6036
 
 
 
@@ -106,23 +106,23 @@ UserMgrUrlNoSidebar=http://99.6.136.67/RVC.Desk2S.Web/UserMgrNoSideBar
 UserMgrUrlFulture=http://99.12.74.90/RVC.H5.Web
 
 [HeartBeat]
-Server=99.12.98.156 6032
-Server_Backup=99.12.98.156 6032
+Server=99.12.98.157 6032
+Server_Backup=99.12.98.157 6032
 
 [HolderContext]
-Server=99.12.98.156 6030
-Server_Backup=99.12.98.156 6030
+Server=99.12.98.157 6030
+Server_Backup=99.12.98.157 6030
 
 [Initializer]
-Server=99.12.98.156 6031
-Server_Backup=99.12.98.156 6031
+Server=99.12.98.157 6031
+Server_Backup=99.12.98.157 6031
 SubBankNo=0755
 BranchNo=001
 SupportUkey=0
 
 [MaintainWatcher]
-Server=99.12.98.156 6043
-Server_Backup=99.12.98.156 6043
+Server=99.12.98.157 6043
+Server_Backup=99.12.98.157 6043
 CheckTerMinalNo=0
 CheckMaintainTask=0
 Verify_BlackList=1
@@ -140,26 +140,26 @@ PaperWidth_2=210
 PaperHeight_2=297
 
 [localmediaplay]
-Server=99.12.98.156 8796
-Server_Backup=99.12.98.156 8796
+Server=99.12.98.157 8796
+Server_Backup=99.12.98.157 8796
 
 [RemoteController]
-Server=99.12.98.156 6033
-Server_Backup=99.12.98.156 6033
+Server=99.12.98.157 6033
+Server_Backup=99.12.98.157 6033
 
 [UpgradeManager]
-Server=99.12.98.156 6034
-Server_Backup=99.12.98.156 6034
+Server=99.12.98.157 6034
+Server_Backup=99.12.98.157 6034
 
 
 [Upload]
-Server=99.12.98.156 6026
-Server_Backup=99.12.98.156 6026
+Server=99.12.98.157 6026
+Server_Backup=99.12.98.157 6026
 
 
 [UpLog]
-Server=99.12.98.156 1045
-Server_Backup=99.12.98.156 1045
+Server=99.12.98.157 1045
+Server_Backup=99.12.98.157 1045
 SendMode=1
 BranchSendLog=1
 TerminalList=
@@ -175,20 +175,20 @@ TermLimitSwitch=OFF
 ;Sites-RVC.Desk2S=http://99.12.74.9/RVC.Web;http://99.1.100.217/RVC.YZX.Web
 ;Sites-RVC.CardStore=http://99.12.74.9/RVC.Web;http://99.1.100.217/RVC.YZX.Web
 [MachineBridge]
-Server=99.12.98.156 6037
-Server_Backup=99.12.98.156 6037
+Server=99.12.98.157 6037
+Server_Backup=99.12.98.157 6037
 
 [MobileDial]
-Server=99.12.98.156 6032 
-Server_Backup=99.12.98.156 6032 
+Server=99.12.98.157 6032 
+Server_Backup=99.12.98.157 6032 
 
 [InteractiveControl]
 SurveillanceRecordAllowed=1
 SalesRecordPriorityEws=0
 
 [LocalMediaPlay]
-Server=99.12.98.156 8796
-Server_Backup=99.12.98.156 8796
+Server=99.12.98.157 8796
+Server_Backup=99.12.98.157 8796
 
 [SpBase]
 DualActive=1
@@ -200,27 +200,27 @@ NotCheckUpdateServer=1
 ReportErrMsg=1
 
 [SurveillanceRecorder]
-Server=99.12.98.156 6028
-Server_Backup=99.12.98.156 6028
+Server=99.12.98.157 6028
+Server_Backup=99.12.98.157 6028
 AutoMode=0
 MaxDiskPercent=99
 SecondBranchAllowed=1
 SecondBranchParams=771|0
 
 [Recorder]
-Server=99.12.98.156 6028
-Server_Backup=99.12.98.156 6028
+Server=99.12.98.157 6028
+Server_Backup=99.12.98.157 6028
 MaxDiskPercent=95
 
 [Main]
-LastServer=99.12.98.156 6024
+LastServer=99.12.98.157 6024
 SyncTime=0x23D4886D
 SyncHash=c171c6e76b43f5d0b9e4e7d43406909e
 SyncFile=CenterSetting.LAN.ini
 
 [SalesRecorder]
-Server=99.12.98.156 6028
-Server_Backup=99.12.98.156 6028
+Server=99.12.98.157 6028
+Server_Backup=99.12.98.157 6028
 MaxDiskPercent=95
 AudioSampleRate=8
 AudioBitRate=128