Explorar o código

😎1、清理代码 2、升级依赖(Furion v4.9.7.9)

zuohuaijun hai 1 ano
pai
achega
53790086a2

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

@@ -14,15 +14,15 @@
 
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="3.1.1" />
-    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.401" />
+    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.409" />
     <PackageReference Include="AngleSharp" Version="1.2.0" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.1" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.7" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.7" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.7" />
-	<PackageReference Include="Hardware.Info" Version="101.0.0.1" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.9" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.9" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.9" />
+	<PackageReference Include="Hardware.Info" Version="101.0.1" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
@@ -31,22 +31,22 @@
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.5.2" />
     <PackageReference Include="Magicodes.IE.Word" Version="2.7.5.2" />
     <PackageReference Include="MailKit" Version="4.10.0" />
-    <PackageReference Include="MiniExcel" Version="1.37.0" />
+    <PackageReference Include="MiniExcel" Version="1.38.0" />
     <PackageReference Include="MiniWord" Version="0.9.2" />
     <PackageReference Include="NewLife.Redis" Version="6.1.2025.209" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
 	<PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
-    <PackageReference Include="RabbitMQ.Client" Version="7.0.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="7.1.0" />
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.7.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.10.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.176" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.178" />
     <PackageReference Include="SSH.NET" Version="2024.2.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1179" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1182" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />

+ 0 - 64
Admin.NET/Admin.NET.Core/Entity/SysConfigTenant.cs

@@ -1,64 +0,0 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-
-namespace Admin.NET.Core;
-
-/// <summary>
-/// 系统租户配置参数表
-/// </summary>
-[SugarTable(null, "系统租户配置参数表")]
-[SysTable]
-[SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)]
-[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc, IsUnique = true)]
-public partial class SysConfigTenant : EntityTenant
-{
-    /// <summary>
-    /// 名称
-    /// </summary>
-    [SugarColumn(ColumnDescription = "名称", Length = 64)]
-    [Required, MaxLength(64)]
-    public virtual string Name { get; set; }
-
-    /// <summary>
-    /// 编码
-    /// </summary>
-    [SugarColumn(ColumnDescription = "编码", Length = 64)]
-    [MaxLength(64)]
-    public string? Code { get; set; }
-
-    /// <summary>
-    /// 参数值
-    /// </summary>
-    [SugarColumn(ColumnDescription = "参数值", Length = 512)]
-    [MaxLength(512)]
-    public string? Value { get; set; }
-
-    /// <summary>
-    /// 是否是内置参数(Y-是,N-否)
-    /// </summary>
-    [SugarColumn(ColumnDescription = "是否是内置参数", DefaultValue = "1")]
-    public YesNoEnum SysFlag { get; set; } = YesNoEnum.Y;
-
-    /// <summary>
-    /// 分组编码
-    /// </summary>
-    [SugarColumn(ColumnDescription = "分组编码", Length = 64)]
-    [MaxLength(64)]
-    public string? GroupCode { get; set; }
-
-    /// <summary>
-    /// 排序
-    /// </summary>
-    [SugarColumn(ColumnDescription = "排序", DefaultValue = "100")]
-    public int OrderNo { get; set; } = 100;
-
-    /// <summary>
-    /// 备注
-    /// </summary>
-    [SugarColumn(ColumnDescription = "备注", Length = 256)]
-    [MaxLength(256)]
-    public string? Remark { get; set; }
-}

+ 0 - 49
Admin.NET/Admin.NET.Core/Service/Config/Dto/TenantConfigInput.cs

@@ -1,49 +0,0 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-
-namespace Admin.NET.Core.Service;
-
-public class ConfigTenantInput : BaseIdInput;
-
-public class PageConfigTenantInput : BasePageInput
-{
-    /// <summary>
-    /// 名称
-    /// </summary>
-    public string Name { get; set; }
-
-    /// <summary>
-    /// 编码
-    /// </summary>
-    public string Code { get; set; }
-
-    /// <summary>
-    /// 分组编码
-    /// </summary>
-    public string GroupCode { get; set; }
-}
-
-public class AddConfigTenantInput : SysTenantConfig;
-
-public class UpdateConfigTenantInput : AddConfigTenantInput;
-
-public class DeleteConfigTenantInput : BaseIdInput;
-
-/// <summary>
-/// 批量配置参数输入
-/// </summary>
-public class BatchConfigTenantInput
-{
-    /// <summary>
-    /// 编码
-    /// </summary>
-    public string Code { get; set; }
-
-    /// <summary>
-    /// 属性值
-    /// </summary>
-    public string Value { get; set; }
-}

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

@@ -12,7 +12,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Furion.Xunit" Version="4.9.7.7" />
+      <PackageReference Include="Furion.Xunit" Version="4.9.7.9" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
       <PackageReference Include="Selenium.Support" Version="4.28.0" />
       <PackageReference Include="Selenium.WebDriver" Version="4.28.0" />

+ 1 - 1
Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj

@@ -26,7 +26,7 @@
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.12.0" />
-    <PackageReference Include="Rezero.Api" Version="1.7.12" />
+    <PackageReference Include="Rezero.Api" Version="1.7.13" />
   </ItemGroup>
 
   <ItemGroup>