From e0da9e1a87abc9b2768884c36a93a025f1134a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Fri, 3 Mar 2023 21:26:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=A7=8D=E5=AD=90=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Yi.Framework.Net6/Yi.Framework.sln | 7 ------- .../Yi.Framework.Core/Extensions/AutoIocAddExtensions.cs | 2 +- .../Yi.Framework.EventBus/Yi.Framework.EventBus.csproj | 5 ++++- .../project/BBS/Yi.BBS.Web/Properties/launchSettings.json | 2 +- .../bbs/Yi.BBS.Application/GlobalSetting/TempService.cs | 3 +-- .../project/bbs/Yi.BBS.Web/Properties/launchSettings.json | 2 +- .../project/rbac/Yi.RBAC.Domain/DataSeeds/UserDataSeed.cs | 4 ++-- 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Yi.Framework.Net6/Yi.Framework.sln b/Yi.Framework.Net6/Yi.Framework.sln index 43d69e5e..2c8ac2a0 100644 --- a/Yi.Framework.Net6/Yi.Framework.sln +++ b/Yi.Framework.Net6/Yi.Framework.sln @@ -101,8 +101,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.FileManager", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.MultiTenancy", "src\framework\Yi.Framework.MultiTenancy\Yi.Framework.MultiTenancy.csproj", "{590B1EC0-CDA9-4937-BE07-FBB04437D21F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cike.EventBus", "..\..\通用软件框架\Cike.EventBus\src\Cike.EventBus\Cike.EventBus.csproj", "{1D44F0AA-0E47-4219-8DF5-67F13C012191}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -265,10 +263,6 @@ Global {590B1EC0-CDA9-4937-BE07-FBB04437D21F}.Debug|Any CPU.Build.0 = Debug|Any CPU {590B1EC0-CDA9-4937-BE07-FBB04437D21F}.Release|Any CPU.ActiveCfg = Release|Any CPU {590B1EC0-CDA9-4937-BE07-FBB04437D21F}.Release|Any CPU.Build.0 = Release|Any CPU - {1D44F0AA-0E47-4219-8DF5-67F13C012191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D44F0AA-0E47-4219-8DF5-67F13C012191}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D44F0AA-0E47-4219-8DF5-67F13C012191}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D44F0AA-0E47-4219-8DF5-67F13C012191}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -316,7 +310,6 @@ Global {8A604A6B-D1FA-4CFF-BCF5-557519B10FCB} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806} {1BF3115D-B027-4805-AF7B-41B3AE9CB355} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806} {590B1EC0-CDA9-4937-BE07-FBB04437D21F} = {5F2B846D-96CE-400A-878E-220498F4EE31} - {1D44F0AA-0E47-4219-8DF5-67F13C012191} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6C1A3808-0F4F-43FB-A9FE-5F27A3BB2ECF} diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/AutoIocAddExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/AutoIocAddExtensions.cs index 0ea76540..e66b870f 100644 --- a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/AutoIocAddExtensions.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Extensions/AutoIocAddExtensions.cs @@ -28,7 +28,7 @@ namespace Yi.Framework.Core.Extensions /// public static IServiceCollection AddAutoIocServer(this IServiceCollection services) { - var assemblys = AppDomain.CurrentDomain.GetAssemblies(); + var assemblys = Yi.Framework.Core.Module.ModuleAssembly.Assemblies; foreach (var a in assemblys) { RegIoc(services, a); diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.EventBus/Yi.Framework.EventBus.csproj b/Yi.Framework.Net6/src/module/Yi.Framework.EventBus/Yi.Framework.EventBus.csproj index b084d636..a6d1a9aa 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.EventBus/Yi.Framework.EventBus.csproj +++ b/Yi.Framework.Net6/src/module/Yi.Framework.EventBus/Yi.Framework.EventBus.csproj @@ -7,7 +7,10 @@ - + + + + diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Properties/launchSettings.json b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Properties/launchSettings.json index a6e70595..1f81c189 100644 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Properties/launchSettings.json +++ b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Properties/launchSettings.json @@ -4,7 +4,7 @@ "Yi.BBS.Web": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": false, + "launchBrowser": true, "launchUrl": "swagger", "applicationUrl": "http://localhost:19003", "environmentVariables": { diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/TempService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/TempService.cs index 83d4f30f..803c8d3f 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/TempService.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/GlobalSetting/TempService.cs @@ -17,8 +17,7 @@ namespace Yi.BBS.Application.GlobalSetting public class TempService : ApplicationService, IAutoApiService { - public TempService(IDataSeed dataSeed) { - dataSeed.InvokerAsync().Wait(); + public TempService() { } ///// ///// 登录 diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/Properties/launchSettings.json b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/Properties/launchSettings.json index a6e70595..1f81c189 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/Properties/launchSettings.json +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/Properties/launchSettings.json @@ -4,7 +4,7 @@ "Yi.BBS.Web": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": false, + "launchBrowser": true, "launchUrl": "swagger", "applicationUrl": "http://localhost:19003", "environmentVariables": { diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DataSeeds/UserDataSeed.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DataSeeds/UserDataSeed.cs index 16c92868..a2950ff1 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DataSeeds/UserDataSeed.cs +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DataSeeds/UserDataSeed.cs @@ -12,8 +12,8 @@ using Yi.RBAC.Domain.Shared.Identity.EnumClasses; namespace Yi.RBAC.Domain.DataSeeds { //支持依赖注入执行 - //[AppService(typeof(IDataSeed<>))] - + [AppService(typeof(IDataSeed))] + //支持启动时执行 [AppService(typeof(IDataSeed))] public class UserDataSeed : AbstractDataSeed