Skip to content

Commit

Permalink
Merge pull request #3040 from JeffreySu/Developer
Browse files Browse the repository at this point in the history
Developer
  • Loading branch information
JeffreySu authored Jun 28, 2024
2 parents 253aa09 + 627d4e9 commit 8d8c452
Show file tree
Hide file tree
Showing 65 changed files with 259 additions and 185 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
28 changes: 26 additions & 2 deletions Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// 提供给 Senparc.WeixinTests/Utilities/HttpUtility/PostTests.cs使用
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Web;
using Microsoft.AspNetCore.Mvc;

namespace Senparc.Weixin.Sample.Net6.Controllers
namespace Senparc.Weixin.Sample.Net8.Controllers
{
/// <summary>
/// 插件项目相关:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
using ZXing;
using ZXing.Common;

namespace Senparc.Weixin.Sample.Net6.Controllers
namespace Senparc.Weixin.Sample.Net8.Controllers
{
/// <summary>
/// 二维码批量下载
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
using System.Linq;
using Microsoft.AspNetCore.Http;

namespace Senparc.Weixin.Sample.Net6.Controllers
namespace Senparc.Weixin.Sample.Net8.Controllers
{
/// <summary>
/// 消息模拟器
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// 设备能力测试
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
//using Senparc.NeuChar.MessageHandlers;
//using Senparc.Weixin.MP;

//namespace Senparc.Weixin.Sample.Net6.Controllers
//namespace Senparc.Weixin.Sample.Net8.Controllers
//{
// /// <summary>
// /// 此Controller为异步Controller(Action),使用异步线程处理并发请求。
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using Microsoft.AspNetCore.Http;
using System.Threading.Tasks;

namespace Senparc.Weixin.Sample.Net6.Controllers
namespace Senparc.Weixin.Sample.Net8.Controllers
{
/// <summary>
/// JSSDK的演示
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// 第三方开放平台演示
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
using Senparc.Weixin.MP.Helpers;
//DPBMARK_END

namespace Senparc.Weixin.Sample.Net6.Controllers
namespace Senparc.Weixin.Sample.Net8.Controllers
{
/// <summary>
/// 根据官方的Webforms Demo改写,所以可以看到直接result +=)之类的用法,实际项目中不提倡这么做。
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
{
/*
* 友情提示:微信支付正式上线之前,请进行沙箱测试!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// 企业号对接测试
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// 企业号对接测试
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// 微信小程序Controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// OAuth自动验证,可以加在Action或整个Controller上
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Senparc.Weixin.Sample.Net6.Models
namespace Senparc.Weixin.Sample.Net8.Models
{
public class ErrorViewModel
{
Expand Down
Loading

0 comments on commit 8d8c452

Please sign in to comment.