From 7c4de0e3c4bc6f75421eb953005fd4ae0c552d37 Mon Sep 17 00:00:00 2001
From: 贺靖淳 <2350307839@qq.com>
Date: 星期二, 02 九月 2025 19:42:43 +0800
Subject: [PATCH] merge branch 'master' of ssh://115.28.86.8:29418/~admin/FaceLink_AI_250820

---
 /dev/null                           |   46 ----------------------------------------------
 Client/王斌强/log/~$_王斌强_20250902.doc  |    0 
 Server/贾逸菲/log/日志_贾逸菲_2025年9月2日.doc |    0 
 Client/王斌强/log/日志_王斌强_20250902.doc  |    0 
 4 files changed, 0 insertions(+), 46 deletions(-)

diff --git "a/Client/\347\216\213\346\226\214\345\274\272/log/~$_\347\216\213\346\226\214\345\274\272_20250902.doc" "b/Client/\347\216\213\346\226\214\345\274\272/log/~$_\347\216\213\346\226\214\345\274\272_20250902.doc"
new file mode 100644
index 0000000..a5c476b
--- /dev/null
+++ "b/Client/\347\216\213\346\226\214\345\274\272/log/~$_\347\216\213\346\226\214\345\274\272_20250902.doc"
Binary files differ
diff --git "a/Client/\347\216\213\346\226\214\345\274\272/log/\346\227\245\345\277\227_\347\216\213\346\226\214\345\274\272_20250902.doc" "b/Client/\347\216\213\346\226\214\345\274\272/log/\346\227\245\345\277\227_\347\216\213\346\226\214\345\274\272_20250902.doc"
new file mode 100644
index 0000000..30b4243
--- /dev/null
+++ "b/Client/\347\216\213\346\226\214\345\274\272/log/\346\227\245\345\277\227_\347\216\213\346\226\214\345\274\272_20250902.doc"
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/.vs/aiface_db/v14/.suo" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/.vs/aiface_db/v14/.suo"
deleted file mode 100644
index 87bdc5e..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/.vs/aiface_db/v14/.suo"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/Debug/aiface_db.exe" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/Debug/aiface_db.exe"
deleted file mode 100644
index e7d220c..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/Debug/aiface_db.exe"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/Debug/aiface_db.ilk" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/Debug/aiface_db.ilk"
deleted file mode 100644
index b29a7e2..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/Debug/aiface_db.ilk"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/Debug/aiface_db.pdb" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/Debug/aiface_db.pdb"
deleted file mode 100644
index d7d50a4..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/Debug/aiface_db.pdb"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db.VC.db" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db.VC.db"
deleted file mode 100644
index b6056f0..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db.VC.db"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db.sln" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db.sln"
deleted file mode 100644
index 681be61..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db.sln"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘�
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aiface_db", "aiface_db\aiface_db.vcxproj", "{B8ED0248-599E-4C25-A778-E1D45E1A4C9A}"
-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
-		{B8ED0248-599E-4C25-A778-E1D45E1A4C9A}.Debug|x64.ActiveCfg = Debug|x64
-		{B8ED0248-599E-4C25-A778-E1D45E1A4C9A}.Debug|x64.Build.0 = Debug|x64
-		{B8ED0248-599E-4C25-A778-E1D45E1A4C9A}.Debug|x86.ActiveCfg = Debug|Win32
-		{B8ED0248-599E-4C25-A778-E1D45E1A4C9A}.Debug|x86.Build.0 = Debug|Win32
-		{B8ED0248-599E-4C25-A778-E1D45E1A4C9A}.Release|x64.ActiveCfg = Release|x64
-		{B8ED0248-599E-4C25-A778-E1D45E1A4C9A}.Release|x64.Build.0 = Release|x64
-		{B8ED0248-599E-4C25-A778-E1D45E1A4C9A}.Release|x86.ActiveCfg = Release|Win32
-		{B8ED0248-599E-4C25-A778-E1D45E1A4C9A}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.log" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.log"
deleted file mode 100644
index f4283df..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.log"
+++ /dev/null
@@ -1,2 +0,0 @@
-锘�  mysql_conn.cpp
-g:\ai_face\facelink_ai_250820\server\璐鹃�歌彶\code\aiface_db\aiface_db\mysql_conn.h(3): fatal error C1083: 鏃犳硶鎵撳紑鍖呮嫭鏂囦欢: 鈥渕ysql.h鈥�: No such file or directory
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/CL.command.1.tlog" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/CL.command.1.tlog"
deleted file mode 100644
index 1af7fef..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/CL.command.1.tlog"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/CL.read.1.tlog" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/CL.read.1.tlog"
deleted file mode 100644
index 4a5e3a4..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/CL.read.1.tlog"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/CL.write.1.tlog" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/CL.write.1.tlog"
deleted file mode 100644
index 5871106..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/CL.write.1.tlog"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/aiface_db.lastbuildstate" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/aiface_db.lastbuildstate"
deleted file mode 100644
index ad8375d..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/aiface_db.lastbuildstate"
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v140:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
-Debug|Win32|G:\ai_face\FaceLink_AI_250820\Server\璐鹃�歌彶\code\aiface_db\|
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/link.command.1.tlog" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/link.command.1.tlog"
deleted file mode 100644
index 60dad9e..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/link.command.1.tlog"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/link.read.1.tlog" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/link.read.1.tlog"
deleted file mode 100644
index 783fea1..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/link.read.1.tlog"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/link.write.1.tlog" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/link.write.1.tlog"
deleted file mode 100644
index bc68744..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/link.write.1.tlog"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/unsuccessfulbuild" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/unsuccessfulbuild"
deleted file mode 100644
index e69de29..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/aiface_db.tlog/unsuccessfulbuild"
+++ /dev/null
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/main.obj" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/main.obj"
deleted file mode 100644
index dd1a886..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/main.obj"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/vc140.idb" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/vc140.idb"
deleted file mode 100644
index 21a02bf..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/vc140.idb"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/vc140.pdb" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/vc140.pdb"
deleted file mode 100644
index cb8c210..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/Debug/vc140.pdb"
+++ /dev/null
Binary files differ
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/aiface_db.vcxproj" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/aiface_db.vcxproj"
deleted file mode 100644
index 8cf8da0..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/aiface_db.vcxproj"
+++ /dev/null
@@ -1,127 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.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>
-    <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">
-    <ProjectGuid>{B8ED0248-599E-4C25-A778-E1D45E1A4C9A}</ProjectGuid>
-    <RootNamespace>aiface_db</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</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" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>D:\Program Files\MySQL\MySQL Server 8.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>D:\Program Files\MySQL\MySQL Server 8.0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="mysql_conn.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="mysql_conn.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/aiface_db.vcxproj.filters" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/aiface_db.vcxproj.filters"
deleted file mode 100644
index c6bd7f3..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/aiface_db.vcxproj.filters"
+++ /dev/null
@@ -1,30 +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>
-    <ClCompile Include="main.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-    <ClCompile Include="mysql_conn.cpp">
-      <Filter>婧愭枃浠�</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="mysql_conn.h">
-      <Filter>澶存枃浠�</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/main.cpp" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/main.cpp"
deleted file mode 100644
index 710308c..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/main.cpp"
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <iostream>
-
-int main() {
-	std::cout << "hello world" << std::endl;
-	int input;
-	std::cin >> input;
-	if (input == 88) {
-		return 0;
-	}
-	
-	
-}
\ No newline at end of file
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/mysql_conn.cpp" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/mysql_conn.cpp"
deleted file mode 100644
index 136d2bc..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/mysql_conn.cpp"
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "mysql_conn.h"
-
-
-//构造函数,初始化连接句柄
-mysql_conn::mysql_conn():conn_(nullptr), conneted_(false)
-{
-	//初始化MYSQL连接对象
-	conn_ = mysql_init(nullptr); 
-	//初始化失败,保持未连接状态
-	if (conn_ == nullptr) {
-
-	}
-}
-
-
-mysql_conn::~mysql_conn()
-{
-	//关闭连接
-	disconnect();
-
-}
-
-//断开连接
-void mysql_conn::disconnect()
-{
-	if (conn_ != nullptr) {
-		mysql_close(conn_);
-		conn_ = nullptr;
-	}
-	conneted_ = false;
-
-}
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/mysql_conn.h" "b/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/mysql_conn.h"
deleted file mode 100644
index a9130d0..0000000
--- "a/Server/\350\264\276\351\200\270\350\217\262/code/aiface_db/aiface_db/mysql_conn.h"
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-#ifndef MYSQL_CONN_H
-#define MYSQL_CONN_H
-#endif 
-
-#include <mysql.h>
-#include <string>
-
-/*
-
-c++11中的有作用域枚举,与传统枚举相比
-1.枚举值必须通过枚举类型名访问(EnumName::Value)
-2.不能自动转换为整数类型,需要显式转换
-
-
-//enum class ConnectStatus {  
-//	SUCCESS,  //连接成功
-//	INIT_FAILED,   //初始化失败
-//	CONNECT_FAILED //连接失败
-//};
-//ConnectStatus mysql_conn(const std::string& host,
-//	const std::string& user,
-//	const std::string& password,
-//	const std::string& dbname,
-//	unsigned int port,
-//	MYSQL*& conn);
-
-*/
-
-class mysql_conn
-{
-private:
-	MYSQL * conn_; //数据库连接句柄
-	bool conneted_;  //连接状态标识
-	
-public:
-	//构造函数,初始化连接对象
-	mysql_conn();
-	//析构函数 自动释放连接资源
-	~mysql_conn();
-
-	//断开连接
-	void disconnect();
-};
-
-
diff --git "a/Server/\350\264\276\351\200\270\350\217\262/log/\346\227\245\345\277\227_\350\264\276\351\200\270\350\217\262_2025\345\271\2649\346\234\2102\346\227\245.doc" "b/Server/\350\264\276\351\200\270\350\217\262/log/\346\227\245\345\277\227_\350\264\276\351\200\270\350\217\262_2025\345\271\2649\346\234\2102\346\227\245.doc"
new file mode 100644
index 0000000..455f843
--- /dev/null
+++ "b/Server/\350\264\276\351\200\270\350\217\262/log/\346\227\245\345\277\227_\350\264\276\351\200\270\350\217\262_2025\345\271\2649\346\234\2102\346\227\245.doc"
Binary files differ

--
Gitblit v1.8.0