diff --git a/SlnMesnac.Repository/SqlsugarSetup.cs b/SlnMesnac.Extensions/SqlsugarSetup.cs similarity index 89% rename from SlnMesnac.Repository/SqlsugarSetup.cs rename to SlnMesnac.Extensions/SqlsugarSetup.cs index 3f3557b..8761bea 100644 --- a/SlnMesnac.Repository/SqlsugarSetup.cs +++ b/SlnMesnac.Extensions/SqlsugarSetup.cs @@ -1,7 +1,5 @@ using Microsoft.Extensions.DependencyInjection; using SlnMesnac.Config; -using SlnMesnac.Repository.service; -using SlnMesnac.Repository.service.Impl; using SqlSugar; using System; using System.Collections.Generic; @@ -12,12 +10,12 @@ using System.Text; * 版权所有 (c) 2024 WenJY 保留所有权利。 * CLR版本:4.0.30319.42000 * 机器名称:LAPTOP-E0N2L34V -* 命名空间:SlnMesnac.Repository -* 唯一标识:496f8d2b-70e3-4a05-ae18-a9b0fcd06b82 +* 命名空间:SlnMesnac.Extensions +* 唯一标识:bbb46406-e99d-4205-8046-ad954cf88315 * * 创建者:WenJY * 电子邮箱:wenjy@mesnac.com -* 创建时间:2024-03-27 21:58:35 +* 创建时间:2024-04-12 17:31:43 * 版本:V1.0.0 * 描述: * @@ -29,7 +27,7 @@ using System.Text; * 版本:V1.0.0 *--------------------------------------------------------------------*/ #endregion << 版 本 注 释 >> -namespace SlnMesnac.Repository +namespace SlnMesnac.Extensions { public static class SqlsugarSetup { diff --git a/SlnMesnac.Ioc/DependencyConfigurator.cs b/SlnMesnac.Ioc/DependencyConfigurator.cs index 111428f..6234bb9 100644 --- a/SlnMesnac.Ioc/DependencyConfigurator.cs +++ b/SlnMesnac.Ioc/DependencyConfigurator.cs @@ -90,7 +90,7 @@ namespace SlnMesnac.Ioc } /// - /// 自动注入自定义类、抽象类 + /// 自动注入自定义类、抽象类,设置为单例 /// /// /// @@ -120,6 +120,11 @@ namespace SlnMesnac.Ioc } } + /// + /// 自动注入自定义类,设置生命周期为每次解析返回新实例 + /// + /// + /// private static void RegisterTypeTransient(ContainerBuilder builder, Assembly assembly) { var types = assembly.GetTypes() @@ -133,7 +138,7 @@ namespace SlnMesnac.Ioc if (!typeof(Delegate).IsAssignableFrom(type)) { - builder.RegisterType(type); + builder.RegisterType(type).AsSelf().InstancePerDependency(); } } } diff --git a/SlnMesnac/SlnMesnac.csproj b/SlnMesnac/SlnMesnac.csproj index f623be7..191e4dc 100644 --- a/SlnMesnac/SlnMesnac.csproj +++ b/SlnMesnac/SlnMesnac.csproj @@ -13,6 +13,7 @@ + diff --git a/SlnMesnac/Startup.cs b/SlnMesnac/Startup.cs index 971cb8d..14525f4 100644 --- a/SlnMesnac/Startup.cs +++ b/SlnMesnac/Startup.cs @@ -1,10 +1,8 @@ using Microsoft.OpenApi.Models; -using SlnMesnac.Common; using SlnMesnac.Config; -using SlnMesnac.Plc; using SlnMesnac.Quartz; -using SlnMesnac.Repository; using SlnMesnac.Serilog; +using SlnMesnac.Extensions; using System.Runtime.Serialization; namespace SlnMesnac