diff --git a/.gitignore b/.gitignore index 50368c4c13..3159690fe8 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ 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 diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8.sln b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8.sln index ca8dbd4c79..5d1ce0cb26 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8.sln +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8.sln @@ -100,7 +100,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3.3 人工智能(AI)", ..\..\..\Samples with AI\readme.md = ..\..\..\Samples with AI\readme.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Senparc.Weixin.All", "..\..\..\src\Senparc.Weixin.All\Senparc.Weixin.All.csproj", "{F1AAA30B-2829-4410-8A96-F21B88B066B0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.Weixin.All", "..\..\..\src\Senparc.Weixin.All\Senparc.Weixin.All.csproj", "{F1AAA30B-2829-4410-8A96-F21B88B066B0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "公众号", "公众号", "{37E0EA13-96E7-423E-8C53-CE136C439B54}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Senparc.Weixin.Sample.MP.Simple", "..\..\MP\Senparc.Weixin.Sample.MP.Simple\Senparc.Weixin.Sample.MP.Simple.csproj", "{C4370924-9D72-4859-93C0-AA619BFC583B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -670,6 +674,23 @@ Global {F1AAA30B-2829-4410-8A96-F21B88B066B0}.Test|x64.Build.0 = Debug|Any CPU {F1AAA30B-2829-4410-8A96-F21B88B066B0}.Test|x86.ActiveCfg = Debug|Any CPU {F1AAA30B-2829-4410-8A96-F21B88B066B0}.Test|x86.Build.0 = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Debug|x64.ActiveCfg = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Debug|x64.Build.0 = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Debug|x86.ActiveCfg = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Debug|x86.Build.0 = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Release|x64.ActiveCfg = Release|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Release|x64.Build.0 = Release|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Release|x86.ActiveCfg = Release|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Release|x86.Build.0 = Release|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Test|Any CPU.ActiveCfg = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Test|Any CPU.Build.0 = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Test|x64.ActiveCfg = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Test|x64.Build.0 = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Test|x86.ActiveCfg = Debug|Any CPU + {C4370924-9D72-4859-93C0-AA619BFC583B}.Test|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -705,7 +726,7 @@ Global {F2B9B8FC-0D7A-4BC5-855B-D91799B311FF} = {FC72CA5A-5DE9-4902-A5AA-00344FA68B37} {C40691EE-ECCC-4BE0-B2D3-005066B4D7D5} = {334B3098-A802-4698-A145-BC6B902F31DE} {757A2C42-8B3F-4F7F-B948-7453A80267C8} = {F2B9B8FC-0D7A-4BC5-855B-D91799B311FF} - {81A078A9-97D1-446D-88ED-87F4BB484D91} = {34CFB1D8-6025-4E93-A67F-D94DD3B9198F} + {81A078A9-97D1-446D-88ED-87F4BB484D91} = {37E0EA13-96E7-423E-8C53-CE136C439B54} {34CFB1D8-6025-4E93-A67F-D94DD3B9198F} = {35139CB3-610E-4922-98AD-08A5D12BFC35} {1B168C93-E3E3-4939-8EDC-19CE4E041874} = {35139CB3-610E-4922-98AD-08A5D12BFC35} {9FE36012-8B32-488E-96AD-BA7CEDAEEAB8} = {34CFB1D8-6025-4E93-A67F-D94DD3B9198F} @@ -716,6 +737,8 @@ Global {81A03BCD-B887-4A40-8867-FF6B8D61CFC3} = {1B168C93-E3E3-4939-8EDC-19CE4E041874} {AB1460AF-4BE8-4CC2-AF3B-3473B5A41778} = {35139CB3-610E-4922-98AD-08A5D12BFC35} {F1AAA30B-2829-4410-8A96-F21B88B066B0} = {20CDE085-A7B1-447E-8875-981D8C3DF535} + {37E0EA13-96E7-423E-8C53-CE136C439B54} = {34CFB1D8-6025-4E93-A67F-D94DD3B9198F} + {C4370924-9D72-4859-93C0-AA619BFC583B} = {37E0EA13-96E7-423E-8C53-CE136C439B54} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DC7AD3EC-AB37-497E-925B-DCD5129FE6D3} @@ -726,6 +749,7 @@ Global ..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{81a078a9-97d1-446d-88ed-87f4bb484d91}*SharedItemsImports = 5 ..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{94c58964-01e0-4aa0-af98-5851208d9755}*SharedItemsImports = 5 ..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{9fe36012-8b32-488e-96ad-ba7cedaeeab8}*SharedItemsImports = 13 + ..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{c4370924-9d72-4859-93c0-aa619bfc583b}*SharedItemsImports = 5 ..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{d70b89b9-27bc-45dd-a908-4282f101b409}*SharedItemsImports = 5 ..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{defd229c-0482-4924-8746-73d21b9dab02}*SharedItemsImports = 5 ..\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems*{eb4fcb9f-9670-4b03-9e9e-724aff737fd4}*SharedItemsImports = 5 diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/BaseController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/BaseController.cs index 1a095685bd..a811bea47e 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/BaseController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/BaseController.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class BaseController : Controller { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/CaseCollectionController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/CaseCollectionController.cs index 4a41c0cc10..1624579053 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/CaseCollectionController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/CaseCollectionController.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class CaseCollectionController : BaseController { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/HomeController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/HomeController.cs index 0addac7ddd..e99f645359 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/HomeController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/HomeController.cs @@ -18,11 +18,11 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using Senparc.Weixin.Sample.Net6.Models; -using Senparc.Weixin.Sample.Net6.Models.VD; +using Senparc.Weixin.Sample.Net8.Models; +using Senparc.Weixin.Sample.Net8.Models.VD; using System.Reflection; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class HomeController : BaseController { 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 index 8121b78116..bb9a476856 100644 --- 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 @@ -11,7 +11,7 @@ using System.Text; using System.Threading.Tasks; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { [Serializable] internal class TestContainerBag1 : BaseContainerBag diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/DocumentController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/DocumentController.cs index 7de595f64c..00e664120f 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/DocumentController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/DocumentController.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; //using Senparc.Weixin.Sample.CommonService.Download; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class DocumentController : BaseController { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/FilterTestController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/FilterTestController.cs index 3ac047323a..e4ff0ed631 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/FilterTestController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/FilterTestController.cs @@ -14,7 +14,7 @@ using System.Web; using Microsoft.AspNetCore.Mvc; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { using Microsoft.AspNetCore.Http; using Senparc.Weixin.MP.MvcExtension; diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/ForTestController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/ForTestController.cs index b57f8ba70f..b1f0f1fceb 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/ForTestController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/ForTestController.cs @@ -9,7 +9,7 @@ using Senparc.CO2NET.AspNet.HttpUtility; using Senparc.CO2NET.HttpUtility; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /// /// 提供给 Senparc.WeixinTests/Utilities/HttpUtility/PostTests.cs使用 diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/PluginsController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/PluginsController.cs index 8671cac834..3ba237b4f2 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/PluginsController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/PluginsController.cs @@ -4,7 +4,7 @@ using System.Web; using Microsoft.AspNetCore.Mvc; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /// /// 插件项目相关: diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/QrCodeController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/QrCodeController.cs index 8aba0e577b..fc3c379436 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/QrCodeController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Tools/QrCodeController.cs @@ -12,7 +12,7 @@ using ZXing; using ZXing.Common; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /// /// 二维码批量下载 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 index 3d22acf905..8abb09f248 100644 --- 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 @@ -37,7 +37,7 @@ using System.Linq; using Microsoft.AspNetCore.Http; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /// /// 消息模拟器 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 index 5865d6cac4..df2a9ccdff 100644 --- 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 @@ -3,10 +3,10 @@ using Senparc.Weixin.MP.AdvancedAPIs; using Senparc.Weixin.MP.AdvancedAPIs.Analysis; using Senparc.Weixin.MP.Containers; -using Senparc.Weixin.Sample.Net6.Models.VD; +using Senparc.Weixin.Sample.Net8.Models.VD; using System; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public enum AnalysisType { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/AsyncMethodsController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/AsyncMethodsController.cs index 3af7f0ce71..7bdbf859b3 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/AsyncMethodsController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/AsyncMethodsController.cs @@ -9,7 +9,7 @@ using System; using System.Threading.Tasks; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class AsyncMethodsController : BaseController { 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 index 9e40471981..025321c615 100644 --- 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 @@ -9,7 +9,7 @@ using Senparc.Weixin.MP.Containers; using Microsoft.AspNetCore.Http; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /// /// 设备能力测试 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 index 2bca21b1ad..895cf44af5 100644 --- 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 @@ -23,7 +23,7 @@ using Senparc.Weixin.MP; using Senparc.Weixin.Sample.CommonService.Utilities; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class MediaController : BaseController { 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 index aa80ae327d..733f644245 100644 --- 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 @@ -27,7 +27,7 @@ using Senparc.CO2NET.HttpUtility; using Senparc.Weixin.MP; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class MenuController : BaseController { 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 index 04aa2c80a9..e772cc9aa7 100644 --- 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 @@ -25,7 +25,7 @@ using System.Text; using Senparc.Weixin.MP; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class OAuth2Controller : BaseController { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/SubscribeMsgController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/SubscribeMsgController.cs index c10bb95179..2ec71ceadd 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/SubscribeMsgController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/SubscribeMsgController.cs @@ -10,7 +10,7 @@ using Senparc.Weixin.HttpUtility; using Senparc.Weixin.MP.AdvancedAPIs; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class SubscribeMsgController : BaseController { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WebSocketController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WebSocketController.cs index faa424fd03..8ab65586b1 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WebSocketController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WebSocketController.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Threading.Tasks; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class WebSocketController : BaseController { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinAsyncController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinAsyncController.cs index 3a014e1665..a266a4a2dd 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinAsyncController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinAsyncController.cs @@ -44,7 +44,7 @@ //using Senparc.NeuChar.MessageHandlers; //using Senparc.Weixin.MP; -//namespace Senparc.Weixin.Sample.Net6.Controllers +//namespace Senparc.Weixin.Sample.Net8.Controllers //{ // /// // /// 此Controller为异步Controller(Action),使用异步线程处理并发请求。 diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinController.cs index 94c017f1f8..5b329b2e34 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinController.cs @@ -31,7 +31,7 @@ 2. 目前 Senparc.Weixin SDK 已经全面转向异步方法驱动, using System.Threading; using System.Threading.Tasks; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { using Senparc.CO2NET.AspNet.HttpUtility; using Senparc.CO2NET.Cache; diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinController_OldPost.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinController_OldPost.cs index b13cbc5368..e1af3c747b 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinController_OldPost.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinController_OldPost.cs @@ -20,7 +20,7 @@ using Senparc.Weixin.MP.MessageHandlers; using Senparc.Weixin.Sample.CommonService; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { using Senparc.CO2NET.Utilities; using Senparc.NeuChar; diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinJSSDKController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinJSSDKController.cs index b79dca69ce..9fa3d55cb9 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinJSSDKController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/MP/WeixinJSSDKController.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http; using System.Threading.Tasks; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /// /// JSSDK的演示 diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Open/OpenController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Open/OpenController.cs index b5aeb9982b..e505a16e02 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Open/OpenController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Open/OpenController.cs @@ -29,7 +29,7 @@ using Senparc.CO2NET.AspNet.HttpUtility; using Senparc.Weixin.AspNet.MvcExtension; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /// /// 第三方开放平台演示 diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Open/OpenOAuthController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Open/OpenOAuthController.cs index 8279e2705f..1c84db7aee 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Open/OpenOAuthController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Open/OpenOAuthController.cs @@ -13,7 +13,7 @@ using Senparc.Weixin.Open.ComponentAPIs; using Senparc.Weixin.Open.Containers; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class OpenOAuthController : BaseController diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayApiV3Controller.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayApiV3Controller.cs index 1cbb994d0d..13b29c22b4 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayApiV3Controller.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayApiV3Controller.cs @@ -22,8 +22,8 @@ using Senparc.Weixin.Entities; using Senparc.Weixin.Exceptions; using Senparc.Weixin.Helpers; -using Senparc.Weixin.Sample.Net6.Controllers; -using Senparc.Weixin.Sample.Net6.Models; +using Senparc.Weixin.Sample.Net8.Controllers; +using Senparc.Weixin.Sample.Net8.Models; using Senparc.Weixin.TenPayV3; using Senparc.Weixin.TenPayV3.Apis; using Senparc.Weixin.TenPayV3.Apis.BasePay; @@ -40,14 +40,14 @@ using Senparc.Weixin.MP; -using Senparc.Weixin.Sample.Net6.Filters; +using Senparc.Weixin.Sample.Net8.Filters; using Senparc.Weixin.MP.AdvancedAPIs; using Senparc.Weixin.Sample.CommonService.TemplateMessage; using Senparc.Weixin.Sample.CommonService.Utilities; using Senparc.CO2NET.HttpUtility; //DPBMARK_END -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { public class TenPayApiV3Controller : BaseController { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayController.cs index 27ad6521fb..772d439ca4 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayController.cs @@ -27,7 +27,7 @@ using Senparc.Weixin.MP.Helpers; //DPBMARK_END -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /// /// 根据官方的Webforms Demo改写,所以可以看到直接result +=)之类的用法,实际项目中不提倡这么做。 diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayV3Controller.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayV3Controller.cs index 27d876fe45..612c893d85 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayV3Controller.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/TenPay/TenPayV3Controller.cs @@ -30,7 +30,7 @@ using Senparc.CO2NET.Utilities; using Senparc.Weixin.Exceptions; using Senparc.Weixin.Helpers; -using Senparc.Weixin.Sample.Net6.Models; +using Senparc.Weixin.Sample.Net8.Models; using Senparc.Weixin.TenPay.V3; using System; using System.IO; @@ -48,11 +48,11 @@ using Senparc.Weixin.MP; using Senparc.Weixin.MP.AdvancedAPIs; using Senparc.Weixin.Sample.CommonService.TemplateMessage; -using Senparc.Weixin.Sample.Net6.Filters; +using Senparc.Weixin.Sample.Net8.Filters; //DPBMARK_END -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /* * 友情提示:微信支付正式上线之前,请进行沙箱测试! diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/ThirdPartyAuth/ThirdPartyAuthController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/ThirdPartyAuth/ThirdPartyAuthController.cs index bd9861d4ca..9b66549ae6 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/ThirdPartyAuth/ThirdPartyAuthController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/ThirdPartyAuth/ThirdPartyAuthController.cs @@ -18,7 +18,7 @@ using Senparc.CO2NET.AspNet.HttpUtility; using Senparc.Weixin.AspNet.MvcExtension; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /// /// 企业号对接测试 diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Work/WorkController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Work/WorkController.cs index 83ac90dab9..164f32be2b 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Work/WorkController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/Work/WorkController.cs @@ -38,7 +38,7 @@ 2. 目前 Senparc.Weixin SDK 已经全面转向异步方法驱动, using System.Threading; using System.Threading.Tasks; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /// /// 企业号对接测试 diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/WxOpen/WxOpenController.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/WxOpen/WxOpenController.cs index 2f40c2acff..e1279c03e4 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/WxOpen/WxOpenController.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Controllers/Weixin/WxOpen/WxOpenController.cs @@ -40,7 +40,7 @@ 2. 目前 Senparc.Weixin SDK 已经全面转向异步方法驱动, using Senparc.Weixin.AspNet.MvcExtension; using System.Threading; -namespace Senparc.Weixin.Sample.Net6.Controllers.WxOpen +namespace Senparc.Weixin.Sample.Net8.Controllers.WxOpen { /// /// 微信小程序Controller diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Filters/CustomOAuthAttribute.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Filters/CustomOAuthAttribute.cs index b8f493aa74..7bb86b51a7 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Filters/CustomOAuthAttribute.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Filters/CustomOAuthAttribute.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Senparc.Weixin.MP.MvcExtension; -namespace Senparc.Weixin.Sample.Net6.Filters +namespace Senparc.Weixin.Sample.Net8.Filters { /// /// OAuth自动验证,可以加在Action或整个Controller上 diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/ErrorViewModel.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/ErrorViewModel.cs index a84eb9d783..7d092e1dda 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/ErrorViewModel.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/ErrorViewModel.cs @@ -1,6 +1,6 @@ using System; -namespace Senparc.Weixin.Sample.Net6.Models +namespace Senparc.Weixin.Sample.Net8.Models { public class ErrorViewModel { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/ProductModel.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/ProductModel.cs index 8b2ef0a598..b8ac72a4a9 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/ProductModel.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/ProductModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; -namespace Senparc.Weixin.Sample.Net6.Models +namespace Senparc.Weixin.Sample.Net8.Models { /// /// 商品实体类 diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/VD/AnalysisVD.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/VD/AnalysisVD.cs index 015ba96707..ef08792fa1 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/VD/AnalysisVD.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/VD/AnalysisVD.cs @@ -4,9 +4,9 @@ using System.Linq; using Senparc.Weixin.MP.Entities; using Senparc.Weixin.Entities; -using Senparc.Weixin.Sample.Net6.Controllers; +using Senparc.Weixin.Sample.Net8.Controllers; -namespace Senparc.Weixin.Sample.Net6.Models.VD +namespace Senparc.Weixin.Sample.Net8.Models.VD { public class Analysis_IndexVD { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/VD/HomeVD.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/VD/HomeVD.cs index 533b3ff28c..a0fe969228 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/VD/HomeVD.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Models/VD/HomeVD.cs @@ -4,7 +4,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; -namespace Senparc.Weixin.Sample.Net6.Models.VD +namespace Senparc.Weixin.Sample.Net8.Models.VD { public class Home_IndexVD { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Program.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Program.cs index f23ab768b0..298f53e466 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Program.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Program.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Hosting; using Senparc.CO2NET; -namespace Senparc.Weixin.Sample.Net6 +namespace Senparc.Weixin.Sample.Net8 { public class Program { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Senparc.Weixin.Sample.net8.csproj b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Senparc.Weixin.Sample.net8.csproj index c559063298..07c40006f4 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Senparc.Weixin.Sample.net8.csproj +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Senparc.Weixin.Sample.net8.csproj @@ -2,7 +2,7 @@ net8.0 - 6.10.0 + 6.11.0 enable 35e58786-0820-4cde-b1ff-f4c6198d00f7 false diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Startup.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Startup.cs index 30fdf058b2..2847bac190 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Startup.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Startup.cs @@ -31,7 +31,7 @@ using Senparc.Weixin.Sample.CommonService.MessageHandlers.WebSocket; using Senparc.Weixin.Sample.CommonService.WorkMessageHandlers; using Senparc.Weixin.Sample.CommonService.WxOpenMessageHandler; -using Senparc.Weixin.Sample.Net6.WebSocket.Hubs; +using Senparc.Weixin.Sample.Net8.WebSocket.Hubs; using Senparc.Weixin.TenPay; using Senparc.Weixin.TenPayV3; using Senparc.Weixin.Work; @@ -42,7 +42,7 @@ using System.IO; using System.Text; -namespace Senparc.Weixin.Sample.Net6 +namespace Senparc.Weixin.Sample.Net8 { public class Startup { diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/Analysis/Index.cshtml b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/Analysis/Index.cshtml index 673d742cbf..6e479c5070 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/Analysis/Index.cshtml +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/Analysis/Index.cshtml @@ -1,4 +1,4 @@ -@model Senparc.Weixin.Sample.Net6.Models.VD.Analysis_IndexVD +@model Senparc.Weixin.Sample.Net8.Models.VD.Analysis_IndexVD @*//DPBMARK_FILE MP*@ @{ diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/Home/Index.cshtml b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/Home/Index.cshtml index 72e64a2dbd..b918eb6100 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/Home/Index.cshtml +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/Home/Index.cshtml @@ -1,4 +1,4 @@ -@model Senparc.Weixin.Sample.Net6.Models.VD.Home_IndexVD +@model Senparc.Weixin.Sample.Net8.Models.VD.Home_IndexVD @{ ViewBag.Title = "微信SDK,微信公众平台,小程序SDK - Senparc.Weixin SDK - 公众号 企业号 开放平台 盛派微信号"; diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/JsApi.cshtml b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/JsApi.cshtml index bd589f5be9..3e1c24873c 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/JsApi.cshtml +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/JsApi.cshtml @@ -1,4 +1,4 @@ -@using Senparc.Weixin.Sample.Net6.Models +@using Senparc.Weixin.Sample.Net8.Models @*DPBMARK_FILE TenPay*@ diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/ProductItem.cshtml b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/ProductItem.cshtml index 5b3d5336f1..c516116aa5 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/ProductItem.cshtml +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/ProductItem.cshtml @@ -1,4 +1,4 @@ -@model Senparc.Weixin.Sample.Net6.Models.ProductModel +@model Senparc.Weixin.Sample.Net8.Models.ProductModel @*DPBMARK_FILE TenPay*@ @{ Layout = null; diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/ProductList.cshtml b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/ProductList.cshtml index c647f9711c..370528c1d4 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/ProductList.cshtml +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayApiV3/ProductList.cshtml @@ -1,4 +1,4 @@ -@model List +@model List @*DPBMARK_FILE TenPay*@ @{ Layout = null; diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/H5Pay.cshtml b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/H5Pay.cshtml index a3f6ff79c9..cc91f4cfa5 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/H5Pay.cshtml +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/H5Pay.cshtml @@ -1,4 +1,4 @@ -@using Senparc.Weixin.Sample.Net6.Models +@using Senparc.Weixin.Sample.Net8.Models @*DPBMARK_FILE TenPay*@ @{ Layout = null; diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/H5PaySuccess.cshtml b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/H5PaySuccess.cshtml index 725e50cd50..faac19d0d0 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/H5PaySuccess.cshtml +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/H5PaySuccess.cshtml @@ -1,4 +1,4 @@ -@using Senparc.Weixin.Sample.Net6.Models +@using Senparc.Weixin.Sample.Net8.Models @*DPBMARK_FILE TenPay*@ @{ Layout = null; diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/JsApi.cshtml b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/JsApi.cshtml index d3c42e27d6..ab6aa0b101 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/JsApi.cshtml +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/JsApi.cshtml @@ -1,4 +1,4 @@ -@using Senparc.Weixin.Sample.Net6.Models +@using Senparc.Weixin.Sample.Net8.Models @*DPBMARK_FILE TenPay*@ diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/ProductItem.cshtml b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/ProductItem.cshtml index 7a4c1d49d0..47867fbbea 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/ProductItem.cshtml +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/ProductItem.cshtml @@ -1,4 +1,4 @@ -@model Senparc.Weixin.Sample.Net6.Models.ProductModel +@model Senparc.Weixin.Sample.Net8.Models.ProductModel @*DPBMARK_FILE TenPay*@ @{ Layout = null; diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/ProductList.cshtml b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/ProductList.cshtml index 65503249c6..9d6d7dfca4 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/ProductList.cshtml +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/TenPayV3/ProductList.cshtml @@ -1,4 +1,4 @@ -@model List +@model List @*DPBMARK_FILE TenPay*@ @{ Layout = null; diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/_ViewImports.cshtml b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/_ViewImports.cshtml index c76b91980c..bc42e363b0 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/_ViewImports.cshtml +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using Senparc.Weixin.Sample.Net6 -@using Senparc.Weixin.Sample.Net6.Models +@using Senparc.Weixin.Sample.Net8 +@using Senparc.Weixin.Sample.Net8.Models @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/WebSocket/Hubs/SenparcHub.cs b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/WebSocket/Hubs/SenparcHub.cs index cbf904b743..75211bd4ab 100644 --- a/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/WebSocket/Hubs/SenparcHub.cs +++ b/Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/WebSocket/Hubs/SenparcHub.cs @@ -4,7 +4,7 @@ using Senparc.WebSocket.SignalR; using System.Threading.Tasks; -namespace Senparc.Weixin.Sample.Net6.WebSocket.Hubs +namespace Senparc.Weixin.Sample.Net8.WebSocket.Hubs { public class SenparcHub : SenparcWebSocketHubBase { diff --git a/Samples/MP/Senparc.Weixin.Sample.MP.Simple/Program.cs b/Samples/MP/Senparc.Weixin.Sample.MP.Simple/Program.cs index c6d5fe1bea..02334e9b60 100644 --- a/Samples/MP/Senparc.Weixin.Sample.MP.Simple/Program.cs +++ b/Samples/MP/Senparc.Weixin.Sample.MP.Simple/Program.cs @@ -1,3 +1,6 @@ +using System.Text; +using Senparc.Weixin.MP.AdvancedAPIs.MerChant; + var builder = WebApplication.CreateBuilder(args); // Add services to the container. @@ -46,6 +49,23 @@ #endregion +#region ߼ӿڵʾ + +app.MapGroup("/").MapGet("/TryApi", async () => +{ + //ʾȡѹעû OpenIdȡĵһ + + var weixinSetting = Senparc.Weixin.Config.SenparcWeixinSetting.MpSetting; + var result = new StringBuilder(); + var users = await Senparc.Weixin.MP.AdvancedAPIs.UserApi.GetAsync(weixinSetting.WeixinAppId, null); + + Console.WriteLine($"չʾǰ {users.count} OpenId"); + + return users.data.openid; +}); + +#endregion + // Configure the HTTP request pipeline. if (!app.Environment.IsDevelopment()) { diff --git a/Samples/MP/Senparc.Weixin.Sample.MP.Simple/Senparc.Weixin.Sample.MP.Simple.csproj b/Samples/MP/Senparc.Weixin.Sample.MP.Simple/Senparc.Weixin.Sample.MP.Simple.csproj index a01355fd89..f79113ec1c 100644 --- a/Samples/MP/Senparc.Weixin.Sample.MP.Simple/Senparc.Weixin.Sample.MP.Simple.csproj +++ b/Samples/MP/Senparc.Weixin.Sample.MP.Simple/Senparc.Weixin.Sample.MP.Simple.csproj @@ -15,13 +15,13 @@ + + + - - - - + - + diff --git a/Samples/Work/Senparc.Weixin.Sample.Work/Controllers/WorkController.cs b/Samples/Work/Senparc.Weixin.Sample.Work/Controllers/WorkController.cs index a3aa7c8719..9408cc24c0 100644 --- a/Samples/Work/Senparc.Weixin.Sample.Work/Controllers/WorkController.cs +++ b/Samples/Work/Senparc.Weixin.Sample.Work/Controllers/WorkController.cs @@ -31,7 +31,7 @@ 2. 目前 Senparc.Weixin SDK 已经全面转向异步方法驱动, using Senparc.Weixin.Work; using Senparc.Weixin.Work.Entities; -namespace Senparc.Weixin.Sample.Net6.Controllers +namespace Senparc.Weixin.Sample.Net8.Controllers { /// /// 企业号对接测试 diff --git a/src/Senparc.WebSocket/src/Senparc.WebSocket/Senparc.WebSocket/readme.md b/src/Senparc.WebSocket/src/Senparc.WebSocket/Senparc.WebSocket/readme.md index cb10bad636..68ea6168a8 100644 --- a/src/Senparc.WebSocket/src/Senparc.WebSocket/Senparc.WebSocket/readme.md +++ b/src/Senparc.WebSocket/src/Senparc.WebSocket/Senparc.WebSocket/readme.md @@ -1,6 +1,3 @@ ## .csproj 文件说明 -> Senparc.WebSocket.netcore3.csproj:提供给 Senparc.Weixin.Sample.NetCore3.sln 使用的项目文件(.NET Core 3.1)。
-> Senparc.WebSocket.net6.csproj:提供给 Senparc.Weixin.MP.Sample.Net6.sln 使用的项目文件(.NET 6)。
-> Senparc.WebSocket.net7.csproj:提供给 Senparc.Weixin.MP.Sample.Net7.sln 使用的项目文件(.NET 7)。
> Senparc.WebSocket.net8.csproj:提供给 Senparc.Weixin.MP.Sample.Net8.sln 使用的项目文件(.NET 8)。
\ No newline at end of file diff --git a/src/Senparc.Weixin.All/Senparc.Weixin.All.csproj b/src/Senparc.Weixin.All/Senparc.Weixin.All.csproj index 9cc796e802..e02ff9402e 100644 --- a/src/Senparc.Weixin.All/Senparc.Weixin.All.csproj +++ b/src/Senparc.Weixin.All/Senparc.Weixin.All.csproj @@ -3,7 +3,7 @@ net8.0 enable enable - 2024.6.26.1 + 2024.6.29 10.0 Senparc.Weixin.All Senparc.Weixin.All @@ -41,6 +41,7 @@ v2024.6.6 创世 v2024.6.25 更新最新 MP、WxOpen v2024.6.26 更新全自动注册方法 UseSenparcWeixin() + v2024.6.30 完善 UseSenparcWeixin() 方法 https://github.com/JeffreySu/WeiXinMPSDK diff --git a/src/Senparc.Weixin.All/WeixinEntensions.cs b/src/Senparc.Weixin.All/WeixinEntensions.cs index 7f7ed7cb77..2b8c640079 100644 --- a/src/Senparc.Weixin.All/WeixinEntensions.cs +++ b/src/Senparc.Weixin.All/WeixinEntensions.cs @@ -1,22 +1,48 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +#region Apache License Version 2.0 +/*---------------------------------------------------------------- + +Copyright 2024 Jeffrey Su & Suzhou Senparc Network Technology Co.,Ltd. + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file +except in compliance with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under the +License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, +either express or implied. See the License for the specific language governing permissions +and limitations under the License. + +Detail: https://github.com/JeffreySu/WeiXinMPSDK/blob/master/license.md + +----------------------------------------------------------------*/ +#endregion Apache License Version 2.0 + +/*---------------------------------------------------------------- + Copyright (C) 2024 Senparc + + 文件名:WeixinEntensions.cs + 文件功能描述:微信完整包的扩展方法 + + + 创建标识:Senparc - 20240625 + + 修改标识:Senparc - 20240630 + 修改描述:v2024.6.30 完善 UseSenparcWeixin() 方法 + +----------------------------------------------------------------*/ + +using Microsoft.AspNetCore.Builder; +using Senparc.CO2NET; +using Senparc.CO2NET.Cache; +using Senparc.CO2NET.Extensions; using Senparc.CO2NET.RegisterServices; using Senparc.Weixin.Entities; -using Senparc.Weixin; using Senparc.Weixin.MP; -using Senparc.Weixin.WxOpen; -using Senparc.Weixin.Work; -using Senparc.Weixin.Open; using Senparc.Weixin.TenPay; using Senparc.Weixin.TenPayV3; -using Senparc.CO2NET; -using Senparc.CO2NET.Extensions; -using Microsoft.AspNetCore.Builder; -using Senparc.CO2NET.Cache; -using Microsoft.CodeAnalysis.CSharp.Syntax; +using Senparc.Weixin.Work; +using Senparc.Weixin.WxOpen; namespace Senparc.Weixin.All @@ -32,9 +58,13 @@ public static class WeixinEntensions /// 是否从 appsettings.json 中自动注册所有平台(Open 平台除外) /// public static IRegisterService UseSenparcWeixin(this IRegisterService registerService, SenparcWeixinSetting senparcWeixinSetting, Action registerConfigure - , bool autoRegisterAllPlatforms + , bool autoRegisterAllPlatforms, IServiceProvider serviceProvider ) { + registerService.UseSenparcWeixin(senparcWeixinSetting, registerConfigure, serviceProvider); + + senparcWeixinSetting ??= Senparc.Weixin.Config.SenparcWeixinSetting; + if (autoRegisterAllPlatforms) { //自动注册所有板块 @@ -50,8 +80,6 @@ public static IRegisterService UseSenparcWeixin(this IRegisterService registerSe } } - registerService.UseSenparcWeixin(senparcWeixinSetting, registerConfigure); - return registerService; } @@ -68,10 +96,12 @@ public static IRegisterService UseSenparcWeixin(this IApplicationBuilder app, ) { //进行全局注册 - var registerService = app.UseSenparcWeixin(env, senparcSetting, senparcWeixinSetting, globalRegisterConfigure, weixinRegisterConfigure, autoRegisterAllPlatforms, autoScanExtensionCacheStrategies); + var registerService = Senparc.Weixin.AspNet.WeixinRegister.UseSenparcWeixin(app, env, senparcSetting, senparcWeixinSetting, globalRegisterConfigure, weixinRegisterConfigure, autoScanExtensionCacheStrategies, extensionCacheStrategiesFunc, + useSenparcWeixin: false/* 下方手动执行 */); //进行自动注册 - registerService.UseSenparcWeixin(senparcWeixinSetting, weixinRegisterConfigure, autoRegisterAllPlatforms); + //senparcWeixinSetting ??= Senparc.Weixin.Config.SenparcWeixinSetting; + registerService.UseSenparcWeixin(senparcWeixinSetting, weixinRegisterConfigure, autoRegisterAllPlatforms, app.ApplicationServices); return registerService; } diff --git a/src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net8.csproj b/src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net8.csproj index f1426c53be..42505c9087 100644 --- a/src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net8.csproj +++ b/src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net8.csproj @@ -1,92 +1,93 @@ - - net462;netstandard2.0;netstandard2.1 - 1.2.2 - Senparc.Weixin.AspNet - Senparc.Weixin.AspNet - - true - + + net462;netstandard2.0;netstandard2.1 + 1.2.3 + Senparc.Weixin.AspNet + Senparc.Weixin.AspNet + + true + 微信 SDK - Senparc.Weixin.AspNet 模块 Senparc.Weixin SDK 开源项目: https://github.com/JeffreySu/WeiXinMPSDK - Senparc Copyright © 2004~2024 - 微信,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,MVC,System.Web.Mvc - Jeffrey Su - Senparc - Apache-2.0 - https://github.com/JeffreySu/WeiXinMPSDK - Senparc.Weixin.AspNet.dll - 微信 SDK for .NET / C# - https://github.com/JeffreySu/WeiXinMPSDK - icon.jpg - + Senparc Copyright © 2004~2024 + 微信,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,MVC,System.Web.Mvc + Jeffrey Su + Senparc + Apache-2.0 + https://github.com/JeffreySu/WeiXinMPSDK + Senparc.Weixin.AspNet.dll + 微信 SDK for .NET / C# + https://github.com/JeffreySu/WeiXinMPSDK + icon.jpg + v0.1.0 创世 v0.7.4 1、优化 UseSenparcWeixin() 2、添加 WeixinResult、FixWeixinBugWeixinResult v0.8.5.2 修复证书传入参数可能为 null 的问题 v1.0.0 发布正式版;UseSenparcWeixin() 方法添加 autoCreateApi 参数,用于设置是自动生成微信接口的 API,默认为关闭 - - https://github.com/JeffreySu/WeiXinMPSDK - Senparc.Weixin.AspNet - - - ..\BuildOutPut - $(DefineConstants);RELEASE - - - ..\BuildOutPut - $(DefineConstants);RELEASE - ..\BuildOutPut\Senparc.Weixin.AspNet.xml - true - pdbonly - prompt - MinimumRecommendedRules.ruleset - - - ..\BuildOutPut\ - ..\BuildOutPut\net462\Senparc.Weixin.AspNet.xml - - - ..\BuildOutPut\ - ..\BuildOutPut\netstandard2.0\Senparc.Weixin.AspNet.xml - - - ..\BuildOutPut\ - ..\BuildOutPut\netstandard2.1\Senparc.Weixin.AspNet.xml - - - ..\BuildOutPut\ - ..\BuildOutPut\net8.0\Senparc.Weixin.AspNet.xml - - - - - - - - - - - - - - - - - - - 2.2.0 - - - 2.2.0 - - - - - - + v1.2.3 UseSenparcWeixin() 方法添加 useSenparcWeixin 参数,用于指定是否自动执行 register.UseSenparcWeixin() 方法 + + https://github.com/JeffreySu/WeiXinMPSDK + Senparc.Weixin.AspNet + + + ..\BuildOutPut + $(DefineConstants);RELEASE + + + ..\BuildOutPut + $(DefineConstants);RELEASE + ..\BuildOutPut\Senparc.Weixin.AspNet.xml + true + pdbonly + prompt + MinimumRecommendedRules.ruleset + + + ..\BuildOutPut\ + ..\BuildOutPut\net462\Senparc.Weixin.AspNet.xml + + + ..\BuildOutPut\ + ..\BuildOutPut\netstandard2.0\Senparc.Weixin.AspNet.xml + + + ..\BuildOutPut\ + ..\BuildOutPut\netstandard2.1\Senparc.Weixin.AspNet.xml + + + ..\BuildOutPut\ + ..\BuildOutPut\net8.0\Senparc.Weixin.AspNet.xml + + + + + + + + + + + + + + + + + + + 2.2.0 + + + 2.2.0 + + + + + + \ No newline at end of file diff --git a/src/Senparc.Weixin.AspNet/WeixinRegister.cs b/src/Senparc.Weixin.AspNet/WeixinRegister.cs index 38ffa19f11..b68bcf836e 100644 --- a/src/Senparc.Weixin.AspNet/WeixinRegister.cs +++ b/src/Senparc.Weixin.AspNet/WeixinRegister.cs @@ -33,6 +33,9 @@ and limitations under the License. 修改标识:Senparc - 20230614 修改描述:v6.15.10 UseSenparcWeixin() 方法添加 autoCreateApi 参数,用于设置是自动生成微信接口的 API,默认为关闭 + 修改标识:Senparc - 20240629 + 修改描述:v1.2.3 UseSenparcWeixin() 方法添加 useSenparcWeixin 参数,用于指定是否自动执行 register.UseSenparcWeixin() 方法 + ----------------------------------------------------------------*/ @@ -65,6 +68,7 @@ public static class WeixinRegister /// Senparc.Weixin 注册委托 /// 是否启用自动扩展缓存扫描 /// 扩展内存委托 + /// 是否自动执行 register.UseSenparcWeixin() 方法 /// public static IRegisterService UseSenparcWeixin(this IApplicationBuilder app, Microsoft.Extensions.Hosting.IHostEnvironment/*IHostingEnvironment*/ env, @@ -73,14 +77,18 @@ public static IRegisterService UseSenparcWeixin(this IApplicationBuilder app, Action weixinRegisterConfigure, //CO2NET 全局设置 bool autoScanExtensionCacheStrategies = false, - Func> extensionCacheStrategiesFunc = null + Func> extensionCacheStrategiesFunc = null, + bool useSenparcWeixin = true ) { //注册 CO2NET 全局 var register = app.UseSenparcGlobal(env, senparcSetting, globalRegisterConfigure, autoScanExtensionCacheStrategies, extensionCacheStrategiesFunc); - //注册微信 - register.UseSenparcWeixin(senparcWeixinSetting, weixinRegisterConfigure, app.ApplicationServices); + if (useSenparcWeixin) + { + //注册微信 + register.UseSenparcWeixin(senparcWeixinSetting, weixinRegisterConfigure, app.ApplicationServices); + } return register; } diff --git a/src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.net8.csproj b/src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.net8.csproj index f457f27cb8..8f1485aabe 100644 --- a/src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.net8.csproj +++ b/src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.net8.csproj @@ -1,7 +1,7 @@ net462;netstandard2.0;netstandard2.1;netcoreapp3.1;net8.0 - 1.2.2 + 1.2.3 Senparc.Weixin.MP.Middleware Senparc.Weixin.MP.Middleware true diff --git a/src/Senparc.Weixin.Work.Middleware/Senparc.Weixin.Work.Middleware.net8.csproj b/src/Senparc.Weixin.Work.Middleware/Senparc.Weixin.Work.Middleware.net8.csproj index dbb02d67de..00b1333f2b 100644 --- a/src/Senparc.Weixin.Work.Middleware/Senparc.Weixin.Work.Middleware.net8.csproj +++ b/src/Senparc.Weixin.Work.Middleware/Senparc.Weixin.Work.Middleware.net8.csproj @@ -1,7 +1,7 @@ net462;netstandard2.0;netstandard2.1;netcoreapp3.1;net8.0 - 1.2.2 + 1.2.3 Senparc.Weixin.Work.Middleware Senparc.Weixin.Work.Middleware true diff --git a/src/Senparc.Weixin.WxOpen.Middleware/Senparc.Weixin.WxOpen.Middleware.net8.csproj b/src/Senparc.Weixin.WxOpen.Middleware/Senparc.Weixin.WxOpen.Middleware.net8.csproj index 1e6fe61519..62edb8fc27 100644 --- a/src/Senparc.Weixin.WxOpen.Middleware/Senparc.Weixin.WxOpen.Middleware.net8.csproj +++ b/src/Senparc.Weixin.WxOpen.Middleware/Senparc.Weixin.WxOpen.Middleware.net8.csproj @@ -1,7 +1,7 @@ net462;netstandard2.0;netstandard2.1;netcoreapp3.1;net8.0 - 1.2.2 + 1.2.3 Senparc.Weixin.WxOpen.Middleware Senparc.Weixin.WxOpen.Middleware true