Explorar o código

优化-修复数据库管理多库模式

zuohuaijun %!s(int64=3) %!d(string=hai) anos
pai
achega
e1999a72fe

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

@@ -20,9 +20,9 @@
 
   <ItemGroup>
     <PackageReference Include="Caching.CSRedis" Version="3.8.3" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.9.2" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.9.2" />
-    <PackageReference Include="Furion.Pure" Version="3.9.2" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.0.0" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.0.0" />
+    <PackageReference Include="Furion.Pure" Version="4.0.0" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.7" />
     <PackageReference Include="MySql.Data" Version="8.0.29" />

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

@@ -775,7 +775,11 @@
             系统操作日志表
             </summary>
         </member>
-        <!-- Badly formed XML comment ignored for member "P:Admin.NET.Core.SysLogOp.LogName" -->
+        <member name="P:Admin.NET.Core.SysLogOp.LogName">
+            <summary>
+            日志名称
+            </summary>
+        </member>
         <member name="P:Admin.NET.Core.SysLogOp.LogLevel">
             <summary>
             日志级别

+ 5 - 6
Admin.NET/Admin.NET.Core/Entity/SysLogOp.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Logging;
-
-namespace Admin.NET.Core;
+namespace Admin.NET.Core;
 
 /// <summary>
 /// 系统操作日志表
@@ -8,9 +6,10 @@ namespace Admin.NET.Core;
 [SugarTable("sys_log_op", "系统操作日志表")]
 public class SysLogOp : EntityBase
 {
-    /// 类别名称
+    /// <summary>
+    /// 日志名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "类别名称", Length = 200)]
+    [SugarColumn(ColumnDescription = "日志名称", Length = 200)]
     public string LogName { get; set; }
 
     /// <summary>
@@ -35,5 +34,5 @@ public class SysLogOp : EntityBase
     /// 异常对象
     /// </summary>
     [SugarColumn(ColumnDescription = "异常对象", ColumnDataType = "longtext,text,clob")]
-    public string Exception { get; set; }  
+    public string Exception { get; set; }
 }

+ 0 - 1
Admin.NET/Admin.NET.Core/Filter/ActionFilter.cs

@@ -7,7 +7,6 @@ public class ActionFilter : IAsyncActionFilter
 {
     public ActionFilter()
     {
-
     }
 
     public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)

+ 0 - 2
Admin.NET/Admin.NET.Core/GlobalUsings.cs

@@ -20,7 +20,6 @@ global using MapsterMapper;
 global using Microsoft.AspNetCore.Authorization;
 global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;
-global using Microsoft.AspNetCore.Mvc.Controllers;
 global using Microsoft.AspNetCore.Mvc.Filters;
 global using Microsoft.Extensions.Caching.Distributed;
 global using Microsoft.Extensions.Configuration;
@@ -44,7 +43,6 @@ global using System.Linq.Dynamic.Core;
 global using System.Linq.Expressions;
 global using System.Reflection;
 global using System.Runtime.InteropServices;
-global using System.Security.Claims;
 global using System.Text;
 global using System.Text.RegularExpressions;
 global using System.Web;

+ 1 - 0
Admin.NET/Admin.NET.Core/Service/DataBase/Dto/DbTableInfoInput.cs

@@ -3,6 +3,7 @@
 public class DbTableInfoInput
 {
     public string ConfigId { get; set; }
+
     public string Name { get; set; }
 
     public string Description { get; set; }

+ 4 - 2
Admin.NET/Admin.NET.Core/Service/DataBase/Dto/EditTableInput.cs

@@ -3,15 +3,17 @@
 public class EditTableInput
 {
     public string ConfigId { get; set; }
+
     public string Name { get; set; }
 
     public string OldName { get; set; }
 
     public string Description { get; set; }
 }
-public class DeleteTableInput 
+
+public class DeleteTableInput
 {
     public string ConfigId { get; set; }
-    public string Name { get; set; }
 
+    public string Name { get; set; }
 }

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs

@@ -145,7 +145,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
         return await _sysDictDataRep.Context.Queryable<SysDictType, SysDictData>((a, b) =>
             new JoinQueryInfos(JoinType.Left, a.Id == b.DictTypeId))
             .Where(a => a.Code == code)
-            .Where((a,b) => a.Status == StatusEnum.Enable&&b.Status== StatusEnum.Enable)
+            .Where((a, b) => a.Status == StatusEnum.Enable && b.Status == StatusEnum.Enable)
             .Select((a, b) => new
             {
                 Label = b.Value,