Merge branch 'lich0821:master' into master

.github/workflows/Build-WeChatFerry.yml

@@ -46,9 +46,9 @@ jobs:
           path: |
             C:/Tools/vcpkg
             ${{ github.workspace }}/WeChatFerry/vcpkg_installed
-          key: ${{ runner.os }}-vcpkg-${{ hashFiles('WeChatFerry/vcpkg.json') }}
+          key: vcpkg-${{ hashFiles('WeChatFerry/vcpkg.json') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-
+            vcpkg-
 
       - name: 安装 vcpkg 并初始化依赖项
         run: |
@@ -68,19 +68,24 @@ jobs:
           echo "VCPKG_ROOT=C:/Tools/vcpkg" >> $GITHUB_ENV
           $env:VCPKG_ROOT = 'C:/Tools/vcpkg'
 
-          # 将 vcpkg 与 Visual Studio 集成
-          C:/Tools/vcpkg/vcpkg integrate install
-
           # 返回到项目目录并安装依赖
           cd ${{ github.workspace }}/WeChatFerry
           C:/Tools/vcpkg/vcpkg install --triplet x64-windows-static
 
+          # 将 vcpkg 与 Visual Studio 集成
+          C:/Tools/vcpkg/vcpkg integrate install
+
       - name: 解析并构建配置
         run: |
           $configurations = "Release,Debug".Split(',')
           foreach ($config in $configurations) {
             Write-Host "Building configuration: $config"
-            msbuild WeChatFerry/WeChatFerry.sln /p:Configuration=$config /p:Platform="x64" /p:VcpkgTriplet="x64-windows-static" /p:VcpkgEnableManifest=true /verbosity:minimal
+            msbuild WeChatFerry/WeChatFerry.sln `
+              /p:Configuration=$config `
+              /p:Platform="x64" `
+              /p:VcpkgTriplet="x64-windows-static" `
+              /p:VcpkgEnableManifest=true `
+              /verbosity:minimal
           }
         shell: pwsh
 

WeChatFerry/spy/Spy.vcxproj

@@ -92,7 +92,7 @@
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;C:\Tools\vcpkg\installed\x64-windows-static\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;$(SolutionDir)vcpkg_installed\x64-windows-static\x64-windows-static\include</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <OmitFramePointers>false</OmitFramePointers>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -140,7 +140,7 @@ xcopy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\clients\python\wcferry</Com
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;C:\Tools\vcpkg\installed\x64-windows-static\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;$(SolutionDir)vcpkg_installed\x64-windows-static\x64-windows-static\include</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <OmitFramePointers>false</OmitFramePointers>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -191,7 +191,7 @@ xcopy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\clients\python\wcferry</Com
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;C:\Tools\vcpkg\installed\x64-windows-static\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)com;$(SolutionDir)rpc;$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;$(SolutionDir)smc;$(SolutionDir)spy;$(SolutionDir)vcpkg_installed\x64-windows-static\x64-windows-static\include</AdditionalIncludeDirectories>
       <OmitFramePointers>false</OmitFramePointers>
       <PrecompiledHeaderOutputFile />
       <DisableSpecificWarnings>4251;4731;4819</DisableSpecificWarnings>

WeChatFerry/spy/rpc_server.cpp

@@ -11,7 +11,7 @@
 #include <string>
 #include <thread>
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 #include <nng/nng.h>
 #include <nng/protocol/pair1/pair.h>
 #include <nng/supplemental/util/platform.h>

WeChatFerry/vcpkg.json

@@ -10,5 +10,6 @@
         "nng",
         "magic-enum",
         "minhook"
-    ]
+    ],
+    "builtin-baseline": "80d54ff62d528339c626a6fbc3489a7f25956ade"
 }