Jelajahi Sumber

🤓增加全局是否开启种子数据初始化配置

zuohuaijun 3 tahun lalu
induk
melakukan
345d1f6690

+ 2 - 0
Admin.NET/Admin.NET.Application/Configuration/Database.json

@@ -8,6 +8,7 @@
                 "DbType": "Sqlite", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access、OpenGauss、QuestDB、HG、ClickHouse、GBase、Odbc、Custom
                 "ConnectionString": "DataSource=./Admin.NET.db", // 库连接字符串
                 "EnableInitDb": true, // 启用库表初始化
+                "EnableInitSeed": true, // 启用种子初始化
                 "EnableDiffLog": false, // 启用库表差异日志
                 "EnableUnderLine": false // 启用驼峰转下划线
             }
@@ -17,6 +18,7 @@
             //    "DbType": "Sqlite",
             //    "ConnectionString": "DataSource=./test.db", // 库连接字符串
             //    "EnableInitDb": true, // 启用库表初始化
+            //    "EnableInitSeed": true, // 启用种子初始化
             //    "EnableDiffLog": false, // 启用库表差异日志
             //    "EnableUnderLine": false // 启用驼峰转下划线
             //}

+ 0 - 2
Admin.NET/Admin.NET.Application/Configuration/Swagger.json

@@ -12,7 +12,6 @@
                 "TermsOfService": "https://dotnetchina.gitee.io/furion/",
                 "Contact": {
                     "Name": "zuohuaijun",
-                    "phone": "18020030720",
                     "Email": "515096995@qq.com",
                     "Url": "https://gitee.com/zuohuaijun/Admin.NET"
                 }
@@ -25,7 +24,6 @@
                 "TermsOfService": "https://dotnetchina.gitee.io/furion/",
                 "Contact": {
                     "Name": "zuohuaijun",
-                    "phone": "18020030720",
                     "Email": "515096995@qq.com",
                     "Url": "https://gitee.com/zuohuaijun/Admin.NET"
                 }

+ 17 - 12
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -1014,12 +1014,12 @@
         </member>
         <member name="P:Admin.NET.Core.SysLogVis.ActionName">
              <summary>
-             方法名称 
+             方法名称
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysLogVis.DisplayTitle">
              <summary>
-             显示名称 
+             显示名称
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysLogVis.Status">
@@ -3753,6 +3753,11 @@
             启用库表初始化
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.DbConnectionConfig.EnableInitSeed">
+            <summary>
+            启用种子初始化
+            </summary>
+        </member>
         <member name="P:Admin.NET.Core.DbConnectionConfig.EnableDiffLog">
             <summary>
             启用库表差异日志
@@ -4178,17 +4183,17 @@
             <returns></returns>
         </member>
         <member name="M:Admin.NET.Core.Service.SelectTable.GetTableData(System.String,System.Int32,System.Int32,System.Int32,System.String,Newtonsoft.Json.Linq.JObject)">
-            <summary>
+             <summary>
             
-            </summary>
-            <param name="subtable"></param>
-            <param name="page"></param>
-            <param name="count"></param>
-            <param name="query"></param>
-            <param name="json"></param>
-            <param name="dd"></param>
-            <returns></returns>
-            <exception cref="T:System.Exception"></exception>
+             </summary>
+             <param name="subtable"></param>
+             <param name="page"></param>
+             <param name="count"></param>
+             <param name="query"></param>
+             <param name="json"></param>
+             <param name="dd"></param>
+             <returns></returns>
+             <exception cref="T:System.Exception"></exception>
         </member>
         <member name="M:Admin.NET.Core.Service.SelectTable.GetFirstData(System.String,System.String,Newtonsoft.Json.Linq.JObject)">
              <summary>

+ 2 - 2
Admin.NET/Admin.NET.Core/Entity/SysLogVis.cs

@@ -15,14 +15,14 @@ public class SysLogVis : EntityTenant
     public string ControllerName { get; set; }
 
     /// <summary>
-    /// 方法名称 
+    /// 方法名称
     ///</summary>
     [SugarColumn(ColumnDescription = "方法名称", Length = 256)]
     [MaxLength(256)]
     public string ActionName { get; set; }
 
     /// <summary>
-    /// 显示名称 
+    /// 显示名称
     ///</summary>
     [SugarColumn(ColumnDescription = "显示名称", Length = 256)]
     [MaxLength(256)]

+ 5 - 0
Admin.NET/Admin.NET.Core/Option/DbConnectionOptions.cs

@@ -27,6 +27,11 @@ public sealed class DbConnectionConfig : ConnectionConfig
     /// </summary>
     public bool EnableInitDb { get; set; }
 
+    /// <summary>
+    /// 启用种子初始化
+    /// </summary>
+    public bool EnableInitSeed { get; set; }
+
     /// <summary>
     /// 启用库表差异日志
     /// </summary>

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/ApiJson/SelectTable.cs

@@ -83,7 +83,7 @@ public class SelectTable : ISingleton
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="subtable"></param>
     /// <param name="page"></param>

+ 0 - 1
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -1,7 +1,6 @@
 using Furion.SpecificationDocument;
 using Lazy.Captcha.Core;
 using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Logging;
 
 namespace Admin.NET.Core.Service;
 

+ 2 - 1
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -63,7 +63,6 @@ public static class SqlSugarSetup
         config.MoreSettings = new ConnMoreSettings
         {
             IsAutoRemoveDataCache = true,
-            DisableNvarchar = config.DbType == SqlSugar.DbType.MySql,
             SqlServerCodeFirstNvarchar = true // 采用Nvarchar
         };
     }
@@ -229,6 +228,8 @@ public static class SqlSugarSetup
                 dbProvider.CodeFirst.SplitTables().InitTables(entityType);
         }
 
+        if (!config.EnableInitSeed) return;
+
         // 获取所有种子配置-初始化数据
         var seedDataTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass
             && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarEntitySeedData<>))));