添加子模块，项目更名

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "Extern/asio"]
+	path = Extern/asio
+	url = https://github.com/chriskohlhoff/asio.git
+[submodule "Extern/NatsuLib"]
+	path = Extern/NatsuLib
+	url = https://github.com/akemimadoka/NatsuLib.git

Extern/NatsuLib

@@ -0,0 +1 @@
+Subproject commit 8a309e2f50247cac023883adb696e94651aa4cd7

Extern/asio

@@ -0,0 +1 @@
+Subproject commit b0926b61b057ce563241d609cae5768ed3a4e1b1

QQBot.Test/CryptographyTest.cpp → YumeBot.Test/CryptographyTest.cpp

@@ -1,7 +1,7 @@
 #include "pch.h"
 #include <catch.hpp>
 
-using namespace QQBot;
+using namespace YumeBot;
 
 TEST_CASE("Cryptography", "[Utility][Cryptography]")
 {

QQBot.Test/QQBot.Test.vcxproj → YumeBot.Test/YumeBot.Test.vcxproj

@@ -22,7 +22,7 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{81338DEA-3569-459E-9D73-609BC779B598}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>QQBotTest</RootNamespace>
+    <RootNamespace>YumeBotTest</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -72,15 +72,23 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>bin/$(Platform)/$(Configuration)</OutDir>
+    <IntDir>obj/$(Platform)/$(Configuration)</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>bin/$(Platform)/$(Configuration)</OutDir>
+    <IntDir>obj/$(Platform)/$(Configuration)</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>bin/$(Platform)/$(Configuration)</OutDir>
+    <IntDir>obj/$(Platform)/$(Configuration)</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>bin/$(Platform)/$(Configuration)</OutDir>
+    <IntDir>obj/$(Platform)/$(Configuration)</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -91,7 +99,7 @@
       <PreprocessorDefinitions>NOMINMAX;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(SolutionDir)QQBot;$(SolutionDir)Extern\NatsuLib\NatsuLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)YumeBot;$(SolutionDir)Extern\NatsuLib\NatsuLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
@@ -108,7 +116,7 @@
       <PreprocessorDefinitions>NOMINMAX;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(SolutionDir)QQBot;$(SolutionDir)Extern\NatsuLib\NatsuLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)YumeBot;$(SolutionDir)Extern\NatsuLib\NatsuLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
@@ -127,7 +135,7 @@
       <PreprocessorDefinitions>NOMINMAX;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(SolutionDir)QQBot;$(SolutionDir)Extern\NatsuLib\NatsuLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)YumeBot;$(SolutionDir)Extern\NatsuLib\NatsuLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
@@ -148,7 +156,7 @@
       <PreprocessorDefinitions>NOMINMAX;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(SolutionDir)QQBot;$(SolutionDir)Extern\NatsuLib\NatsuLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)YumeBot;$(SolutionDir)Extern\NatsuLib\NatsuLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
@@ -169,10 +177,10 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="QQBot.Test.cpp" />
+    <ClCompile Include="YumeBot.Test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\QQBot\QQBot.vcxproj">
+    <ProjectReference Include="..\YumeBot\YumeBot.vcxproj">
       <Project>{ec6fb333-f85f-4ad3-8792-33e1c62734ba}</Project>
     </ProjectReference>
   </ItemGroup>

QQBot.Test/QQBot.Test.vcxproj.filters → YumeBot.Test/YumeBot.Test.vcxproj.filters

@@ -23,10 +23,10 @@
     <ClCompile Include="pch.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="QQBot.Test.cpp">
+    <ClCompile Include="CryptographyTest.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="CryptographyTest.cpp">
+    <ClCompile Include="YumeBot.Test.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
   </ItemGroup>

QQBot.sln → YumeBot.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2000
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QQBot", "QQBot\QQBot.vcxproj", "{EC6FB333-F85F-4AD3-8792-33E1C62734BA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YumeBot", "YumeBot\YumeBot.vcxproj", "{EC6FB333-F85F-4AD3-8792-33E1C62734BA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extern", "Extern", "{E5E98F7D-B53A-44CB-8945-91A1419297A4}"
 EndProject
@@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NatsuLib", "Extern\NatsuLib
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "Extern\NatsuLib\NatsuLib\extern\zlib\zlib.vcxproj", "{0BFBD1A8-5638-4B35-BA03-8DB47F921B9B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QQBot.Test", "QQBot.Test\QQBot.Test.vcxproj", "{81338DEA-3569-459E-9D73-609BC779B598}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YumeBot.Test", "YumeBot.Test\YumeBot.Test.vcxproj", "{81338DEA-3569-459E-9D73-609BC779B598}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

QQBot/Cryptography.cpp → YumeBot/Cryptography.cpp

@@ -7,7 +7,7 @@
 #undef max
 
 using namespace NatsuLib;
-using namespace QQBot::Cryptography;
+using namespace YumeBot::Cryptography;
 
 namespace
 {

QQBot/Cryptography.h → YumeBot/Cryptography.h

@@ -6,9 +6,9 @@
 
 #include "Utility.h"
 
-namespace QQBot::Cryptography
+namespace YumeBot::Cryptography
 {
-	DeclareException(CryptoException, NatsuLib::natException, u8"QQBot::Cryptography::CryptoException");
+	DeclareException(CryptoException, NatsuLib::natException, u8"YumeBot::Cryptography::CryptoException");
 
 	namespace Tea
 	{

QQBot/Jce.cpp → YumeBot/Jce.cpp

@@ -1,7 +1,7 @@
 #include "Jce.h"
 
 using namespace NatsuLib;
-using namespace QQBot;
+using namespace YumeBot;
 using namespace Jce;
 
 JceStruct::~JceStruct()

QQBot/Jce.h → YumeBot/Jce.h

@@ -3,7 +3,7 @@
 #include <optional>
 #include "Utility.h"
 
-namespace QQBot::Jce
+namespace YumeBot::Jce
 {
 	DeclareException(InvalidData, NatsuLib::natException, u8"Invalid data");
 

QQBot/Utility.h → YumeBot/Utility.h

@@ -3,7 +3,7 @@
 #include <gsl/span>
 #include <type_traits>
 
-namespace QQBot::Utility
+namespace YumeBot::Utility
 {
 	constexpr std::size_t AlignTo(std::size_t num, std::size_t alignment) noexcept
 	{

QQBot/QQBot.cpp → YumeBot/YumeBot.cpp

@@ -1,7 +1,7 @@
-#include "QQBot.h"
+#include "YumeBot.h"
 
 using namespace NatsuLib;
-using namespace QQBot;
+using namespace YumeBot;
 
 Bot::Bot(): m_Socket(m_Service)
 {

QQBot/QQBot.h → YumeBot/YumeBot.h

@@ -7,7 +7,7 @@
 #define _SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING 1
 #include <asio.hpp>
 
-namespace QQBot
+namespace YumeBot
 {
 	class Bot
 		: public NatsuLib::natRefObjImpl<Bot>

QQBot/QQBot.vcxproj → YumeBot/YumeBot.vcxproj

@@ -21,20 +21,20 @@
   <ItemGroup>
     <ClInclude Include="Cryptography.h" />
     <ClInclude Include="Jce.h" />
-    <ClInclude Include="QQBot.h" />
+    <ClInclude Include="YumeBot.h" />
     <ClInclude Include="TlvCodeDef.h" />
     <ClInclude Include="Utility.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Cryptography.cpp" />
     <ClCompile Include="Jce.cpp" />
-    <ClCompile Include="QQBot.cpp" />
+    <ClCompile Include="YumeBot.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{EC6FB333-F85F-4AD3-8792-33E1C62734BA}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>QQBot</RootNamespace>
+    <RootNamespace>YumeBot</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -84,15 +84,23 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>bin/$(Platform)/$(Configuration)</OutDir>
+    <IntDir>obj/$(Platform)/$(Configuration)</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>bin/$(Platform)/$(Configuration)</OutDir>
+    <IntDir>obj/$(Platform)/$(Configuration)</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>bin/$(Platform)/$(Configuration)</OutDir>
+    <IntDir>obj/$(Platform)/$(Configuration)</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>bin/$(Platform)/$(Configuration)</OutDir>
+    <IntDir>obj/$(Platform)/$(Configuration)</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

QQBot/QQBot.vcxproj.filters → YumeBot/YumeBot.vcxproj.filters

@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="QQBot.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
     <ClInclude Include="Cryptography.h">
       <Filter>头文件</Filter>
     </ClInclude>
@@ -30,16 +27,19 @@
     <ClInclude Include="TlvCodeDef.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="YumeBot.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="QQBot.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
     <ClCompile Include="Cryptography.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="Jce.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="YumeBot.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>