Ver Fonte

1、优化日志 2、优化微信支付 3、更新nuget包

zuohuaijun há 4 anos atrás
pai
commit
718186eafa

+ 1 - 1
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -28,7 +28,7 @@
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.4" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.13.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.7.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.0.7.7-preview03" />
+    <PackageReference Include="SqlSugarCore" Version="5.0.7.8-preview01" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.18" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.12" />

+ 10 - 5
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -4113,12 +4113,12 @@
             <param name="file">文件</param>
             <returns></returns>
         </member>
-        <member name="P:Admin.NET.Core.Service.LogInput.StartTime">
+        <member name="P:Admin.NET.Core.Service.PageLogInput.StartTime">
             <summary>
             开始时间
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.LogInput.EndTime">
+        <member name="P:Admin.NET.Core.Service.PageLogInput.EndTime">
             <summary>
             结束时间
             </summary>
@@ -4128,7 +4128,7 @@
             系统异常日志服务
             </summary>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysExLogService.GetExLogList(Admin.NET.Core.Service.LogInput)">
+        <member name="M:Admin.NET.Core.Service.SysExLogService.GetExLogList(Admin.NET.Core.Service.PageLogInput)">
             <summary>
             获取异常日志分页列表
             </summary>
@@ -4145,7 +4145,7 @@
             系统操作日志服务
             </summary>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysOpLogService.GetOpLogList(Admin.NET.Core.Service.LogInput)">
+        <member name="M:Admin.NET.Core.Service.SysOpLogService.GetOpLogList(Admin.NET.Core.Service.PageLogInput)">
             <summary>
             获取操作日志分页列表
             </summary>
@@ -4162,7 +4162,7 @@
             系统访问日志服务
             </summary>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysVisLogService.GetVisLogList(Admin.NET.Core.Service.LogInput)">
+        <member name="M:Admin.NET.Core.Service.SysVisLogService.GetVisLogList(Admin.NET.Core.Service.PageLogInput)">
             <summary>
             获取访问日志分页列表
             </summary>
@@ -5584,6 +5584,11 @@
             商品描述
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.Service.WechatPayTransactionInput.Attachment">
+            <summary>
+            附加数据
+            </summary>
+        </member>
         <member name="P:Admin.NET.Core.Service.WechatPayParaInput.PrepayId">
             <summary>
             订单Id

+ 5 - 0
Admin.NET/Admin.NET.Core/Service/WeChat/Dto/WechatPayInput.cs

@@ -16,6 +16,11 @@
         /// 商品描述
         /// </summary>
         public string Description { get; set; }
+
+        /// <summary>
+        /// 附加数据
+        /// </summary>
+        public string Attachment { get; set; }
     }
 
     public class WechatPayParaInput

+ 2 - 0
Admin.NET/Admin.NET.Core/Service/WeChat/WechatPayService.cs

@@ -77,6 +77,7 @@ namespace Admin.NET.Core.Service
                 OutTradeNumber = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000), // YitIdHelper.NextId(), // 订单号
                 AppId = _wechatPayOptions.AppId,
                 Description = input.Description,
+                Attachment = input.Attachment,
                 ExpireTime = DateTimeOffset.Now.AddMinutes(10),
                 NotifyUrl = _payCallBackOptions.WechatPayUrl,
                 Amount = new CreatePayTransactionJsapiRequest.Types.Amount() { Total = input.Total },
@@ -92,6 +93,7 @@ namespace Admin.NET.Core.Service
                 MerchantId = _wechatPayOptions.MerchantId,
                 OutTradeNumber = request.OutTradeNumber,
                 Description = input.Description,
+                Attachment = input.Attachment,
                 Total = input.Total,
                 OpenId = input.OpenId
             };

+ 0 - 0
Admin.NET/Admin.NET.Core/Service/log/Dto/PageLogInput.cs → Admin.NET/Admin.NET.Core/Service/log/Dto/LogInput.cs


+ 1 - 1
Admin.NET/Admin.NET.UnitTest/Admin.NET.UnitTest.csproj

@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0-preview-20220401-08" />
     <PackageReference Include="xunit" Version="2.4.2-pre.12" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
Admin.NET/Admin.NET.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff