zuohuaijun 3 жил өмнө
parent
commit
a98cf4fb58

+ 1 - 1
Admin.NET/Admin.NET.Application/Const/TestConst.cs

@@ -11,4 +11,4 @@ public class TestConst
     /// 自己业务数据库标识
     /// </summary>
     public const string ConfigId = "Test";
-}
+}

+ 1 - 1
Admin.NET/Admin.NET.Application/Entity/Student.cs

@@ -27,4 +27,4 @@ public class Student : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "出生日期")]
     public DateTime BirthDate { get; set; }
-}
+}

+ 1 - 1
Admin.NET/Admin.NET.Application/Entity/Test.cs

@@ -25,4 +25,4 @@ public class Test : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "出生日期")]
     public DateTime BirthDate { get; set; }
-}
+}

+ 1 - 1
Admin.NET/Admin.NET.Application/Entity/TreeTest.cs

@@ -24,4 +24,4 @@ public class TreeTest : EntityBase
     /// </summary>
     [SqlSugar.SugarColumn(IsIgnore = true)]
     public List<TreeTest> Child { get; set; }
-}
+}

+ 1 - 1
Admin.NET/Admin.NET.Application/Filter/DataEntityFilter.cs

@@ -21,4 +21,4 @@ public class DataEntityFilter : IEntityFilter
             tableFilterItem
         };
     }
-}
+}

+ 1 - 2
Admin.NET/Admin.NET.Application/GlobalUsings.cs

@@ -10,5 +10,4 @@ global using System;
 global using System.Collections.Generic;
 global using System.ComponentModel.DataAnnotations;
 global using System.Linq.Expressions;
-global using System.Threading.Tasks;
-
+global using System.Threading.Tasks;

+ 1 - 1
Admin.NET/Admin.NET.Application/SeedData/TestSeedData.cs

@@ -17,4 +17,4 @@ public class TestSeedData : ISqlSugarEntitySeedData<Test>
             new Test{ Id=252885263003801, Name="456", Age=30, CreateTime=DateTime.Parse("2022-04-12 00:00:00") },
         };
     }
-}
+}

+ 1 - 1
Admin.NET/Admin.NET.Application/Service/TestService.cs

@@ -24,4 +24,4 @@ public class TestService : IDynamicApiController, ITransient
     {
         return await _testRep.GetListAsync();
     }
-}
+}

+ 1 - 1
Admin.NET/Admin.NET.Application/Startup.cs

@@ -13,4 +13,4 @@ public class Startup : AppStartup
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
     {
     }
-}
+}

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysLogDiff.cs

@@ -32,7 +32,7 @@ public class SysLogDiff : EntityBase
     public string Parameters { get; set; }
 
     /// <summary>
-    /// 业务对象  
+    /// 业务对象
     /// </summary>
     [SugarColumn(ColumnDescription = "业务对象", ColumnDataType = "text")]
     public string BusinessData { get; set; }

+ 1 - 1
Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs

@@ -116,7 +116,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
             new SysMenu{ Id=252885263003935, Pid=252885263003900, Title="差异日志", Path="difflog", Name="DifflogManagement", Component="/sys/admin/log/difflog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003936, Pid=252885263003935, Title="日志查询", Permission="sysDifflog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003937, Pid=252885263003935, Title="日志清空", Permission="sysDifflog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-                        
+
             new SysMenu{ Id=252885263003940, Pid=0, Title="文件管理", Path="/file", Name="file", Component="LAYOUT", Redirect="", Icon="ant-design:file-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=400 },
             new SysMenu{ Id=252885263003950, Pid=252885263003940, Title="文件管理", Path="file", Name="FileManagement", Component="/sys/admin/file/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003951, Pid=252885263003950, Title="文件查询", Permission="sysFile:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },

+ 6 - 5
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -117,19 +117,20 @@ public static class SqlSugarSetup
                         }
                     };
 
+                    // 差异日志
                     dbProvider.Aop.OnDiffLogEvent = async u =>
                     {
                         if (!dbOptions.EnableDiffLog) return;
 
                         var LogDiff = new SysLogDiff
                         {
-                            // 操作后记录(字段描述 列名 值  表名 表描述)
+                            // 操作后记录(字段描述、列名、值、表名、表描述)
                             AfterData = Newtonsoft.Json.JsonConvert.SerializeObject(u.AfterData),
-                            // 操作前记录(字段描述 列名 值 表名 表描述)
+                            // 操作前记录(字段描述、列名、值、表名、表描述)
                             BeforeData = Newtonsoft.Json.JsonConvert.SerializeObject(u.BeforeData),
                             // 传进来的对象
                             BusinessData = Newtonsoft.Json.JsonConvert.SerializeObject(u.BusinessData),
-                            // enum(insert、update、delete) 
+                            // enum(insert、update、delete)
                             DiffType = u.DiffType.ToString(),
                             Sql = UtilMethods.GetSqlString(DbType.MySql, u.Sql, u.Parameters),
                             Parameters = Newtonsoft.Json.JsonConvert.SerializeObject(u.Parameters),
@@ -176,8 +177,8 @@ public static class SqlSugarSetup
 
         // 获取所有实体表
         var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass
-        && u.IsDefined(typeof(SqlSugarEntityAttribute), false))
-        .OrderByDescending(u => u.GetSqlSugarEntityOrder());
+            && u.IsDefined(typeof(SqlSugarEntityAttribute), false))
+            .OrderByDescending(u => u.GetSqlSugarEntityOrder());
         if (!entityTypes.Any()) return;
         // 初始化库表结构
         foreach (var entityType in entityTypes)

+ 4 - 0
Admin.NET/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj

@@ -8,9 +8,13 @@
 
 	<ItemGroup>
 	  <Compile Remove="logs\**" />
+	  <Compile Remove="publish\**" />
 	  <Content Remove="logs\**" />
+	  <Content Remove="publish\**" />
 	  <EmbeddedResource Remove="logs\**" />
+	  <EmbeddedResource Remove="publish\**" />
 	  <None Remove="logs\**" />
+	  <None Remove="publish\**" />
 	</ItemGroup>
 
 	<ItemGroup>