Skip to content

Commit

Permalink
Merge pull request #3052 from JeffreySu/Developer
Browse files Browse the repository at this point in the history 
Developer
  • Loading branch information
@JeffreySu
JeffreySu authored Jul 30, 2024
2 parents 90e042e + 71a851a commit 28bbe96
Show file tree
Hide file tree
Showing 55 changed files with 2,447 additions and 135 deletions.
2 changes: 1 addition & 1 deletion ...es/All/Senparc.Weixin.Sample.CommonService/Senparc.Weixin.Net8Sample.CommonService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<ItemGroup>
<PackageReference Include="Senparc.AI.Agents" Version="0.1.3-beta1" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.16.3-beta1" />
<PackageReference Include="Senparc.NeuChar" Version="2.4.2" />
<PackageReference Include="Senparc.NeuChar" Version="2.4.3" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
Expand Down
6 changes: 3 additions & 3 deletions Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Senparc.Weixin.Sample.net8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Senparc.AI.Agents" Version="0.1.3-beta1" />
<PackageReference Include="Senparc.AI.Kernel" Version="0.16.3-beta1" />
<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.5.3" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.4.2" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.4.2" />
<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.6.0" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.4.3" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.5.0" />

<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
Expand Down
4 changes: 2 additions & 2 deletions Samples/All/net8-mvc/Senparc.Weixin.Sample.Net8/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void ConfigureServices(IServiceCollection services)
* https://github.com/Senparc/Senparc.CO2NET/blob/master/Sample/Senparc.CO2NET.Sample.netcore/Startup.cs
*/

services.AddSenparcWeixinServices(Configuration, Env)//Senparc.Weixin 注册（必须）
services.AddSenparcWeixin(Configuration, Env)//Senparc.Weixin 注册（必须）
.AddSenparcWebSocket<CustomNetCoreWebSocketMessageHandler>() //Senparc.WebSocket 注册（按需）
.AddSenparcAI(Configuration) //注册 Senparc.AI，提供 AI 能力（可选）
;
Expand Down Expand Up @@ -290,7 +290,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env,
//注册最新微信支付版本（V3）（可注册多个）
.RegisterTenpayV3(senparcWeixinSetting.Value, "【盛派网络小助手】公众号")//记录到同一个 SenparcWeixinSettingItem 对象中
/* 特别注意：
* 在 services.AddSenparcWeixinServices() 代码中，已经自动为当前的
* 在 services.AddSenparcWeixin() 代码中，已经自动为当前的
* senparcWeixinSetting 对应的TenpayV3 配置进行了 Cert 证书配置，
* 如果此处注册的微信支付信息和默认 senparcWeixinSetting 信息不同，
* 请在 ConfigureServices() 方法中使用 services.AddCertHttpClient()
Expand Down
2 changes: 1 addition & 1 deletion Samples/MP/Senparc.Weixin.Sample.MP.Simple/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#region 添加微信配置（一行代码）

//Senparc.Weixin 注册（必须）
builder.Services.AddSenparcWeixinServices(builder.Configuration);
builder.Services.AddSenparcWeixin(builder.Configuration);

#endregion

Expand Down
2 changes: 1 addition & 1 deletion Samples/MP/Senparc.Weixin.Sample.MP.Simple/Senparc.Weixin.Sample.MP.Simple.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<EmbeddedResource Include="wwwroot\**\*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.Weixin.All" Version="2024.6.29" />
<PackageReference Include="Senparc.Weixin.All" Version="2024.7.29" />
</ItemGroup>
<!-- 此节点为 Sample 共享文件需要而添加，实际项目无需添加 -->
<Import Project="..\..\Shared\Senparc.Weixin.Sample.Shared\Senparc.Weixin.Sample.Shared.projitems" Label="Shared" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/MP/Senparc.Weixin.Sample.MP.Simple/Views/Home/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
说明：
<ol>
<li><code>builder.Services.AddMemoryCache()</code> Senparc.Weixin 支持本机缓存、Redis、Memcached 等多种缓存策略，默认使用本机缓存，此时需要激活本地缓存。</li>
<li><code>builder.Services.AddSenparcWeixinServices(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>builder.Services.AddSenparcWeixin(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>app.UseSenparcWeixin()</code> 方法用于配置和启用 Senparc.Weixin。</li>
</ol>
</p>
Expand Down
2 changes: 1 addition & 1 deletion Samples/MP/Senparc.Weixin.Sample.MP.Simple/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

``` C#
//Senparc.Weixin 注册（必须）
builder.Services.AddSenparcWeixinServices(builder.Configuration);
builder.Services.AddSenparcWeixin(builder.Configuration);
```

``` C#
Expand Down
2 changes: 1 addition & 1 deletion Samples/MP/Senparc.Weixin.Sample.MP/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#region 添加微信配置（一行代码）

//Senparc.Weixin 注册（必须）
builder.Services.AddSenparcWeixinServices(builder.Configuration);
builder.Services.AddSenparcWeixin(builder.Configuration);

#endregion

Expand Down
8 changes: 4 additions & 4 deletions Samples/MP/Senparc.Weixin.Sample.MP/Senparc.Weixin.Sample.MP.net8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.21.2" />
<PackageReference Include="Senparc.Weixin.MP.Middleware" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.14.2" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.6" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.21.5" />
<PackageReference Include="Senparc.Weixin.MP.Middleware" Version="1.2.6" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.14.5" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
2 changes: 1 addition & 1 deletion Samples/MP/Senparc.Weixin.Sample.MP/Views/Home/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
说明：
<ol>
<li><code>builder.Services.AddMemoryCache()</code> Senparc.Weixin 支持本机缓存、Redis、Memcached 等多种缓存策略，默认使用本机缓存，此时需要激活本地缓存。</li>
<li><code>builder.Services.AddSenparcWeixinServices(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>builder.Services.AddSenparcWeixin(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>app.UseSenparcWeixin()</code> 方法用于配置和启用 Senparc.Weixin。</li>
</ol>
</p>
Expand Down
2 changes: 1 addition & 1 deletion Samples/TenPayV2/Senparc.Weixin.Sample.TenPayV2/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
builder.Services.AddMemoryCache();

//Senparc.Weixin 注册（必须）
builder.Services.AddSenparcWeixinServices(builder.Configuration);
builder.Services.AddSenparcWeixin(builder.Configuration);

#endregion

Expand Down
8 changes: 4 additions & 4 deletions Samples/TenPayV2/Senparc.Weixin.Sample.TenPayV2/Senparc.Weixin.Sample.TenPayV2.net8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.21.2" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.14.2" />
<PackageReference Include="Senparc.Weixin.TenPay" Version="1.14.2" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.6" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.21.5" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.14.5" />
<PackageReference Include="Senparc.Weixin.TenPay" Version="1.14.5" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/TenPayV2/Senparc.Weixin.Sample.TenPayV2/Views/Shared/_Partial_01_Register.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
说明：
<ol>
<li><code>builder.Services.AddMemoryCache()</code> Senparc.Weixin 支持本机缓存、Redis、Memcached 等多种缓存策略，默认使用本机缓存，此时需要激活本地缓存。</li>
<li><code>builder.Services.AddSenparcWeixinServices(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>builder.Services.AddSenparcWeixin(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>app.UseSenparcWeixin()</code> 方法用于配置和启用 Senparc.Weixin。</li>
</ol>
</p>
Expand Down
2 changes: 1 addition & 1 deletion Samples/TenPayV3/Senparc.Weixin.Sample.TenPayV3/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#region 添加微信配置（一行代码）

//Senparc.Weixin 注册（必须）
builder.Services.AddSenparcWeixinServices(builder.Configuration);
builder.Services.AddSenparcWeixin(builder.Configuration);

#endregion

Expand Down
8 changes: 4 additions & 4 deletions Samples/TenPayV3/Senparc.Weixin.Sample.TenPayV3/Senparc.Weixin.Sample.TenPayV3.net8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.21.2" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.14.2" />
<PackageReference Include="Senparc.Weixin.TenpayV3" Version="1.4.0" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.6" />
<PackageReference Include="Senparc.Weixin.MP" Version="16.21.5" />
<PackageReference Include="Senparc.Weixin.MP.MVC" Version="7.14.5" />
<PackageReference Include="Senparc.Weixin.TenpayV3" Version="1.4.3" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/TenPayV3/Senparc.Weixin.Sample.TenPayV3/Views/Shared/_Partial_01_Register.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
说明：
<ol>
<li><code>builder.Services.AddMemoryCache()</code> Senparc.Weixin 支持本机缓存、Redis、Memcached 等多种缓存策略，默认使用本机缓存，此时需要激活本地缓存。</li>
<li><code>builder.Services.AddSenparcWeixinServices(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>builder.Services.AddSenparcWeixin(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>app.UseSenparcWeixin()</code> 方法用于配置和启用 Senparc.Weixin。</li>
</ol>
</p>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Work/Senparc.Weixin.Sample.Work/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#region 添加微信配置（一行代码）

//Senparc.Weixin 注册（必须）
builder.Services.AddSenparcWeixinServices(builder.Configuration);
builder.Services.AddSenparcWeixin(builder.Configuration);

#endregion

Expand Down
6 changes: 3 additions & 3 deletions Samples/Work/Senparc.Weixin.Sample.Work/Senparc.Weixin.Sample.Work.net8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.Work" Version="3.21.2" />
<PackageReference Include="Senparc.Weixin.Work.Middleware" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.6" />
<PackageReference Include="Senparc.Weixin.Work" Version="3.21.5" />
<PackageReference Include="Senparc.Weixin.Work.Middleware" Version="1.2.6" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
2 changes: 1 addition & 1 deletion Samples/Work/Senparc.Weixin.Sample.Work/Views/Home/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
说明：
<ol>
<li><code>builder.Services.AddMemoryCache()</code> Senparc.Weixin 支持本机缓存、Redis、Memcached 等多种缓存策略，默认使用本机缓存，此时需要激活本地缓存。</li>
<li><code>builder.Services.AddSenparcWeixinServices(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>builder.Services.AddSenparcWeixin(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>app.UseSenparcWeixin()</code> 方法用于配置和启用 Senparc.Weixin。</li>
</ol>
</p>
Expand Down
2 changes: 1 addition & 1 deletion Samples/WxOpen/Senparc.Weixin.Sample.WxOpen/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#region 添加微信配置（一行代码）

//Senparc.Weixin 注册（必须）
builder.Services.AddSenparcWeixinServices(builder.Configuration);
builder.Services.AddSenparcWeixin(builder.Configuration);

#endregion

Expand Down
8 changes: 4 additions & 4 deletions Samples/WxOpen/Senparc.Weixin.Sample.WxOpen/Senparc.Weixin.Sample.WxOpen.net8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

<!--引用 Nuget 包-->
<ItemGroup>
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.4.0" />
<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.19.0" />
<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="1.2.3" />
<PackageReference Include="Senparc.Weixin.AspNet" Version="1.2.6" />
<PackageReference Include="Senparc.Weixin.TenPayV3" Version="1.4.3" />
<PackageReference Include="Senparc.Weixin.WxOpen" Version="3.19.3" />
<PackageReference Include="Senparc.Weixin.WxOpen.Middleware" Version="1.2.6" />
</ItemGroup>

<!--直接引用源码-->
Expand Down
2 changes: 1 addition & 1 deletion Samples/WxOpen/Senparc.Weixin.Sample.WxOpen/Views/Home/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
说明：
<ol>
<li><code>builder.Services.AddMemoryCache()</code> Senparc.Weixin 支持本机缓存、Redis、Memcached 等多种缓存策略，默认使用本机缓存，此时需要激活本地缓存。</li>
<li><code>builder.Services.AddSenparcWeixinServices(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>builder.Services.AddSenparcWeixin(builder.Configuration)</code> 用于完成 Senparc.Weixin 的注册。</li>
<li><code>app.UseSenparcWeixin()</code> 方法用于配置和启用 Senparc.Weixin。</li>
</ol>
</p>
Expand Down
4 changes: 2 additions & 2 deletions src/Senparc.WebSocket/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.net8.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;netcoreapp3.1;net8.0</TargetFrameworks>
<Version>0.19.3</Version>
<Version>1.0.0</Version>
<AssemblyName>Senparc.WebSocket</AssemblyName>
<RootNamespace>Senparc.WebSocket</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -112,7 +112,7 @@
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET" Version="2.4.1.1" />
<PackageReference Include="Senparc.CO2NET" Version="2.4.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
Expand Down
Loading

0 comments on commit 28bbe96

Please sign in to comment.