0
0
Bläddra i källkod

删除冗余配置,增加同步数据库友好提示

xiaoxue 5 år sedan
förälder
incheckning
0fa628367f

+ 0 - 5
Admin.Core.Common/Configs/AppConfig.cs

@@ -16,11 +16,6 @@
         public string Urls { get; set; } = "http://*:8081";
 
         public AopConfig Aop { get; set; }
-
-        /// <summary>
-        /// 同步缓存键
-        /// </summary>
-        public bool SyncCacheKey { get; set; }
     }
 
     public class AopConfig

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

@@ -540,7 +540,7 @@
             <param name="dbConfig"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.Core.Db.DbHelper.SyncStructure(IFreeSql,System.Boolean,System.String)">
+        <member name="M:Admin.Core.Db.DbHelper.SyncStructure(IFreeSql,System.Boolean,System.String,System.String)">
             <summary>
             同步结构
             </summary>

+ 4 - 6
Admin.Core/Db/DbHelper.cs

@@ -46,7 +46,7 @@ namespace Admin.Core.Db
         /// <summary>
         /// 同步结构
         /// </summary>
-        public static void SyncStructure(IFreeSql db,bool autoIncrement = true, string msg = null)
+        public static void SyncStructure(IFreeSql db,bool autoIncrement = true, string msg = null,string dbType = null)
         {
             //打印结构比对脚本
             //var dDL = db.CodeFirst.GetComparisonDDLStatements<PermissionEntity>();
@@ -88,9 +88,9 @@ namespace Admin.Core.Db
             }
 
             // 同步结构
-            Console.WriteLine($"\r\n{(msg.NotNull() ? msg : "sync structure")} started");
+            Console.WriteLine($"\r\n{(msg.NotNull() ? msg : $"sync {dbType} structure")} started");
             db.CodeFirst.SyncStructure(types);
-            Console.WriteLine($"{(msg.NotNull() ? msg : "sync structure")} succeed\r\n");
+            Console.WriteLine($"{(msg.NotNull() ? msg : $"sync {dbType} structure")} succeed\r\n");
         }
 
         /// <summary>
@@ -112,7 +112,7 @@ namespace Admin.Core.Db
                     if (data?.Length > 0)
                     {
                         await db.Insert<T>().AppendData(data).ExecuteAffrowsAsync();
-                        Console.WriteLine($"table:{tableName} sync data succeed");
+                        Console.WriteLine($"table: {tableName} sync data succeed");
                     }
                     else
                     {
@@ -353,7 +353,5 @@ namespace Admin.Core.Db
                 throw new Exception($"generate data failed。\n{ex.Message}\r\n");
             }
         }
-
-
     }
 }

+ 1 - 1
Admin.Core/Db/ServiceCollectionExtensions.cs

@@ -50,7 +50,7 @@ namespace Admin.Core.Db
             //同步结构
             if (dbConfig.SyncStructure)
             {
-                DbHelper.SyncStructure(fsql);
+                DbHelper.SyncStructure(fsql, dbType: dbConfig.Type.ToString());
             }
 
             //同步数据

+ 1 - 3
Admin.Core/configs/appconfig.json

@@ -7,7 +7,5 @@
   "aop": {
     //事物
     "transaction": false
-  },
-  //同步缓存键到数据库
-  "syncCacheKey": true
+  }
 }