修改db异步方法后缀名

Admin.Core/Admin.Core.xml

@@ -728,7 +728,7 @@
             数据
             </summary>
         </member>
-        <member name="M:Admin.Core.Db.DbHelper.CreateDatabase(Admin.Core.Common.Configs.DbConfig)">
+        <member name="M:Admin.Core.Db.DbHelper.CreateDatabaseAsync(Admin.Core.Common.Configs.DbConfig)">
             <summary>
             创建数据库
             </summary>
@@ -740,7 +740,7 @@
             同步结构
             </summary>
         </member>
-        <member name="M:Admin.Core.Db.DbHelper.InitDtData``1(IFreeSql,``0[],System.Data.Common.DbTransaction,Admin.Core.Common.Configs.DbConfig)">
+        <member name="M:Admin.Core.Db.DbHelper.InitDtDataAsync``1(IFreeSql,``0[],System.Data.Common.DbTransaction,Admin.Core.Common.Configs.DbConfig)">
             <summary>
             初始化数据表数据
             </summary>
@@ -758,26 +758,33 @@
             <param name="s"></param>
             <param name="e"></param>
         </member>
-        <member name="M:Admin.Core.Db.DbHelper.SyncData(IFreeSql,Admin.Core.Common.Configs.DbConfig)">
+        <member name="M:Admin.Core.Db.DbHelper.SyncDataAsync(IFreeSql,Admin.Core.Common.Configs.DbConfig)">
             <summary>
             同步数据
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Admin.Core.Db.DbHelper.GenerateSimpleJsonData(IFreeSql)">
+        <member name="M:Admin.Core.Db.DbHelper.GenerateSimpleJsonDataAsync(IFreeSql)">
             <summary>
             生成极简数据
             </summary>
             <param name="db"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.Core.Db.DBServiceCollectionExtensions.AddDb(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Hosting.IHostEnvironment)">
+        <member name="M:Admin.Core.Db.DBServiceCollectionExtensions.AddDbAsync(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Hosting.IHostEnvironment)">
             <summary>
             添加数据库
             </summary>
             <param name="services"></param>
             <param name="env"></param>
         </member>
+        <member name="M:Admin.Core.Db.DBServiceCollectionExtensions.CreateMultiDbBuilder(Admin.Core.Common.Configs.MultiDb)">
+            <summary>
+            创建多数据库构建器
+            </summary>
+            <param name="multiDb"></param>
+            <returns></returns>
+        </member>
         <member name="M:Admin.Core.Db.TenantDbHelper.CreateDatabase(Admin.Core.Common.Configs.DbConfig)">
             <summary>
             创建数据库

Admin.Core/Db/DBServiceCollectionExtensions.cs

@@ -17,14 +17,14 @@ namespace Admin.Core.Db
         /// </summary>
         /// <param name="services"></param>
         /// <param name="env"></param>
-        public async static Task AddDb(this IServiceCollection services, IHostEnvironment env)
+        public async static Task AddDbAsync(this IServiceCollection services, IHostEnvironment env)
         {
             var dbConfig = new ConfigHelper().Get<DbConfig>("dbconfig", env.EnvironmentName);
 
             //创建数据库
             if (dbConfig.CreateDb)
             {
-                await DbHelper.CreateDatabase(dbConfig);
+                await DbHelper.CreateDatabaseAsync(dbConfig);
             }
 
             #region FreeSql
@@ -57,14 +57,14 @@ namespace Admin.Core.Db
             //同步数据
             if (dbConfig.SyncData)
             {
-                await DbHelper.SyncData(fsql, dbConfig);
+                await DbHelper.SyncDataAsync(fsql, dbConfig);
             }
             #endregion
 
             //生成数据包
             if (dbConfig.GenerateData && !dbConfig.CreateDb && !dbConfig.SyncData)
             {
-                await DbHelper.GenerateSimpleJsonData(fsql);
+                await DbHelper.GenerateSimpleJsonDataAsync(fsql);
             }
 
             #region 监听Curd操作
@@ -145,6 +145,11 @@ namespace Admin.Core.Db
             }
         }
 
+        /// <summary>
+        /// 创建多数据库构建器
+        /// </summary>
+        /// <param name="multiDb"></param>
+        /// <returns></returns>
         private static FreeSqlBuilder CreateMultiDbBuilder(MultiDb multiDb)
         {
             return new FreeSqlBuilder()

Admin.Core/Db/DbHelper.cs

@@ -20,7 +20,7 @@ namespace Admin.Core.Db
         /// </summary>
         /// <param name="dbConfig"></param>
         /// <returns></returns>
-        public async static Task CreateDatabase(DbConfig dbConfig)
+        public async static Task CreateDatabaseAsync(DbConfig dbConfig)
         {
             if (!dbConfig.CreateDb || dbConfig.Type == DataType.Sqlite)
             {
@@ -96,7 +96,7 @@ namespace Admin.Core.Db
         /// <param name="tran"></param>
         /// <param name="dbConfig"></param>
         /// <returns></returns>
-        private static async Task InitDtData<T>(
+        private static async Task InitDtDataAsync<T>(
             IFreeSql db, 
             T[] data, 
             System.Data.Common.DbTransaction tran, 
@@ -184,7 +184,7 @@ namespace Admin.Core.Db
         /// 同步数据
         /// </summary>
         /// <returns></returns>
-        public static async Task SyncData(IFreeSql db, DbConfig dbConfig = null)
+        public static async Task SyncDataAsync(IFreeSql db, DbConfig dbConfig = null)
         {
             try
             {
@@ -204,15 +204,15 @@ namespace Admin.Core.Db
                 using (var uow = db.CreateUnitOfWork())
                 using (var tran = uow.GetOrBeginTransaction())
                 {
-                    await InitDtData(db, data.Dictionaries, tran, dbConfig);
-                    await InitDtData(db, data.Apis, tran, dbConfig);
-                    await InitDtData(db, data.Views, tran, dbConfig);
-                    await InitDtData(db, data.Permissions, tran, dbConfig);
-                    await InitDtData(db, data.Users, tran, dbConfig);
-                    await InitDtData(db, data.Roles, tran, dbConfig);
-                    await InitDtData(db, data.UserRoles, tran, dbConfig);
-                    await InitDtData(db, data.RolePermissions, tran, dbConfig);
-                    await InitDtData(db, data.Tenants, tran, dbConfig);
+                    await InitDtDataAsync(db, data.Dictionaries, tran, dbConfig);
+                    await InitDtDataAsync(db, data.Apis, tran, dbConfig);
+                    await InitDtDataAsync(db, data.Views, tran, dbConfig);
+                    await InitDtDataAsync(db, data.Permissions, tran, dbConfig);
+                    await InitDtDataAsync(db, data.Users, tran, dbConfig);
+                    await InitDtDataAsync(db, data.Roles, tran, dbConfig);
+                    await InitDtDataAsync(db, data.UserRoles, tran, dbConfig);
+                    await InitDtDataAsync(db, data.RolePermissions, tran, dbConfig);
+                    await InitDtDataAsync(db, data.Tenants, tran, dbConfig);
 
                     uow.Commit();
                 }
@@ -232,7 +232,7 @@ namespace Admin.Core.Db
         /// </summary>
         /// <param name="db"></param>
         /// <returns></returns>
-        public static async Task GenerateSimpleJsonData(IFreeSql db)
+        public static async Task GenerateSimpleJsonDataAsync(IFreeSql db)
         {
             try
             {

Admin.Core/Startup.cs

@@ -75,7 +75,7 @@ namespace Admin.Core
             }
 
             //数据库
-            services.AddDb(_env).Wait();
+            services.AddDbAsync(_env).Wait();
             //租户分库
             services.AddTenantDb(_env);