增加忽略更新种子数据特性

Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj

@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <None Remove="Admin.NET.Application.xml" />
-    <None Remove="Configuration\appsettings.json" />
     <None Remove="Configuration\Limit.json" />
     <None Remove="Configuration\Logging.json" />
   </ItemGroup>
@@ -20,11 +19,6 @@
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
-    <Content Include="Configuration\appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
     <Content Include="Configuration\Limit.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -44,7 +38,7 @@
     <None Update="Configuration\CodeGen.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Configuration\DbConnection.json">
+    <None Update="Configuration\Database.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Configuration\Email.json">

Admin.NET/Admin.NET.Application/Configuration/App.json

@@ -2,6 +2,7 @@
     "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
 
     "Urls": "https://*:5005",
+
     "AllowedHosts": "*",
 
     "AppSettings": {

Admin.NET/Admin.NET.Application/Configuration/DbConnection.json → Admin.NET/Admin.NET.Application/Configuration/Database.json

@@ -2,7 +2,7 @@
     "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
 
     "DbConnection": {
-        // ConnectionConfig具体配置见SqlSugar
+        // 具体配置见SqlSugar官网
         "ConnectionConfigs": [
             {
                 "ConfigId": "default",

Admin.NET/Admin.NET.Application/Configuration/appsettings.json

@@ -1,40 +0,0 @@
-{
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
-
-    "Urls": "https://*:5005",
-
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft.AspNetCore": "Warning"
-        },
-        "File": {
-            "Enabled": true, // 启用文件日志
-            "FileName": "logs/{0:yyyyMMdd}_{1}.log", // 日志文件
-            "Append": true, // 追加覆盖
-            // "MinimumLevel": "Information", // 日志级别
-            "FileSizeLimitBytes": 10485760, // 10M=10*1024*1024
-            "MaxRollingFiles": 30 // 只保留30个文件
-        },
-        "Database": {
-            "Enabled": true, // 启用数据库日志
-            "MinimumLevel": "Information"
-        },
-        "ElasticSearch": {
-            "Enabled": false, // 启用ES日志
-            "ServerUris": [ "http://dilon:123456@192.168.1.100:9200" ], // 地址
-            "DefaultIndex": "adminnet" // 索引
-        },
-        "Monitor": {
-            "GlobalEnabled": true, // 启用全局拦截日志
-            "IncludeOfMethods": [], // 拦截特定方法，当GlobalEnabled=false有效
-            "ExcludeOfMethods": [], // 排除特定方法，当GlobalEnabled=true有效
-            "BahLogLevel": "Information", // Oops.Oh 和 Oops.Bah 业务日志输出级别
-            "WithReturnValue": true, // 配置是否包含返回值，默认true
-            "ReturnValueThreshold": 500, // 配置返回值字符串阈值，默认0全量输出
-            "JsonBehavior": "None", // 配置Json输出行为，默认None(OnlyJson、All)
-            "UseUtcTimestamp": false // 时间格式UTC、LOCAL
-        }
-    },
-    "AllowedHosts": "*"
-}

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -14,6 +14,11 @@
             自定义规范化结果特性
             </summary>
         </member>
+        <member name="T:Admin.NET.Core.IgnoreUpdateAttribute">
+            <summary>
+            忽略更新种子数据特性
+            </summary>
+        </member>
         <member name="T:Admin.NET.Core.NotTableAttribute">
             <summary>
             非实体表特性

Admin.NET/Admin.NET.Core/Attribute/IgnoreUpdateAttribute.cs

@@ -1,7 +1,10 @@
 namespace Admin.NET.Core;
+
 /// <summary>
-/// 种子数据忽略更新，防止数据被覆盖
+/// 忽略更新种子数据特性
 /// </summary>
+[SuppressSniffer]
+[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = true)]
 public class IgnoreUpdateAttribute : Attribute
 {
 }

Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs

@@ -9,6 +9,7 @@ public class SysConfigSeedData : ISqlSugarEntitySeedData<SysConfig>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysConfig> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs

@@ -9,6 +9,7 @@ public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysDictData> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs

@@ -9,6 +9,7 @@ public class SysDictTypeSeedData : ISqlSugarEntitySeedData<SysDictType>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysDictType> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs

@@ -9,6 +9,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysMenu> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SeedData/SysOrgSeedData.cs

@@ -9,6 +9,7 @@ public class SysOrgSeedData : ISqlSugarEntitySeedData<SysOrg>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysOrg> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SeedData/SysPosSeedData.cs

@@ -9,6 +9,7 @@ public class SysPosSeedData : ISqlSugarEntitySeedData<SysPos>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysPos> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SeedData/SysRoleMenuSeedData.cs

@@ -9,6 +9,7 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysRoleMenu> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SeedData/SysRoleSeedData.cs

@@ -9,6 +9,7 @@ public class SysRoleSeedData : ISqlSugarEntitySeedData<SysRole>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysRole> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SeedData/SysTenantSeedData.cs

@@ -9,6 +9,7 @@ public class SysTenantSeedData : ISqlSugarEntitySeedData<SysTenant>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysTenant> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SeedData/SysUserExtOrgSeedData.cs

@@ -9,6 +9,7 @@ public class SysUserExtOrgSeedData : ISqlSugarEntitySeedData<SysUserExtOrg>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysUserExtOrg> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SeedData/SysUserRoleSeedData.cs

@@ -9,6 +9,7 @@ public class SysUserRoleSeedData : ISqlSugarEntitySeedData<SysUserRole>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysUserRole> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SeedData/SysUserSeedData.cs

@@ -9,6 +9,7 @@ public class SysUserSeedData : ISqlSugarEntitySeedData<SysUser>
     /// 种子数据
     /// </summary>
     /// <returns></returns>
+    [IgnoreUpdate]
     public IEnumerable<SysUser> HasData()
     {
         return new[]

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarRepository.cs

@@ -14,7 +14,7 @@ public class SqlSugarRepository<T> : SimpleClient<T> where T : class, new()
 
         // 根据租户业务实体是否切库
         if (typeof(T).IsDefined(typeof(TenantBusinessAttribute), false))
-        {            
+        {
             var tenantId = App.GetRequiredService<UserManager>().TenantId; // 根据租户Id切库
             base.Context = SqlSugarSetup.InitTenantConnection(iTenant, tenantId);
         }