~

Directory.Build.props

@@ -1,14 +1,14 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>netstandard2.0;netstandard2.1</TargetFrameworkVersion>
 
     <MicrosoftPackageVersion>8.0.0</MicrosoftPackageVersion>
-    <MediationPackageVersion>8.1.0</MediationPackageVersion>
+    <MediationPackageVersion>8.2.0</MediationPackageVersion>
 
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>8.1.0</Version>
+    <Version>8.2.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS8618;CA2211</NoWarn>
     <Authors>tooclian</Authors>
     <Company>toocliancode</Company>

src/WeChat.Applet/Requests/AccessToken.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using System.Text.Json.Serialization;
-
-namespace WeChat.Applet;
+namespace WeChat.Applet;
 
 /// <summary>
 /// 【微信小程序】获取接口调用凭据

src/WeChat.Applet/Requests/CheckSession.cs

@@ -1,6 +1,4 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace WeChat.Applet;
 

src/WeChat.Applet/Requests/Code2Session.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using System.Text.Json.Serialization;
-
-namespace WeChat.Applet;
+namespace WeChat.Applet;
 
 /// <summary>
 /// 【微信小程序】小程序登录

src/WeChat.Applet/Requests/CreateQRCode.cs

@@ -1,6 +1,4 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 using System.Text;
 
@@ -69,7 +67,7 @@ public override async Task<WeChatAppletHttpResponse> Response(IHttpResponseConte
             var content = await context.Message.Content.ReadAsStringAsync();
             WeChatAppletHttpResponse? response = null;
 
-            if (content != null && content.StartsWith('{') && content.EndsWith('}'))
+            if (content != null && content.StartsWith("{") && content.EndsWith("}"))
             {
                 try
                 {

src/WeChat.Applet/Requests/GenerateNFCScheme.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
-
-using System.Text.Json.Serialization;
+using Microsoft.Extensions.DependencyInjection;
 
 #pragma warning disable CS8601
 

src/WeChat.Applet/Requests/GenerateScheme.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
-
-using System.Text.Json.Serialization;
+using Microsoft.Extensions.DependencyInjection;
 
 #pragma warning disable CS8601
 

src/WeChat.Applet/Requests/GenerateShortLink.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
-
-using System.Text.Json.Serialization;
+using Microsoft.Extensions.DependencyInjection;
 
 #pragma warning disable CS8601
 

src/WeChat.Applet/Requests/GenerateUrlLink.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
-
-using System.Text.Json.Serialization;
+using Microsoft.Extensions.DependencyInjection;
 
 #pragma warning disable CS8601
 

src/WeChat.Applet/Requests/GetPaidUnionid.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
-
-using System.Text.Json.Serialization;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace WeChat.Applet;
 

src/WeChat.Applet/Requests/GetPhoneNumber.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
-
-using System.Text.Json.Serialization;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace WeChat.Applet;
 

src/WeChat.Applet/Requests/GetQRCode.cs

@@ -1,9 +1,6 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 using System.Text;
-using System.Text.Json.Serialization;
 
 #pragma warning disable CS8601
 
@@ -114,7 +111,7 @@ public override async Task<WeChatAppletHttpResponse> Response(IHttpResponseConte
             var content = await context.Message.Content.ReadAsStringAsync();
             WeChatAppletHttpResponse? response = null;
 
-            if (content != null && content.StartsWith('{') && content.EndsWith('}'))
+            if (content != null && content.StartsWith("{") && content.EndsWith("}"))
             {
                 try
                 {

src/WeChat.Applet/Requests/GetUnlimitedQRCode.cs

@@ -1,9 +1,6 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 using System.Text;
-using System.Text.Json.Serialization;
 
 #pragma warning disable CS8601
 
@@ -128,7 +125,7 @@ public override async Task<WeChatAppletHttpResponse> Response(IHttpResponseConte
             var content = await context.Message.Content.ReadAsStringAsync();
             WeChatAppletHttpResponse? response = null;
 
-            if (content != null && content.StartsWith('{') && content.EndsWith('}'))
+            if (content != null && content.StartsWith("{") && content.EndsWith("}"))
             {
                 try
                 {

src/WeChat.Applet/Requests/QueryScheme.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
-
-using System.Text.Json.Serialization;
+using Microsoft.Extensions.DependencyInjection;
 
 #pragma warning disable CS8601
 

src/WeChat.Applet/Requests/QueryUrlLink.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
-
-using System.Text.Json.Serialization;
+using Microsoft.Extensions.DependencyInjection;
 
 #pragma warning disable CS8601
 

src/WeChat.Applet/Requests/ResetSession.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.DependencyInjection;
-
-using System.Text.Json.Serialization;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace WeChat.Applet;
 

src/WeChat.Applet/WeChat.Applet.csproj

@@ -1,9 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<TargetFrameworks>$(TargetFrameworkVersion)</TargetFrameworks>
 	</PropertyGroup>
 
+	<ItemGroup>
+		<Using Include="Mediation" />
+		<Using Include="Mediation.HttpClient" />
+		<Using Include="System.Text.Json" />
+		<Using Include="System.Text.Json.Serialization" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftPackageVersion)" />
 	</ItemGroup>

src/WeChat.Applet/WeChatAppletAccessTokenStore.cs

@@ -1,10 +1,6 @@
-using Mediation;
-
-using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 
-using System.Text.Json;
-
 using WeChat.Applet;
 
 namespace WeChat;

src/WeChat.Applet/WeChatAppletHttpResponse.cs

@@ -1,6 +1,4 @@
-using System.Text.Json.Serialization;
-
-namespace WeChat;
+namespace WeChat;
 
 public class WeChatAppletHttpResponse : WeChatHttpResponse
 {

src/WeChat.Mp/Requests/AccessToken.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using System.Text.Json.Serialization;
-
-namespace WeChat.Mp;
+namespace WeChat.Mp;
 
 /// <summary>
 /// 【微信公众号】 access_token 请求

src/WeChat.Mp/Requests/JsapiConfig.cs

@@ -1,7 +1,4 @@
-using Mediation;
-using Mediation.HttpClient;
-
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
 
 namespace WeChat.Mp;
 
@@ -15,17 +12,26 @@ public class JsapiConfig
     /// <summary>
     /// 响应
     /// </summary>
-    /// <param name="AppId">应用号</param>
-    /// <param name="Timestamp">时间戳</param>
-    /// <param name="NonceStr">随机字符串</param>
-    /// <param name="Signature">签名</param>
-    public record Response(string AppId, string Timestamp, string NonceStr, string Signature);
+    /// <param name="appId">应用号</param>
+    /// <param name="timestamp">时间戳</param>
+    /// <param name="nonceStr">随机字符串</param>
+    /// <param name="signature">签名</param>
+    public class Response(string appId, string timestamp, string nonceStr, string signature)
+    {
+        public string AppId { get; } = appId;
+        public string Timestamp { get; } = timestamp;
+        public string NonceStr { get; } = nonceStr;
+        public string Signature { get; } = signature;
+    }
 
     /// <summary>
     /// 请求
     /// </summary>
-    /// <param name="Url">调用 jsapi 页面链接地址</param>
-    public record Request(string Url) : IRequest<Response>;
+    /// <param name="url">调用 jsapi 页面链接地址</param>
+    public class Request(string url) : IRequest<Response>
+    {
+        public string Url { get; } = url;
+    }
 
     /// <summary>
     /// 

src/WeChat.Mp/Requests/MediaGet.cs

@@ -1,7 +1,4 @@
-using Mediation.HttpClient;
-
-using System.Text;
-using System.Text.Json.Serialization;
+using System.Text;
 
 namespace WeChat.Mp;
 
@@ -47,7 +44,7 @@ public override async Task<Response> Response(IHttpResponseContext context)
             var content = await context.Message.Content.ReadAsStringAsync();
             Response? response = null;
 
-            if (content != null && content.StartsWith('{') && content.EndsWith('}'))
+            if (content != null && content.StartsWith("{") && content.EndsWith("}"))
             {
                 try
                 {

src/WeChat.Mp/Requests/MediaUploadImg.cs

@@ -1,7 +1,4 @@
-using Mediation.HttpClient;
-
-using System.Net.Http.Headers;
-using System.Text.Json.Serialization;
+using System.Net.Http.Headers;
 
 namespace WeChat.Mp;
 

src/WeChat.Mp/Requests/Ticket.cs

@@ -1,8 +1,4 @@
-using Mediation.HttpClient;
-
-using System.Text.Json.Serialization;
-
-namespace WeChat.Mp;
+namespace WeChat.Mp;
 
 /// <summary>
 /// 【微信公众号】 ticket 请求

src/WeChat.Mp/WeChat.Mp.csproj

@@ -1,9 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<TargetFrameworks>$(TargetFrameworkVersion)</TargetFrameworks>
 	</PropertyGroup>
 
+	<ItemGroup>
+		<Using Include="Mediation" />
+		<Using Include="Mediation.HttpClient" />
+		<Using Include="System.Text.Json" />
+		<Using Include="System.Text.Json.Serialization" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftPackageVersion)" />
 	</ItemGroup>

src/WeChat.Mp/WeChatMpAccessTokenStore.cs

@@ -1,10 +1,6 @@
-using Mediation;
-
-using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 
-using System.Text.Json;
-
 using WeChat.Mp;
 
 namespace WeChat;

src/WeChat.Mp/WeChatMpHttpResponse.cs

@@ -1,6 +1,4 @@
-using System.Text.Json.Serialization;
-
-namespace WeChat;
+namespace WeChat;
 
 public class WeChatMpHttpResponse : WeChatHttpResponse
 {

src/WeChat.Mp/WeChatMpTicketStore.cs

@@ -1,10 +1,6 @@
-using Mediation;
-
-using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 
-using System.Text.Json;
-
 using WeChat.Mp;
 
 namespace WeChat;