新增租户共享数据包data-share.json

调整租户共享全局过滤器，必须携带租户Id查询

Admin.Core.Service/Admin/Auth/AuthService.cs

@@ -107,7 +107,7 @@ namespace Admin.Core.Service.Admin.Auth
 
             if(_appConfig.TenantDbType == TenantDbType.Share)
             {
-                authLoginOutput.TenantType = await _tenantRepository.Select.WhereDynamic(user.TenantId).ToOneAsync(a => a.TenantType);
+                authLoginOutput.TenantType = await _tenantRepository.Select.DisableGlobalFilter("Tenant").WhereDynamic(user.TenantId).ToOneAsync(a => a.TenantType);
             }
 
             return ResponseOutput.Ok(authLoginOutput);

Admin.Core/Admin.Core.xml

@@ -810,7 +810,7 @@
             <param name="s"></param>
             <param name="e"></param>
         </member>
-        <member name="M:Admin.Core.Db.DbHelper.SyncDataAsync(IFreeSql,Admin.Core.Common.Configs.DbConfig)">
+        <member name="M:Admin.Core.Db.DbHelper.SyncDataAsync(IFreeSql,Admin.Core.Common.Configs.DbConfig,Admin.Core.Common.Configs.AppConfig)">
             <summary>
             同步数据
             </summary>

Admin.Core/Db/DBServiceCollectionExtensions.cs

@@ -77,7 +77,7 @@ namespace Admin.Core.Db
             //同步数据
             if (dbConfig.SyncData)
             {
-                await DbHelper.SyncDataAsync(fsql, dbConfig);
+                await DbHelper.SyncDataAsync(fsql, dbConfig, appConfig);
             }
             #endregion
 

Admin.Core/Db/DbHelper.cs

@@ -381,7 +381,7 @@ namespace Admin.Core.Db
         /// 同步数据
         /// </summary>
         /// <returns></returns>
-        public static async Task SyncDataAsync(IFreeSql db, DbConfig dbConfig = null)
+        public static async Task SyncDataAsync(IFreeSql db, DbConfig dbConfig = null, AppConfig appConfig = null)
         {
             try
             {
@@ -394,7 +394,8 @@ namespace Admin.Core.Db
 
                 db.Aop.AuditValue += SyncDataAuditValue;
 
-                var filePath = Path.Combine(AppContext.BaseDirectory, "Db/Data/data.json").ToPath();
+                var fileName = appConfig.TenantDbType == TenantDbType.Share ? "data-share.json" : "data.json";
+                var filePath = Path.Combine(AppContext.BaseDirectory, $"Db/Data/{fileName}").ToPath();
                 var jsonData = FileHelper.ReadFile(filePath);
                 var data = JsonConvert.DeserializeObject<Data>(jsonData);
 

Admin.Core/Db/TenantDBServiceCollectionExtensions.cs

@@ -72,7 +72,7 @@ namespace Admin.Core.Db
                 //共享数据库
                 if (appConfig.TenantDbType == TenantDbType.Share)
                 {
-                    fsql.GlobalFilter.ApplyIf<ITenant>("Tenant", () => user.TenantId > 0, a => a.TenantId == user.TenantId);
+                    fsql.GlobalFilter.Apply<ITenant>("Tenant", a => a.TenantId == user.TenantId);
                 }
 
                 #region 监听Curd操作