修正同步数据

src/hosts/ZhonTai.Host/Configs/dbconfig.json

@@ -59,7 +59,7 @@
   ],
 
   //多数据库
-  //定义MultiDbKeys枚举
+  //定义DbKeys枚举
   //使用仓储访问 public ModuleRepository(UnitOfWorkManagerCloud muowm) : base(DbKeys.AdminDb, muowm)
   //使用FreeSqlCloud访问  freeSqlCloud.Use(DbKeys.AdminDb);
   "dbs": [

src/platform/ZhonTai.Admin/Core/Db/DBServiceCollectionExtensions.cs

@@ -37,7 +37,7 @@ public static class DBServiceCollectionExtensions
     )
     {
         //注册数据库
-        freeSqlCloud.Register(DbKeys.MasterDb, () =>
+        freeSqlCloud.Register(dbConfig.Key, () =>
         {
             //创建数据库
             if (dbConfig.CreateDb)
@@ -148,7 +148,7 @@ public static class DBServiceCollectionExtensions
             //生成数据
             if (dbConfig.GenerateData && !dbConfig.CreateDb && !dbConfig.SyncData)
             {
-                DbHelper.GenerateDataAsync(fsql, appConfig).Wait();
+                DbHelper.GenerateDataAsync(fsql, appConfig, dbConfig).Wait();
             }
 
             #region 监听Curd操作

src/platform/ZhonTai.Admin/Core/Db/DbHelper.cs

@@ -327,12 +327,12 @@ public class DbHelper
         {
             Console.WriteLine($"{Environment.NewLine} sync data started");
 
-            if (appConfig.AssemblyNames?.Length > 0)
+            if (dbConfig.AssemblyNames?.Length > 0)
             {
                 db.Aop.AuditValue += SyncDataAuditValue;
 
                 Assembly[] assemblies = DependencyContext.Default.RuntimeLibraries
-                .Where(a => appConfig.AssemblyNames.Contains(a.Name))
+                .Where(a => dbConfig.AssemblyNames.Contains(a.Name))
                 .Select(o => Assembly.Load(new AssemblyName(o.Name))).ToArray();
 
                 List<ISyncData> syncDatas = assemblies.Select(assembly => assembly.GetTypes()
@@ -360,18 +360,19 @@ public class DbHelper
     /// </summary>
     /// <param name="db"></param>
     /// <param name="appConfig"></param>
+    /// <param name="dbConfig"></param>
     /// <returns></returns>
     /// <exception cref="Exception"></exception>
-    public static async Task GenerateDataAsync(IFreeSql db, AppConfig appConfig = null)
+    public static async Task GenerateDataAsync(IFreeSql db, AppConfig appConfig = null, DbConfig dbConfig = null)
     {
         try
         {
             Console.WriteLine($"{Environment.NewLine} generate data started");
 
-            if (appConfig.AssemblyNames?.Length > 0)
+            if (dbConfig.AssemblyNames?.Length > 0)
             {
                 Assembly[] assemblies = DependencyContext.Default.RuntimeLibraries
-               .Where(a => appConfig.AssemblyNames.Contains(a.Name))
+               .Where(a => dbConfig.AssemblyNames.Contains(a.Name))
                .Select(o => Assembly.Load(new AssemblyName(o.Name))).ToArray();
 
                 List<IGenerateData> generateDatas = assemblies.Select(assembly => assembly.GetTypes()

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -832,12 +832,13 @@
             <returns></returns>
             <exception cref="T:System.Exception"></exception>
         </member>
-        <member name="M:ZhonTai.Admin.Core.Db.DbHelper.GenerateDataAsync(IFreeSql,ZhonTai.Admin.Core.Configs.AppConfig)">
+        <member name="M:ZhonTai.Admin.Core.Db.DbHelper.GenerateDataAsync(IFreeSql,ZhonTai.Admin.Core.Configs.AppConfig,ZhonTai.Admin.Core.Configs.DbConfig)">
             <summary>
             生成数据
             </summary>
             <param name="db"></param>
             <param name="appConfig"></param>
+            <param name="dbConfig"></param>
             <returns></returns>
             <exception cref="T:System.Exception"></exception>
         </member>