#IQRV #comment [Module] 优化非接计时为55s

CMakeSettings.json

@@ -6,23 +6,51 @@
       "configurationType": "Debug",
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "-D BUILD_TESTING=OFF",
+      "cmakeCommandArgs": "-D BUILD_TESTING=ON -D BUILD_DEVADAPTER=ON",
       "buildCommandArgs": "",
       "ctestCommandArgs": "-C Debug",
       "inheritEnvironments": [ "msvc_x86" ],
+      "variables": [
+        {
+          "name": "SIMULATE_ON",
+          "value": "False",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_DEVADAPTER",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "BUILD_SAMPLES",
+          "value": "False",
+          "type": "BOOL"
+        }
+      ]
+    },
+    {
+      "name": "x86-Release",
+      "generator": "Visual Studio 16 2019",
+      "configurationType": "Release",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "-D BUILD_TESTING=OFF",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "-C Release",
+      "inheritEnvironments": [ "msvc_x86" ],
       "variables": []
     },
     {
-      "name": "Linux-Debug",
+      "name": "ARM64-GCC-Debug",
       "generator": "Unix Makefiles",
       "configurationType": "Debug",
-      "cmakeExecutable": "/usr/bin/cmake",
+      "cmakeExecutable": "cmake",
       "remoteCopySourcesExclusionList": [ ".vs", ".git", "out" ],
-      "cmakeCommandArgs": "-D BUILD_TESTING=ON",
+      "cmakeCommandArgs": "-D BUILD_TESTING=ON -D WITH_CI_NUMBER=OFF -D SIMULATE_ON=OFF -D BUILD_DEVADAPTER=ON",
       "buildCommandArgs": "",
       "ctestCommandArgs": "--output-on-failure",
-      "inheritEnvironments": [ "linux_x64" ],
-      "remoteMachineName": "-1315925427;99.12.22.125 (username=pcacc, port=22, authentication=Password)",
+      "inheritEnvironments": [ "linux_arm" ],
+      "remoteMachineName": "-2043786594;192.168.31.142 (username=liaogf, 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}",
@@ -40,28 +68,23 @@
       ]
     },
     {
-      "name": "x86-Release",
-      "generator": "Visual Studio 16 2019",
-      "configurationType": "Release",
-      "buildRoot": "${projectDir}\\out\\build\\${name}",
-      "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "-D BUILD_TESTING=OFF",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "-C Release",
-      "inheritEnvironments": [ "msvc_x86" ],
-      "variables": []
-    },
-    {
-      "name": "Linux-Release",
+      "name": "ARM64-GCC-Release",
       "generator": "Unix Makefiles",
       "configurationType": "Release",
-      "cmakeExecutable": "/usr/bin/cmake",
+      "cmakeExecutable": "cmake",
       "remoteCopySourcesExclusionList": [ ".vs", ".git", "out" ],
       "cmakeCommandArgs": "-D BUILD_TESTING=ON",
       "buildCommandArgs": "",
       "ctestCommandArgs": "--output-on-failure",
-      "inheritEnvironments": [ "linux_x64" ],
-      "remoteMachineName": "-627321627;192.168.1.171 (username=pcacc, port=2223, authentication=Password)",
+      "inheritEnvironments": [ "linux_arm" ],
+      "variables": [
+        {
+          "name": "SIMULATE_ON",
+          "value": "False",
+          "type": "BOOL"
+        }
+      ],
+      "remoteMachineName": "-2043786594;192.168.31.142 (username=liaogf, 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}",
@@ -69,8 +92,7 @@
       "rsyncCommandArgs": "-t --delete --delete-excluded --exclude \"/build\" --exclude \"/out\" --exclude-from=.gitignore",
       "remoteCopyBuildOutput": false,
       "remoteCopySourcesMethod": "rsync",
-      "addressSanitizerRuntimeFlags": "detect_leaks=0",
-      "variables": []
+      "addressSanitizerRuntimeFlags": "detect_leaks=0"
     }
   ]
 }

Module/mod_CardReadAdapter/mod_CardReadAdapter.vcxproj

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{85A123FF-4160-4587-B565-589E3F9EE07F}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>mod_CardReadAdapter</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <Import Project="..\modmake.setting" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_CARDREADADAPTER_EXPORTS;_CRT_RAND_S;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\Common;$(DevHeadPath);$(ModuleCommonHeadPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(FrameworkLib)\SpBase.lib;</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-    	<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>    
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_CARDREADADAPTER_EXPORTS;_CRT_RAND_S;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\Common;$(DevHeadPath);$(ModuleCommonHeadPath);$(ThirdPartyHeadRoot)\openssl-1.0.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\DeviceAdapter\DevInc\CardAssist.cpp" />
-    <ClCompile Include="$(FrameworkHeadRoot)\Common\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="CardReadAdapterFSM.cpp" />
-    <ClCompile Include="mod_CardReadAdapter.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\common\stdafx.h" />
-    <ClInclude Include="..\..\DeviceAdapter\DevInc\CardAssist.h" />
-    <ClInclude Include="CardReadAdapterFSM.h" />
-    <ClInclude Include="CardReadAdapter_client_g.h" />
-    <ClInclude Include="CardReadAdapter_def_g.h" />
-    <ClInclude Include="CardReadAdapter_msg_g.h" />
-    <ClInclude Include="CardReadAdapter_server_g.h" />
-    <ClInclude Include="mod_CardReadAdapter.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\Version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Module/mod_CardReadAdapter/mod_CardReadAdapter.vcxproj.filters

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="源文件">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="头文件">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="资源文件">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="CardReadAdapter_client_g.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="CardReadAdapter_def_g.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="CardReadAdapter_msg_g.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="CardReadAdapter_server_g.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="CardReadAdapterFSM.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="mod_CardReadAdapter.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\LR04_RvcFramework_应用库\LR04_RvcFramework_应用库\Include\Common\stdafx.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="CardReadAdapterFSM.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="mod_CardReadAdapter.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\LR04_RvcFramework_应用库\LR04_RvcFramework_应用库\Include\Common\stdafx.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -5,6 +5,7 @@
 #include "ModuleMix.h"
 #include "ContactlessCard_UserErrorCode.h"
 #include "CommDevEntityErrorCode.h"
+#include <winpr/sysinfo.h>
 
 using namespace SP::Module::Comm;
 
@@ -14,7 +15,7 @@ const int MAX_RESET_TIMEROUT = 5000;
 const int WAIT_TRY_NUM = 120;
 const int WAIT_INTERVAL = 500;
 const int ACCEPT_TRY_INTERVAL = 500;
-const int ACCEPT_TRY_NUM = 110;
+const int ACCEPT_TRY_NUM = 110; // 500*110=55 seconds
 const int READ_TRY_NUM = 1;//oiltest
 const int INIT_TRY_NUM = 3;
 
@@ -649,7 +650,6 @@ int CContactlessCardFSM::Initial()
 
 bool CContactlessCardFSM::GetDevStatus()
 {
-    //LOG_FUNCTION();
     int getDevInfoCount = 0;
     ErrorCodeEnum err;
     do {
@@ -657,20 +657,21 @@ bool CContactlessCardFSM::GetDevStatus()
         if (Error_Succeed == err)
             return true;
         else {
-            DevErrorInfo devErrInfo;
-            m_hDevHelper->GetLastErr(devErrInfo);
-            Dbg("GetDevStatus:[%s]", devErrInfo.szErrMsg);
+            LOG_RF_ERROR_MSG_MACRO(err, GetDevStatus);
             getDevInfoCount++;
             SLEEP(3000);
         }
     } while (getDevInfoCount < GET_DEV_STATUS_COUNT);
+
     Dbg("getdevstatus to reset");
     err = m_hDevHelper->Reset();
     SLEEP(MAX_RESET_TIMEROUT);
     if (err == Error_Succeed) {
         err = m_hDevHelper->GetDevStatus(devStatus);
         if (err == Error_Succeed && devStatus.eMediaPos == CI_MEDIA_PRESENT) {
+
         }
+
     }
     return false;
 }
@@ -699,7 +700,8 @@ int CContactlessCardFSM::InternalAcceptCard()
     int acceptTries = 0, err = 0;
 
     m_bWaitingAccept = true;
-    //if (Error_Succeed == hr){
+    DWORD dwBeginTime = GetTickCount();
+
     do {
         if (m_bExit) {
             m_bCancelAccept = true;
@@ -712,9 +714,11 @@ int CContactlessCardFSM::InternalAcceptCard()
         if (m_bWaitAccepteMore) {
             acceptTries = 0;
             m_bWaitAccepteMore = false;
+            dwBeginTime = GetTickCount();
         }
+
         if (GetDevStatus()) {
-            Dbg("oiltest %d", devStatus.eMediaPos);
+            Dbg("GetDevStatus %d, %d", devStatus.eMediaPos, acceptTries);
             if (devStatus.eMediaPos == CI_MEDIA_RF) {
                 LogEvent(Severity_Middle, LOG_EVT_CONTACTLESS_CARD_OP, "Contactless card op.");
                 acceptTries = 0;
@@ -723,13 +727,19 @@ int CContactlessCardFSM::InternalAcceptCard()
                 acceptTries++;
                 SLEEP(ACCEPT_TRY_INTERVAL);
             }
+
         } else {
+
             err = 1;
             goto Err;
         }
-    } while (acceptTries < ACCEPT_TRY_NUM);
+
+    } while (GetTickCount() - dwBeginTime <= 55 * 1000);
+
     err = 2;
+
 Err:
+
     m_bExit = false;
     m_bWaitingAccept = false;
 
@@ -737,7 +747,6 @@ Err:
         if (GetDevStatus()) {
             if (devStatus.eMediaPos == CI_MEDIA_PRESENT) {
                 err = 4;
-
                 Dbg("cancel eject......");
             }
         } else

Module/mod_selfchecker/mod_selfchecker.vcxproj

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9E67FBD1-8E39-4836-85AA-B758881AF646}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>mod_selfchecker</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <Import Project="..\modmake.setting" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_SELFCHECKER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\Common;$(ModuleCommonHeadPath);$(ThirdPartyHeadRoot)\tinyxml2;</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(FrameworkLib)\spbase.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-    	<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>    
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_SELFCHECKER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\Common;$(ModuleCommonHeadPath)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(FrameworkLib)\spbase.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(FrameworkHeadRoot)\Common\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="tinyxml2.cpp" />
-    <ClCompile Include="mod_selfchecker.cpp" />
-    <ClCompile Include="SelfCheckerFSM.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(FrameworkHeadRoot)\Common\stdafx.h" />
-    <ClInclude Include="tinyxml2.h" />
-    <ClInclude Include="mod_selfchecker.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="SelfCheckerFSM.h" />
-    <ClInclude Include="SelfChecker_def_g.h" />
-    <ClInclude Include="SelfChecker_server_g.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\Version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Module/mod_selfchecker/mod_selfchecker.vcxproj.filters

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_selfchecker.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SelfCheckerFSM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Framework\Common\stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="mod_selfchecker.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SelfCheckerFSM.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Framework\Common\stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

README.md

@@ -15,20 +15,20 @@
 
 * SCP 拷贝版本指定机器
 	* keba
-`scp -r /home/liaogf/Run/version/0.0.3.1 keba@99.12.22.141:/opt/run/version`
+`scp -r /home/liaogf/Run/version/0.0.3.1 keba@99.12.22.141:/opt/Run/version`
 	* gwi
-`scp -r /home/liaogf/Run/version/0.0.3.1 gwi@99.12.22.142:/opt/run/version`
+`scp -r /home/liaogf/Run/version/0.0.3.1 gwi@99.12.22.142:/opt/Run/version`
 	* grg
-`scp -r /home/liaogf/Run/version/0.0.3.1 grg@99.12.22.143:/opt/run/version`
+`scp -r /home/liaogf/Run/version/0.0.3.1 grg@99.12.22.143:/opt/Run/version`
 	* hengyin
-`scp -r /home/liaogf/Run/version/0.0.3.1 vtm@99.12.22.144:/opt/run/version`
+`scp -r /home/liaogf/Run/version/0.0.3.1 vtm@99.12.22.144:/opt/Run/version`
 	* nantian
-`scp -r /home/liaogf/Run/version/0.0.3.1 uos@99.12.22.145:/opt/run/version`
+`scp -r /home/liaogf/Run/version/0.0.3.1 uos@99.12.22.145:/opt/Run/version`
 
 	* kebao(杭州)
-`scp -r /home/liaogf/Run/version/0.0.3.1 keba@99.6.130.2:/opt/run/version`
+`scp -r /home/liaogf/Run/version/0.0.3.1 keba@99.6.130.2:/opt/Run/version`
 
-`scp -r /home/liaogf/run vtm@99.12.22.144:/opt/`
+`scp -r /home/liaogf/Run vtm@99.12.22.144:/opt/`
 
 	* keba
 	keba@99.12.22.141