合并

JeffreySu · Oct 8, 2024 · 19018df · 19018df
2 parents e2de14c + c29975f
commit 19018df
Show file tree

Hide file tree

Showing 165 changed files with 1,518 additions and 1,685 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,5 @@ yarn.lock
 /Samples/Work/Senparc.Weixin.Sample.Work/App_Data/WeChat_Work
 /Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/appsettings.Development.json
 /Samples/MP/Senparc.Weixin.Sample.MP.Simple/appsettings.Development.json
+/src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/AdvancedAPIs/Media/*.jpg
+/src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/*.jpg
diff --git a/Samples with AI/readme.md b/Samples with AI/readme.md
@@ -6,15 +6,15 @@
 
 AI 能力来自于 [Senparc.AI](https://github.com/Senparc/Senparc.AI)，并深度集成了 [Semantic Kernel](https://github.com/microsoft/semantic-kernel)、[AutoGen](https://github.com/microsoft/autogen) 等模块，同时进行了扩展，开箱即用，极易上手。
 
-当前项目正在构建完善中，预计在 2024 年 7 月 1 日左右正式上线。
+基础功能已正式上线，当前项目正在持续更新中，欢迎大家一起参与贡献代码或想法 💡
 
 内容将涵盖：
 
 1. [X] 微信公众号 Chat 机器人（文字） - 已于 2024 年 5 月 25 日上线
 2. [X] 微信公众号 Chat 机器人（图片） - 已于 2024 年 5 月 25 日上线
 3. [X] 微信公众号 Chat 机器人（多模态混合） - 已于 2024 年 5 月 26 日上线
 4. [ ] 微信公众号带搜索功能的 Chat 机器人
-5. [ ] 企业微信集成 Agent（智能体）机器人
+5. [X] 企业微信集成 Agent（智能体）机器人 - 已在 [NCF](https://github.com/NeuCharFramework/NCF) 中的 [AgentsManager](https://github.com/NeuCharFramework/NcfPackageSources/tree/master/src/Extensions/Senparc.Xncf.AgentsManager) 模块集成
 6. [ ] 使用 RAG 构建知识库问答
 
 > 更多示例欢迎发 issue 或群内留言！

diff --git a/Samples/All/Senparc.Weixin.Sample.CommonService/LocationService.cs b/Samples/All/Senparc.Weixin.Sample.CommonService/LocationService.cs
@@ -7,7 +7,6 @@
     
     创建标识：Senparc - 20150312
 ----------------------------------------------------------------*/
-//DPBMARK_FILE MP
 
 using System.Collections.Generic;
 using Senparc.Weixin.MP.Entities;

diff --git a/...ple.CommonService/MessageHandlers/CustomMessageHandler/Async/CustomMessageHandlerAsync.cs b/...ple.CommonService/MessageHandlers/CustomMessageHandler/Async/CustomMessageHandlerAsync.cs
@@ -8,7 +8,6 @@
     创建标识：Senparc - 20191003
 ----------------------------------------------------------------*/
 
-//DPBMARK_FILE MP
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/...monService/MessageHandlers/CustomMessageHandler/Async/CustomMessageHandlerAsync_Events.cs b/...monService/MessageHandlers/CustomMessageHandler/Async/CustomMessageHandlerAsync_Events.cs
@@ -8,7 +8,6 @@
     创建标识：Senparc - 20150312
 ----------------------------------------------------------------*/
 
-//DPBMARK_FILE MP
 using Senparc.CO2NET.Extensions;
 using Senparc.NeuChar.Entities;
 using Senparc.Weixin.Exceptions;

diff --git a/....Weixin.Sample.CommonService/MessageHandlers/CustomMessageHandler/CustomMessageContext.cs b/....Weixin.Sample.CommonService/MessageHandlers/CustomMessageHandler/CustomMessageContext.cs
@@ -8,7 +8,6 @@
     创建标识：Senparc - 20150312
 ----------------------------------------------------------------*/
 
-//DPBMARK_FILE MP
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/....Weixin.Sample.CommonService/MessageHandlers/CustomMessageHandler/CustomMessageHandler.cs b/....Weixin.Sample.CommonService/MessageHandlers/CustomMessageHandler/CustomMessageHandler.cs
@@ -15,7 +15,6 @@
 
 ----------------------------------------------------------------*/
 
-//DPBMARK_FILE MP
 using Senparc.CO2NET.Helpers;
 using Senparc.CO2NET.Utilities;
 using Senparc.NeuChar.Agents;

diff --git a/....Sample.CommonService/MessageHandlers/CustomMessageHandler/CustomMessageHandler_Events.cs b/....Sample.CommonService/MessageHandlers/CustomMessageHandler/CustomMessageHandler_Events.cs
@@ -8,7 +8,6 @@
     创建标识：Senparc - 20150312
 ----------------------------------------------------------------*/
 
-//DPBMARK_FILE MP
 using Senparc.CO2NET;
 using Senparc.CO2NET.Extensions;
 using Senparc.CO2NET.Utilities;

diff --git a/...in.Sample.CommonService/MessageHandlers/WebSocket/CustomNetCoreWebSocketMessageHandler.cs b/...in.Sample.CommonService/MessageHandlers/WebSocket/CustomNetCoreWebSocketMessageHandler.cs
@@ -1,5 +1,4 @@
-//DPBMARK_FILE WebSocket
-#if !NET462
+#if !NET462
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/...eixin.Sample.CommonService/MessageHandlers/WorkMessageHandler/WorkCustomMessageContext.cs b/...eixin.Sample.CommonService/MessageHandlers/WorkMessageHandler/WorkCustomMessageContext.cs
@@ -8,7 +8,6 @@
     创建标识：Senparc - 20150312
 ----------------------------------------------------------------*/
 
-//DPBMARK_FILE Work
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/...eixin.Sample.CommonService/MessageHandlers/WorkMessageHandler/WorkCustomMessageHandler.cs b/...eixin.Sample.CommonService/MessageHandlers/WorkMessageHandler/WorkCustomMessageHandler.cs
@@ -8,7 +8,6 @@
     创建标识：Senparc - 20150312
 ----------------------------------------------------------------*/
 
-//DPBMARK_FILE Work
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/...n.Sample.CommonService/MessageHandlers/WxOpenMessageHandler/CustomWxOpenMessageContext.cs b/...n.Sample.CommonService/MessageHandlers/WxOpenMessageHandler/CustomWxOpenMessageContext.cs
@@ -8,7 +8,6 @@
     创建标识：Senparc - 20150312
 ----------------------------------------------------------------*/
 
-//DPBMARK_FILE MiniProgram
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/...n.Sample.CommonService/MessageHandlers/WxOpenMessageHandler/CustomWxOpenMessageHandler.cs b/...n.Sample.CommonService/MessageHandlers/WxOpenMessageHandler/CustomWxOpenMessageHandler.cs
@@ -12,7 +12,6 @@
 
 ----------------------------------------------------------------*/
 
-//DPBMARK_FILE MiniProgram
 using Senparc.CO2NET.Utilities;
 using Senparc.NeuChar.Entities;
 using Senparc.Weixin.WxOpen.Entities;

diff --git a/...parc.Weixin.Sample.CommonService/Senparc.Weixin.Net8SampleForConsole.CommonService.csproj b/...parc.Weixin.Sample.CommonService/Senparc.Weixin.Net8SampleForConsole.CommonService.csproj
@@ -19,9 +19,10 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Senparc.NeuChar" Version="2.4.0" />
+	  <PackageReference Include="Senparc.AI.Kernel" Version="0.18.0" />
+	  <PackageReference Include="Senparc.NeuChar" Version="2.4.3" />
 	  <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
-	  <PackageReference Include="Senparc.Weixin.TenPay" Version="1.13.1" />
+	  <PackageReference Include="Senparc.Weixin.TenPay" Version="1.16.3" />
 	  <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
 	  <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
 	  <PackageReference Include="ZXing.Net" Version="0.16.9" />
@@ -30,15 +31,15 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-		<PackageReference Include="Senparc.WebSocket" Version="0.18.1" />
-		<PackageReference Include="Senparc.Weixin.Cache.CsRedis" Version="0.9.1" />
-		<PackageReference Include="Senparc.Weixin.Cache.Memcached" Version="2.14.1" />
-		<PackageReference Include="Senparc.Weixin.Cache.Redis" Version="2.16.1" />
-		<PackageReference Include="Senparc.Weixin.MP" Version="16.20.4" />
-		<PackageReference Include="Senparc.Weixin.Open" Version="4.17.3" />
-		<PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.2.1" />
-		<PackageReference Include="Senparc.Weixin.Work" Version="3.18.2" />
-		<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.17.4" />
+		<PackageReference Include="Senparc.WebSocket" Version="1.0.2" />
+		<PackageReference Include="Senparc.Weixin.Cache.CsRedis" Version="1.0.2" />
+		<PackageReference Include="Senparc.Weixin.Cache.Memcached" Version="2.17.3" />
+		<PackageReference Include="Senparc.Weixin.Cache.Redis" Version="2.19.3" />
+		<PackageReference Include="Senparc.Weixin.MP" Version="16.22.3" />
+		<PackageReference Include="Senparc.Weixin.Open" Version="4.20.3" />
+		<PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.6.4" />
+		<PackageReference Include="Senparc.Weixin.Work" Version="3.23.1" />
+		<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.20.4" />
 	</ItemGroup>
 
 

diff --git a/Samples/All/Senparc.Weixin.Sample.CommonService/TemplateMessageService.cs b/Samples/All/Senparc.Weixin.Sample.CommonService/TemplateMessageService.cs
@@ -1,4 +1,3 @@
-//DPBMARK_FILE MiniProgram
 
 using Senparc.CO2NET.Cache;
 using Senparc.Weixin.Sample.CommonService.TemplateMessage.WxOpen;

diff --git a/Samples/All/console/Senparc.Weixin.MP.Sample.Consoles.NET8.sln b/Samples/All/console/Senparc.Weixin.MP.Sample.Consoles.NET8.sln
@@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{DCF86D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.Weixin.MP.Sample.Consoles", "Senparc.Weixin.MP.Sample.Consoles\Senparc.Weixin.MP.Sample.Consoles.csproj", "{1E843726-DB24-464D-A6A9-5607B197D807}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.Weixin.Net8SampleForConsole.CommonService", "Y:\Senparc 项目\WeiXinMPSDK\Samples\All\Senparc.Weixin.Sample.CommonService\Senparc.Weixin.Net8SampleForConsole.CommonService.csproj", "{E646F86A-065D-4991-9E96-6E1346E904B1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.Weixin.Net8SampleForConsole.CommonService", "..\Senparc.Weixin.Sample.CommonService\Senparc.Weixin.Net8SampleForConsole.CommonService.csproj", "{CF37F455-9DA8-401D-AE7F-E96CDC912984}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -42,31 +42,31 @@ Global
 		{1E843726-DB24-464D-A6A9-5607B197D807}.Test|x64.Build.0 = Debug|Any CPU
 		{1E843726-DB24-464D-A6A9-5607B197D807}.Test|x86.ActiveCfg = Debug|Any CPU
 		{1E843726-DB24-464D-A6A9-5607B197D807}.Test|x86.Build.0 = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Debug|x64.Build.0 = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Debug|x86.Build.0 = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Release|x64.ActiveCfg = Release|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Release|x64.Build.0 = Release|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Release|x86.ActiveCfg = Release|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Release|x86.Build.0 = Release|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Test|Any CPU.ActiveCfg = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Test|Any CPU.Build.0 = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Test|x64.ActiveCfg = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Test|x64.Build.0 = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Test|x86.ActiveCfg = Debug|Any CPU
-		{E646F86A-065D-4991-9E96-6E1346E904B1}.Test|x86.Build.0 = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Debug|x64.Build.0 = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Debug|x86.Build.0 = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Release|x64.ActiveCfg = Release|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Release|x64.Build.0 = Release|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Release|x86.ActiveCfg = Release|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Release|x86.Build.0 = Release|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Test|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Test|Any CPU.Build.0 = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Test|x64.ActiveCfg = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Test|x64.Build.0 = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Test|x86.ActiveCfg = Debug|Any CPU
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984}.Test|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{1E843726-DB24-464D-A6A9-5607B197D807} = {35139CB3-610E-4922-98AD-08A5D12BFC35}
-		{E646F86A-065D-4991-9E96-6E1346E904B1} = {35139CB3-610E-4922-98AD-08A5D12BFC35}
+		{CF37F455-9DA8-401D-AE7F-E96CDC912984} = {35139CB3-610E-4922-98AD-08A5D12BFC35}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC7AD3EC-AB37-497E-925B-DCD5129FE6D3}

diff --git a/Samples/All/console/Senparc.Weixin.MP.Sample.Consoles/Program.cs b/Samples/All/console/Senparc.Weixin.MP.Sample.Consoles/Program.cs
@@ -35,26 +35,27 @@ and limitations under the License.
 using System;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Senparc.CO2NET;
 using Senparc.CO2NET.Extensions;
 using Senparc.Weixin;
 using Senparc.Weixin.Entities;
 using Senparc.Weixin.MP;
 using Senparc.Weixin.RegisterServices;
 
-
 var builder = new ConfigurationBuilder();
-builder.AddJsonFile("appsettings.json", false, false);
+var environment = Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT") ?? "Production";
+
+builder.AddJsonFile("appsettings.json", false, true);
+builder.AddJsonFile($"appsettings.{environment}.json", false, true);
 Console.WriteLine("完成 appsettings.json 添加");
 
 var config = builder.Build();
 Console.WriteLine("完成 ServiceCollection 和 ConfigurationBuilder 初始化");
 
-//更多绑定操作参见：https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-2.2
-var senparcSetting = new SenparcSetting();
-var senparcWeixinSetting = new SenparcWeixinSetting();
-config.GetSection("SenparcSetting").Bind(senparcSetting);
-config.GetSection("SenparcWeixinSetting").Bind(senparcWeixinSetting);
+//更多绑定操作参见：https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-8.0
+var senparcSetting = config.GetSection("SenparcSetting").Get<SenparcSetting>();
+var senparcWeixinSetting = config.GetSection("SenparcWeixinSetting").Get< SenparcWeixinSetting>();
 
 var services = new ServiceCollection();
 services.AddMemoryCache();//使用本地缓存必须添加
@@ -76,8 +77,8 @@ and limitations under the License.
 
 //启用微信配置（必须）
 var registerService = app.UseSenparcWeixin(
-    null /* 不为 null 则覆盖 appsettings  中的 SenpacSetting 配置*/,
-    null /* 不为 null 则覆盖 appsettings  中的 SenpacWeixinSetting 配置*/,
+    senparcSetting /* 不为 null 则覆盖 appsettings  中的 SenpacSetting 配置*/,
+    senparcWeixinSetting /* 不为 null 则覆盖 appsettings  中的 SenpacWeixinSetting 配置*/,
     register => { /* CO2NET 全局配置 */ },
     (register, weixinSetting) =>
     {
@@ -91,4 +92,10 @@ and limitations under the License.
 
 var weixinSetting = Senparc.Weixin.Config.SenparcWeixinSetting;
 
-Console.WriteLine(weixinSetting.Items["【盛派网络小助手】公众号"].ToJson(true));
+Console.WriteLine("## weixinSetting");
+Console.WriteLine(weixinSetting.ToJson(true, new Newtonsoft.Json.JsonSerializerSettings() { ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore }));
+Console.WriteLine();
+Console.WriteLine("## 【盛派网络小助手】公众号");
+Console.WriteLine(weixinSetting.Items["【盛派网络小助手】公众号"].ToJson(true));
+
+Console.ReadLine();
diff --git a/...es/All/console/Senparc.Weixin.MP.Sample.Consoles/Senparc.Weixin.MP.Sample.Consoles.csproj b/...es/All/console/Senparc.Weixin.MP.Sample.Consoles/Senparc.Weixin.MP.Sample.Consoles.csproj
@@ -6,28 +6,33 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Senparc.WebSocket" Version="0.18.1" />
-    <PackageReference Include="Senparc.Weixin.Cache.CsRedis" Version="0.9.1" />
-    <PackageReference Include="Senparc.Weixin.Cache.Memcached" Version="2.14.1" />
-    <PackageReference Include="Senparc.Weixin.Cache.Redis" Version="2.16.1" />
-    <PackageReference Include="Senparc.Weixin.MP" Version="16.20.4" />
-    <PackageReference Include="Senparc.Weixin.Open" Version="4.17.3" />
-    <PackageReference Include="Senparc.Weixin.TenPay" Version="1.13.1" />
-    <PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.2.1" />
-    <PackageReference Include="Senparc.Weixin.Work" Version="3.18.2" />
-    <PackageReference Include="Senparc.Weixin.WxOpen" Version="3.17.4" />
+    <None Remove="appsettings.json" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="Y:\Senparc 项目\WeiXinMPSDK\Samples\All\Senparc.Weixin.Sample.CommonService\Senparc.Weixin.Net8SampleForConsole.CommonService.csproj" />
+    <Content Include="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Senparc.WebSocket" Version="1.0.2" />
+    <PackageReference Include="Senparc.Weixin.Cache.CsRedis" Version="1.0.2" />
+    <PackageReference Include="Senparc.Weixin.Cache.Memcached" Version="2.17.3" />
+    <PackageReference Include="Senparc.Weixin.Cache.Redis" Version="2.19.3" />
+    <PackageReference Include="Senparc.Weixin.MP" Version="16.22.3" />
+    <PackageReference Include="Senparc.Weixin.Open" Version="4.20.3" />
+    <PackageReference Include="Senparc.Weixin.TenPay" Version="1.16.3" />
+    <PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.6.4" />
+    <PackageReference Include="Senparc.Weixin.Work" Version="3.23.1" />
+    <PackageReference Include="Senparc.Weixin.WxOpen" Version="3.20.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Senparc.Weixin.Sample.CommonService\Senparc.Weixin.Net8SampleForConsole.CommonService.csproj" />
+    <ProjectReference Include="Y:\Senparc 项目\WeiXinMPSDK\Samples\All\Senparc.Weixin.Sample.CommonService\Senparc.Weixin.Net8SampleForConsole.CommonService.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8.sln b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8.sln
@@ -50,7 +50,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.Weixin.Work.Test.ne
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.Weixin.MP.Test.net8", "..\..\..\src\Senparc.Weixin.MP\Senparc.Weixin.MP.Test\Senparc.Weixin.MP.Test.net8.csproj", "{B1165EE3-2DBB-474B-AFCA-ECAB096DAAAC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.WeixinTests.net8", "..\..\..\src\Senparc.Weixin.MP\Senparc.WeixinTests\Senparc.WeixinTests.net8.csproj", "{A514FE17-476F-4D10-B28E-A7597CB93F9A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.WeixinTests.net8", "..\..\..\src\Senparc.Weixin\Senparc.WeixinTests\Senparc.WeixinTests.net8.csproj", "{A514FE17-476F-4D10-B28E-A7597CB93F9A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNet", "AspNet", "{6DDD51DD-6029-4F4B-994A-4CD3231BC5B7}"
 EndProject

diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/CacheController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/CacheController.cs
@@ -1,6 +1,4 @@
-//DPBMARK_FILE Redis
-//DPBMARK_FILE Memcached
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Senparc.CO2NET.Cache;
 using Senparc.Weixin.Cache;
 using Senparc.Weixin.Containers;

diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/SimulateToolController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/SimulateToolController.cs
@@ -12,7 +12,6 @@
     修改描述：优化消息模拟功能 
 ----------------------------------------------------------------*/
 
-//DPBMARK_FILE MP
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/AnalysisController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/AnalysisController.cs
@@ -1,5 +1,4 @@
-//DPBMARK_FILE MP
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Senparc.Weixin.MP.AdvancedAPIs;
 using Senparc.Weixin.MP.AdvancedAPIs.Analysis;
 using Senparc.Weixin.MP.Containers;

diff --git a/...s/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/AsyncMethodsController.cs b/...s/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/AsyncMethodsController.cs
@@ -1,5 +1,4 @@
-//DPBMARK_FILE MP
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Senparc.CO2NET.Cache;
 using Senparc.CO2NET.Extensions;
 using Senparc.CO2NET.HttpUtility;

diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/DeviceController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/DeviceController.cs
@@ -1,5 +1,4 @@
-//DPBMARK_FILE MP
-using Senparc.Weixin.MP.Helpers;
+using Senparc.Weixin.MP.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Configuration;

diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/MediaController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/MediaController.cs
@@ -10,7 +10,6 @@
     修改标识：Senparc - 20150312
     修改描述：TestUploadMediaFile() 方法专为Senparc.Weixin.MP.Test/HttpUtility/RequestUtilityTest.cs/HttpPostTest 提供上传测试目标
 ----------------------------------------------------------------*/
-//DPBMARK_FILE MP
 
 using System;
 using System.Collections.Generic;

diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/MenuController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/MenuController.cs
@@ -7,7 +7,6 @@
     
     创建标识：Senparc - 20150312
 ----------------------------------------------------------------*/
-//DPBMARK_FILE MP
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/OAuth2Controller.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/OAuth2Controller.cs
@@ -8,7 +8,6 @@
     创建标识：Senparc - 20150312
 ----------------------------------------------------------------*/
 
-//DPBMARK_FILE MP
 using System;
 using System.Collections.Generic;
 using System.Configuration;