Merge branch 'master' of ssh://115.28.86.8:29418/~admin/InduSmartControl4.0

dyf

2025-04-28 1eced828c945f15117026aac3147117227bab6b2

Merge branch 'master' of ssh://115.28.86.8:29418/~admin/InduSmartControl4.0

 Client/¼Ò½­ÌÎ/document/ÈÕÖ¾²éѯ-ÐèÇó·ÖÎö.docx

Binary files differ

 Client/ÕżÑð©/document/´æ·ÅÎĵµ.txt

 Client/ÕżÑð©/document/ÐèÇó·ÖÎö.pdf

Binary files differ

 Client/ÀîçæÐÀ/document/~$¿â´æ¹ÜÀíÐèÇóÎĵµ.docx

Binary files differ

 Client/ÀîçæÐÀ/document/Éú²ú¿â´æ¹ÜÀíÐèÇóÎĵµ.docx

Binary files differ

 Client/ÍõÍ®/document/ÀúÊ·²éѯģ¿éÐèÇó·ÖÎö.docx

Binary files differ

 Client/ÍõÐñ¿­/document/ÐèÇó·ÖÎö.docx

Binary files differ

 Client/ÌïÒË¿É/document/¿Í»§¶ËÉ豸¹ÜÀíºÍÉú²ú¼Æ»®¹ÜÀíÏîÄ¿ÐèÇóÎĵµ.docx

Binary files differ

 Client/ÖÖì÷Ðù/document/ϵͳÉèÖÃ___ÐèÇó·ÖÎö.docx

Binary files differ

 Client/ĪÀ­¼ÓÌØ/document/¿Í»§¶Ë¾¯±¨Ä£¿éÏîÄ¿ÐèÇó·ÖÎöÎĵµ.docx

Binary files differ

 Client/·×Óƽ/document/¶©µ¥¹ÜÀí.docx

Binary files differ

 Server/ºî¶«³½/document/socketÍøÂç´î½¨Ä£¿éÏîÄ¿ÐèÇóÎĵµ.docx

Binary files differ

 Server/ºî¶«³½/document/socketÍøÂç´î½¨Ä£¿éÏîÄ¿ÐèÇóÎĵµ1.2.docx

Binary files differ

 Server/ÉêöÎ/code/ISC4_server_project/.vs/ISC4_server_project/FileContentIndex/d064e075-675b-4899-9574-ba89437afedf.vsidx

Binary files differ

 Server/ÉêöÎ/code/ISC4_server_project/.vs/ISC4_server_project/v17/.suo

Binary files differ

 Server/ÉêöÎ/code/ISC4_server_project/.vs/ISC4_server_project/v17/Browse.VC.db

Binary files differ

 Server/ÉêöÎ/code/ISC4_server_project/.vs/ISC4_server_project/v17/DocumentLayout.json

New file
@@ -0,0 +1,43 @@
{
  "Version": 1,
  "WorkspaceRootPath": "E:\\InduSmartControl4.0\\Server\\\u7533\u946B\\code\\ISC4_server_project\\",
  "Documents": [],
  "DocumentGroupContainers": [
    {
      "Orientation": 0,
      "VerticalTabListWidth": 256,
      "DocumentGroups": [
        {
          "DockedWidth": 200,
          "SelectedChildIndex": -1,
          "Children": [
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            }
          ]
        }
      ]
    }
  ]
}

 Server/ÉêöÎ/code/ISC4_server_project/ISC4_server_project.sln

New file
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.11.35327.3
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ISC4_server_project", "ISC4_server_project.vcxproj", "{9A230C46-DD69-4E5A-8C02-BE90E472334D}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|x64 = Debug|x64
        Debug|x86 = Debug|x86
        Release|x64 = Release|x64
        Release|x86 = Release|x86
    EndGlobalSection
    GlobalSection(ProjectConfigurationPlatforms) = postSolution
        {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Debug|x64.ActiveCfg = Debug|x64
        {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Debug|x64.Build.0 = Debug|x64
        {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Debug|x86.ActiveCfg = Debug|Win32
        {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Debug|x86.Build.0 = Debug|Win32
        {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Release|x64.ActiveCfg = Release|x64
        {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Release|x64.Build.0 = Release|x64
        {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Release|x86.ActiveCfg = Release|Win32
        {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Release|x86.Build.0 = Release|Win32
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE
    EndGlobalSection
    GlobalSection(ExtensibilityGlobals) = postSolution
        SolutionGuid = {C69D9E5E-B521-46AB-8F35-A76D4C5F2E7E}
    EndGlobalSection
EndGlobal

 Server/ÉêöÎ/code/ISC4_server_project/ISC4_server_project.vcxproj

New file
@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" 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>
    <ProjectConfiguration Include="Debug|x64">
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|x64">
      <Configuration>Release</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>

  </ItemGroup>
  <PropertyGroup Label="Globals">
    <VCProjectVersion>17.0</VCProjectVersion>
    <Keyword>Win32Proj</Keyword>
    <ProjectGuid>{9a230c46-dd69-4e5a-8c02-be90e472334d}</ProjectGuid>
    <RootNamespace>ISC4serverproject</RootNamespace>
    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="Shared" >
  </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>
    <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
      <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|x64'">
      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    </ImportGroup>

  <PropertyGroup Label="UserMacros" />

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>

  <ItemGroup></ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
</Project>

 Server/ÉêöÎ/code/ISC4_server_project/ISC4_server_project.vcxproj.filters

New file
@@ -0,0 +1,17 @@
<?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;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
    </Filter>
    <Filter Include="头文件">
      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;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>
</Project>

 Server/ÉêöÎ/code/ISC4_server_project/ISC4_server_project.vcxproj.user

New file
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup />
</Project>

 Server/ÉêöÎ/document/SQL·â×°µÄÐèÇó·ÖÎö.docx

Binary files differ

 Server/ÉêöÎ/document/ºî¶«³½/socketÍøÂç´î½¨Ä£¿éÏîÄ¿ÐèÇóÎĵµ.docx

Binary files differ

 Server/ÉêöÎ/document/ÉêöÎ/SQL·â×°µÄÐèÇó·ÖÎö.docx

Binary files differ

 Server/ÉêöÎ/document/ÕÔ¹úΰ/·þÎñ¶ËÈÕÖ¾·â×°Éú³É£¬ÐèÇó·ÖÎöÎĵµ ÒªÇó.docx

Binary files differ

 Server/ÉêöÎ/document/κÐËÓî/·þÎñ¶ËÅäÖùÜÀíÄ£¿éÐèÇó·ÖÎö.docx

Binary files differ

 Server/³ÂËÉ/document/PCB°å×Ó³§ÖÇÄÜ»¯·þÎñ¶Ë°æ±¾¹ÜÀí.docx

Binary files differ

 Server/κÐËÓî/document/·þÎñ¶ËÅäÖùÜÀíÄ£¿éÐèÇó·ÖÎö.docx

Binary files differ