diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b5b50bb --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/.idea +/.vs/transferServiceExe +/packages/jsoncpp.redist.0.6.0.1 +/transfer.53341EF3/x64 +/x64/Debug diff --git a/NetSocket.cpp b/NetSocket.cpp index ab5805d..4e120e4 100644 --- a/NetSocket.cpp +++ b/NetSocket.cpp @@ -1,5 +1,5 @@ #include "NetSocket.h" -#include "include\json\json.h" +#include "json/json.h" #pragma comment(lib, "ws2_32.lib") diff --git a/json_value.cpp b/json_value.cpp index aa2b744..c8f1139 100644 --- a/json_value.cpp +++ b/json_value.cpp @@ -259,7 +259,7 @@ Value::CZString::CZString(const CZString& other) { storage_.length_ = other.storage_.length_; } -Value::CZString::CZString(CZString&& other) noexcept +Value::CZString::CZString(CZString&& other) : cstr_(other.cstr_), index_(other.index_) { other.cstr_ = nullptr; } @@ -285,7 +285,7 @@ Value::CZString& Value::CZString::operator=(const CZString& other) { return *this; } -Value::CZString& Value::CZString::operator=(CZString&& other) noexcept { +Value::CZString& Value::CZString::operator=(CZString&& other) { cstr_ = other.cstr_; index_ = other.index_; other.cstr_ = nullptr; @@ -433,7 +433,7 @@ Value::Value(const Value& other) { dupMeta(other); } -Value::Value(Value&& other) noexcept { +Value::Value(Value&& other) { initBasic(nullValue); swap(other); } @@ -448,7 +448,7 @@ Value& Value::operator=(const Value& other) { return *this; } -Value& Value::operator=(Value&& other) noexcept { +Value& Value::operator=(Value&& other) { other.swap(*this); return *this; } @@ -1374,7 +1374,7 @@ bool Value::isObject() const { return type() == objectValue; } Value::Comments::Comments(const Comments& that) : ptr_{cloneUnique(that.ptr_)} {} -Value::Comments::Comments(Comments&& that) noexcept +Value::Comments::Comments(Comments&& that) : ptr_{std::move(that.ptr_)} {} Value::Comments& Value::Comments::operator=(const Comments& that) { @@ -1382,7 +1382,7 @@ Value::Comments& Value::Comments::operator=(const Comments& that) { return *this; } -Value::Comments& Value::Comments::operator=(Comments&& that) noexcept { +Value::Comments& Value::Comments::operator=(Comments&& that) { ptr_ = std::move(that.ptr_); return *this; } diff --git a/lib/HCNetSDK/x64/HCNetSDK.dll b/lib/HCNetSDK/x64/HCNetSDK.dll new file mode 100644 index 0000000..2ed412e Binary files /dev/null and b/lib/HCNetSDK/x64/HCNetSDK.dll differ diff --git a/lib/HCNetSDK/x64/HCNetSDK.lib b/lib/HCNetSDK/x64/HCNetSDK.lib new file mode 100644 index 0000000..ff8e9e2 Binary files /dev/null and b/lib/HCNetSDK/x64/HCNetSDK.lib differ diff --git a/packages.config b/packages.config new file mode 100644 index 0000000..3919493 --- /dev/null +++ b/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/transferServiceExe.cpp b/transferServiceExe.cpp index a3a09dd..eeb9e50 100644 --- a/transferServiceExe.cpp +++ b/transferServiceExe.cpp @@ -3,11 +3,15 @@ #include "stdafx.h" #include "transferServiceExe.h" -#include "include\json\json.h" +#include "json/json.h" int _tmain(int argc, CHAR* argv[]) { printf("start transferServiceExe\n"); + if (argc <= 1) { + printf("exit \n"); + return 1; + } for (int i = 0; i < argc; i++){ printf("%s ", argv[i]); diff --git a/transferServiceExe.vcxproj b/transferServiceExe.vcxproj index b2a6b28..4abdae0 100644 --- a/transferServiceExe.vcxproj +++ b/transferServiceExe.vcxproj @@ -22,31 +22,32 @@ {53341EF3-3941-4560-97CD-CE734ABCD2A2} Win32Proj transferServiceExe + 10.0.22621.0 Application true - v140 + v143 MultiByte Application true - v140 + v143 MultiByte Application false - v140 + v143 true Unicode Application false - v140 + v143 true Unicode @@ -71,6 +72,8 @@ true + $(VC_IncludePath);$(WindowsSDK_IncludePath);D:\jsoncpp\include;D:\HCNetSDK\CH-HCNetSDKV6.1.9.48_build20230410_win64\头文件 + D:\jsoncpp\dist\bin\Debug;D:\jsoncpp\dist\lib\Debug;$(LibraryPath) false @@ -78,6 +81,9 @@ false + + false + @@ -107,7 +113,7 @@ Console true %(AdditionalLibraryDirectories) - %(AdditionalDependencies) + %(AdditionalDependencies);jsoncpp.lib;HCNetSDK.lib @@ -172,8 +178,16 @@ + + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + \ No newline at end of file diff --git a/transferServiceExe.vcxproj.filters b/transferServiceExe.vcxproj.filters index 82b453f..9a9db2b 100644 --- a/transferServiceExe.vcxproj.filters +++ b/transferServiceExe.vcxproj.filters @@ -82,5 +82,6 @@ 头文件 + \ No newline at end of file diff --git a/transferServiceExe.vcxproj.user b/transferServiceExe.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/transferServiceExe.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file