✨ 升级abp到4.4.0

aspnet-core/CompanyName.ProjectName.sln

@@ -163,6 +163,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.Dat
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{8C1B8C6C-C518-4290-B070-622CCA6004DA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CAP", "CAP", "{2C09EED0-5AF6-4F1E-B05A-FB3272EDF6E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{11ED8435-B5AE-4BF3-9D4B-51FA1E4A18A6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.ProjectName.CAP", "frameworks\CAP\src\CompanyName.ProjectName.CAP\CompanyName.ProjectName.CAP.csproj", "{F59B3C43-0B54-4A3A-AA28-1A50F59D2FC3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -401,6 +407,10 @@ Global
 		{8D196E3D-6F95-4793-B948-79669AF09017}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8D196E3D-6F95-4793-B948-79669AF09017}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D196E3D-6F95-4793-B948-79669AF09017}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F59B3C43-0B54-4A3A-AA28-1A50F59D2FC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F59B3C43-0B54-4A3A-AA28-1A50F59D2FC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F59B3C43-0B54-4A3A-AA28-1A50F59D2FC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F59B3C43-0B54-4A3A-AA28-1A50F59D2FC3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -479,6 +489,9 @@ Global
 		{8C1B8C6C-C518-4290-B070-622CCA6004DA} = {2C861ADD-76E9-4B3B-8A3C-638EBB67D683}
 		{E6D5BF0E-DE92-4D82-A352-EF04B37CB11C} = {8C1B8C6C-C518-4290-B070-622CCA6004DA}
 		{073C361E-B8F4-49F5-93CC-72A3FF49C026} = {8C1B8C6C-C518-4290-B070-622CCA6004DA}
+		{2C09EED0-5AF6-4F1E-B05A-FB3272EDF6E8} = {CC2EBB07-A070-4158-AB37-A0C0BBAEA9F5}
+		{11ED8435-B5AE-4BF3-9D4B-51FA1E4A18A6} = {2C09EED0-5AF6-4F1E-B05A-FB3272EDF6E8}
+		{F59B3C43-0B54-4A3A-AA28-1A50F59D2FC3} = {11ED8435-B5AE-4BF3-9D4B-51FA1E4A18A6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}

aspnet-core/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <AbpPackageVersion>4.3.3</AbpPackageVersion>
+    <AbpPackageVersion>4.4.0</AbpPackageVersion>
   </PropertyGroup>
 
 </Project>

aspnet-core/common.props

@@ -5,6 +5,6 @@
 		<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
 		<AbpProjectType>app</AbpProjectType>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<AbpPackageVersion1>4.3.3</AbpPackageVersion1>
+		<AbpPackageVersion1>4.4.0</AbpPackageVersion1>
 	</PropertyGroup>
 </Project>

aspnet-core/frameworks/CAP/src/CompanyName.ProjectName.CAP/AbpCapConsumerServiceSelector.cs

@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using DotNetCore.CAP;
+using DotNetCore.CAP.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus;
+using Volo.Abp.EventBus.Distributed;
+
+namespace CompanyName.ProjectName.CAP
+{
+    [Dependency(ServiceLifetime.Singleton, ReplaceServices = true)]
+    [ExposeServices(typeof(IConsumerServiceSelector))]
+    public class BeeAbpCapConsumerServiceSelector : ConsumerServiceSelector
+    {
+        protected AbpDistributedEventBusOptions AbpDistributedEventBusOptions { get; }
+        protected IServiceProvider ServiceProvider { get; }
+
+        /// <summary>
+        /// Creates a new <see cref="T:DotNetCore.CAP.Internal.ConsumerServiceSelector" />.
+        /// </summary>
+        public BeeAbpCapConsumerServiceSelector(
+            IServiceProvider serviceProvider, 
+            IOptions<AbpDistributedEventBusOptions> distributedEventBusOptions) 
+            : base(serviceProvider)
+        {
+            ServiceProvider = serviceProvider;
+            AbpDistributedEventBusOptions = distributedEventBusOptions.Value;
+        }
+
+        protected override IEnumerable<ConsumerExecutorDescriptor> FindConsumersFromInterfaceTypes(IServiceProvider provider)
+        {
+            var executorDescriptorList = base.FindConsumersFromInterfaceTypes(provider).ToList();
+            
+            //handlers
+            var handlers = AbpDistributedEventBusOptions.Handlers;
+
+            foreach (var handler in handlers)
+            {
+                var interfaces = handler.GetInterfaces();
+                foreach (var @interface in interfaces)
+                {
+                    if (!typeof(IEventHandler).GetTypeInfo().IsAssignableFrom(@interface))
+                    {
+                        continue;
+                    }
+                    var genericArgs = @interface.GetGenericArguments();
+                    
+                    if (genericArgs.Length != 1)
+                    {
+                        continue;
+                    }
+
+                    var descriptors = GetHandlerDescription(genericArgs[0], handler);
+
+                    foreach (var descriptor in descriptors)
+                    {
+                        var count = executorDescriptorList.Count(x =>
+                            x.Attribute.Name == descriptor.Attribute.Name);
+
+                        descriptor.Attribute.Group = descriptor.Attribute.Group.Insert(
+                            descriptor.Attribute.Group.LastIndexOf(".", StringComparison.Ordinal), $".{count}");
+                            
+                        executorDescriptorList.Add(descriptor);
+                    }
+                        
+                    //Subscribe(genericArgs[0], new IocEventHandlerFactory(ServiceScopeFactory, handler));
+                }
+            }
+            return executorDescriptorList;
+        }
+
+        protected virtual IEnumerable<ConsumerExecutorDescriptor> GetHandlerDescription(Type eventType,Type typeInfo)
+        {
+            var serviceTypeInfo = typeof(IDistributedEventHandler<>)
+                .MakeGenericType(eventType);
+            var method = typeInfo
+                .GetMethod(
+                    nameof(IDistributedEventHandler<object>.HandleEventAsync),
+                    new[] { eventType }
+                );
+            var eventName = EventNameAttribute.GetNameOrDefault(eventType);
+            var topicAttr = method.GetCustomAttributes<TopicAttribute>(true);
+            var topicAttributes = topicAttr.ToList();
+
+            if (topicAttributes.Count == 0)
+            {
+                topicAttributes.Add(new CapSubscribeAttribute(eventName));
+            }
+
+            foreach (var attr in topicAttributes)
+            {
+                SetSubscribeAttribute(attr);
+
+                var parameters = method.GetParameters()
+                    .Select(parameter => new ParameterDescriptor
+                    {
+                        Name = parameter.Name,
+                        ParameterType = parameter.ParameterType,
+                        IsFromCap = parameter.GetCustomAttributes(typeof(FromCapAttribute)).Any()
+                    }).ToList();
+
+                yield return InitDescriptor(attr, method, typeInfo.GetTypeInfo(), serviceTypeInfo.GetTypeInfo(), parameters);
+            }
+        }
+
+        private static ConsumerExecutorDescriptor InitDescriptor(
+            TopicAttribute attr,
+            MethodInfo methodInfo,
+            TypeInfo implType,
+            TypeInfo serviceTypeInfo,
+            IList<ParameterDescriptor> parameters)
+        {
+            var descriptor = new ConsumerExecutorDescriptor
+            {
+                Attribute = attr,
+                MethodInfo = methodInfo,
+                ImplTypeInfo = implType,
+                ServiceTypeInfo = serviceTypeInfo,
+                Parameters = parameters
+            };
+
+            return descriptor;
+        }
+    }
+}

aspnet-core/frameworks/CAP/src/CompanyName.ProjectName.CAP/AbpCapDistributedEventBus.cs

@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using DotNetCore.CAP;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Volo.Abp;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus;
+using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Threading;
+
+
+namespace CompanyName.ProjectName.CAP
+{
+    public class AbpCapDistributedEventBus :
+        EventBusBase,
+        IDistributedEventBus,
+        ISingletonDependency
+    {
+        protected AbpDistributedEventBusOptions AbpDistributedEventBusOptions { get; }
+        protected ConcurrentDictionary<Type, List<IEventHandlerFactory>> HandlerFactories { get; }
+        protected ConcurrentDictionary<string, Type> EventTypes { get; }
+
+        protected readonly ICapPublisher CapPublisher;
+
+        public AbpCapDistributedEventBus(IServiceScopeFactory serviceScopeFactory,
+            IOptions<AbpDistributedEventBusOptions> distributedEventBusOptions,
+            ICapPublisher capPublisher,
+            ICurrentTenant currentTenant,
+            IEventErrorHandler errorHandler)
+            : base(serviceScopeFactory, currentTenant, errorHandler)
+        {
+            CapPublisher = capPublisher;
+            AbpDistributedEventBusOptions = distributedEventBusOptions.Value;
+            HandlerFactories = new ConcurrentDictionary<Type, List<IEventHandlerFactory>>();
+            EventTypes = new ConcurrentDictionary<string, Type>();
+        }
+
+        public override IDisposable Subscribe(Type eventType, IEventHandlerFactory factory)
+        {
+            //This is handled by CAP ConsumerServiceSelector
+            throw new NotImplementedException();
+        }
+
+        public override void Unsubscribe<TEvent>(Func<TEvent, Task> action)
+        {
+            Check.NotNull(action, nameof(action));
+
+            GetOrCreateHandlerFactories(typeof(TEvent))
+                .Locking(factories =>
+                {
+                    factories.RemoveAll(
+                        factory =>
+                        {
+                            var singleInstanceFactory = factory as SingleInstanceHandlerFactory;
+                            if (singleInstanceFactory == null)
+                            {
+                                return false;
+                            }
+
+                            var actionHandler = singleInstanceFactory.HandlerInstance as ActionEventHandler<TEvent>;
+                            if (actionHandler == null)
+                            {
+                                return false;
+                            }
+
+                            return actionHandler.Action == action;
+                        });
+                });
+        }
+
+        public override void Unsubscribe(Type eventType, IEventHandler handler)
+        {
+            GetOrCreateHandlerFactories(eventType)
+                .Locking(factories =>
+                {
+                    factories.RemoveAll(
+                        factory =>
+                            factory is SingleInstanceHandlerFactory &&
+                            (factory as SingleInstanceHandlerFactory).HandlerInstance == handler
+                    );
+                });
+        }
+
+        public override void Unsubscribe(Type eventType, IEventHandlerFactory factory)
+        {
+            GetOrCreateHandlerFactories(eventType).Locking(factories => factories.Remove(factory));
+        }
+
+        public override void UnsubscribeAll(Type eventType)
+        {
+            GetOrCreateHandlerFactories(eventType).Locking(factories => factories.Clear());
+        }
+
+        public IDisposable Subscribe<TEvent>(IDistributedEventHandler<TEvent> handler) where TEvent : class
+        {
+            return Subscribe(typeof(TEvent), handler);
+        }
+
+
+        public override async Task PublishAsync(Type eventType, object eventData)
+        {
+            var eventName = EventNameAttribute.GetNameOrDefault(eventType);
+            await CapPublisher.PublishAsync(eventName, eventData);
+        }
+
+        protected override IEnumerable<EventTypeWithEventHandlerFactories> GetHandlerFactories(Type eventType)
+        {
+            var handlerFactoryList = new List<EventTypeWithEventHandlerFactories>();
+
+            foreach (var handlerFactory in
+                HandlerFactories.Where(hf => ShouldTriggerEventForHandler(eventType, hf.Key)))
+            {
+                handlerFactoryList.Add(
+                    new EventTypeWithEventHandlerFactories(handlerFactory.Key, handlerFactory.Value));
+            }
+
+            return handlerFactoryList.ToArray();
+        }
+
+        private List<IEventHandlerFactory> GetOrCreateHandlerFactories(Type eventType)
+        {
+            return HandlerFactories.GetOrAdd(
+                eventType,
+                type =>
+                {
+                    var eventName = EventNameAttribute.GetNameOrDefault(type);
+                    EventTypes[eventName] = type;
+                    return new List<IEventHandlerFactory>();
+                }
+            );
+        }
+
+        private static bool ShouldTriggerEventForHandler(Type targetEventType, Type handlerEventType)
+        {
+            //Should trigger same type
+            if (handlerEventType == targetEventType)
+            {
+                return true;
+            }
+
+            //TODO: Support inheritance? But it does not support on subscription to RabbitMq!
+            //Should trigger for inherited types
+            if (handlerEventType.IsAssignableFrom(targetEventType))
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}

aspnet-core/frameworks/CAP/src/CompanyName.ProjectName.CAP/AbpCapModule.cs

@@ -0,0 +1,10 @@
+using Volo.Abp.EventBus;
+using Volo.Abp.Modularity;
+
+namespace CompanyName.ProjectName.CAP
+{
+    [DependsOn(typeof(AbpEventBusModule))]
+    public class AbpCapModule : AbpModule
+    {
+    }
+}

aspnet-core/frameworks/CAP/src/CompanyName.ProjectName.CAP/AbpCapServiceCollectionExtensions.cs

@@ -0,0 +1,22 @@
+using System;
+using DotNetCore.CAP;
+using DotNetCore.CAP.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Modularity;
+
+namespace CompanyName.ProjectName.CAP
+{
+    public static class AbpCapServiceCollectionExtensions
+    {
+        public static ServiceConfigurationContext AddAbpCap(
+            this ServiceConfigurationContext context, 
+            Action<CapOptions> capAction)
+        {
+            context.Services.AddCap(capAction);
+            context.Services.AddSingleton<IConsumerServiceSelector, BeeAbpCapConsumerServiceSelector>();
+            context.Services.AddSingleton<IDistributedEventBus, AbpCapDistributedEventBus>();
+            return context;
+        }
+    }
+}

aspnet-core/frameworks/CAP/src/CompanyName.ProjectName.CAP/CompanyName.ProjectName.CAP.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="DotNetCore.CAP" Version="5.1.3" />
+        <PackageReference Include="Volo.Abp.Core" Version="4.4.0" />
+        <PackageReference Include="Volo.Abp.EventBus" Version="4.4.0" />
+    </ItemGroup>
+
+</Project>

aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj

@@ -16,15 +16,15 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.*" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.7" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.Swashbuckle" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Swashbuckle" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="4.4.0" />
   </ItemGroup>
 
   <ItemGroup>

aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/Logs/logs.txt

@@ -74,7 +74,7 @@
 2021-08-12 21:06:22.365 +08:00 [INF]   - Volo.Abp.AspNetCore.Serilog.AbpAspNetCoreSerilogModule
 2021-08-12 21:06:22.365 +08:00 [INF]   - Volo.Abp.Swashbuckle.AbpSwashbuckleModule
 2021-08-12 21:06:22.403 +08:00 [FTL] Application startup exception
-Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.3.3.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details.
+Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details.
  ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.
  ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'.
  ---> Volo.Abp.AbpException: ServiceConfigurationContext is only available in the ConfigureServices, PreConfigureServices and PostConfigureServices methods.
@@ -155,7 +155,7 @@ Volo.Abp.AbpInitializationException: An error occurred during the initialize Vol
    at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.Run(IHost host)
    at CompanyName.ProjectName.DataDictionaryManagement.Program.Main(String[] args) in D:\abp-next\aspnet-core\modules\DataDictionaryManagement\host\CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host\Program.cs:line 31
 2021-08-12 21:06:22.411 +08:00 [FTL] Host terminated unexpectedly!
-Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.3.3.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details.
+Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details.
  ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.
  ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'.
  ---> Volo.Abp.AbpException: ServiceConfigurationContext is only available in the ConfigureServices, PreConfigureServices and PostConfigureServices methods.

aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts/CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts.csproj

@@ -3,13 +3,13 @@
   <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.DataDictionaryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.DataDictionaryManagement.Domain.Shared\CompanyName.ProjectName.DataDictionaryManagement.Domain.Shared.csproj" />
   </ItemGroup>
 

aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.Application/CompanyName.ProjectName.DataDictionaryManagement.Application.csproj

@@ -3,13 +3,13 @@
   <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.DataDictionaryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts\CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts.csproj" />
     <ProjectReference Include="..\CompanyName.ProjectName.DataDictionaryManagement.Domain\CompanyName.ProjectName.DataDictionaryManagement.Domain.csproj" />
   </ItemGroup>

aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.Domain.Shared/CompanyName.ProjectName.DataDictionaryManagement.Domain.Shared.csproj

@@ -3,13 +3,13 @@
   <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.DataDictionaryManagement</RootNamespace>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Validation" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Validation" Version="4.4.0" />
   </ItemGroup>
 
   <ItemGroup>

aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.Domain/CompanyName.ProjectName.DataDictionaryManagement.Domain.csproj

@@ -3,12 +3,12 @@
   <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.DataDictionaryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.4.0" />
    
     <ProjectReference Include="..\CompanyName.ProjectName.DataDictionaryManagement.Domain.Shared\CompanyName.ProjectName.DataDictionaryManagement.Domain.Shared.csproj" />
   </ItemGroup>

aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore/CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore.csproj

@@ -3,12 +3,12 @@
   <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.DataDictionaryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.DataDictionaryManagement.Domain\CompanyName.ProjectName.DataDictionaryManagement.Domain.csproj" />
   </ItemGroup>
 

aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Client/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Client.csproj

@@ -3,12 +3,12 @@
   <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.DataDictionaryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Http.Client" Version="4.4.0" />
   </ItemGroup>
 
   <ItemGroup>

aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.HttpApi/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.csproj

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.4" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts\CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts.csproj" />
   </ItemGroup>
 

aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.MongoDB/CompanyName.ProjectName.DataDictionaryManagement.MongoDB.csproj

@@ -2,12 +2,12 @@
   <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.DataDictionaryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.MongoDB" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.MongoDB" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.DataDictionaryManagement.Domain\CompanyName.ProjectName.DataDictionaryManagement.Domain.csproj" />
   </ItemGroup>
 

aspnet-core/modules/DataDictionaryManagement/test/CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore.Tests/CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore.Tests.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.*" />
     <ProjectReference Include="..\..\src\CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore\CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\CompanyName.ProjectName.DataDictionaryManagement.TestBase\CompanyName.ProjectName.DataDictionaryManagement.TestBase.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="4.4.0" />
   </ItemGroup>
 
 </Project>

aspnet-core/modules/DataDictionaryManagement/test/CompanyName.ProjectName.DataDictionaryManagement.TestBase/CompanyName.ProjectName.DataDictionaryManagement.TestBase.csproj

@@ -14,9 +14,9 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.TestBase" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.TestBase" Version="4.4.0" />
     <ProjectReference Include="..\..\src\CompanyName.ProjectName.DataDictionaryManagement.Domain\CompanyName.ProjectName.DataDictionaryManagement.Domain.csproj" />
   </ItemGroup>
 

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application.Contracts/CompanyName.ProjectName.NotificationManagement.Application.Contracts.csproj

@@ -3,7 +3,7 @@
  <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.NotificationManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application.Contracts/Hubs/INotificationHub.cs

@@ -0,0 +1,22 @@
+using System.Threading.Tasks;
+using CompanyName.ProjectName.NotificationManagement.Notifications.Dtos;
+
+namespace CompanyName.ProjectName.NotificationManagement.Hubs
+{
+    public interface INotificationHub
+    {
+        /// <summary>
+        /// 发送普通消息
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        Task ReceiveTextMessageAsync(SendNotificationDto input);
+
+        /// <summary>
+        /// 发送广播消息
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        Task ReceiveBroadCastMessageAsync(SendNotificationDto input);
+    }
+}

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application.Contracts/Notifications/Dtos/CreateNotificationInput.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace CompanyName.ProjectName.NotificationManagement.Notifications.Dtos
+{
+    public class CreateNotificationInput : IValidatableObject
+    {
+        /// <summary>
+        /// 消息标题
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 消息内容
+        /// </summary>
+        public string Content { get; set; }
+        
+
+        /// <summary>
+        /// 消息类型
+        /// </summary>
+        public MessageType MessageType { get; set; }
+
+        /// <summary>
+        /// 接收人
+        /// 如果消息类型是广播消息，接收人字段为空
+        /// </summary>
+        public List<Guid> ReceiveIds { get; set; }
+
+        public CreateNotificationInput()
+        {
+            ReceiveIds = new List<Guid>();
+        }
+
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        {
+            if (MessageType == MessageType.BroadCast && ReceiveIds.Count > 0)
+            {
+                yield return new ValidationResult("当消息类型为广播消息是，接收人列表只能为空", new[] {"ReceiveIds"});
+            }
+        }
+    }
+}

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application.Contracts/Notifications/Dtos/SendNotificationDto.cs

@@ -0,0 +1,23 @@
+namespace CompanyName.ProjectName.NotificationManagement.Notifications.Dtos
+{
+    public class SendNotificationDto
+    {
+        public string Title { get; set; }
+
+        public string Content { get; set; }
+
+        public MessageType MessageType { get; set; }
+
+        private SendNotificationDto()
+        {
+            
+        }
+
+        public SendNotificationDto(string title, string content, MessageType messageType)
+        {
+            Title = title;
+            Content = content;
+            MessageType = messageType;
+        }
+    }
+}

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application.Contracts/Notifications/INotificationAppService.cs

@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using CompanyName.ProjectName.NotificationManagement.Notifications.Dtos;
+using Volo.Abp.Application.Services;
+
+namespace CompanyName.ProjectName.NotificationManagement.Notifications
+{
+    public interface INotificationAppService:IApplicationService
+    {
+        /// <summary>
+        /// 发送消息到客户端
+        /// </summary>
+        /// <returns></returns>
+        Task SendMessageAsync(string title, string content, MessageType messageType, List<string> users);
+        
+        /// <summary>
+        /// 发送消息到客户端
+        /// </summary>
+        /// <returns></returns>
+        Task SendMessageToClientByUserIdAsync(SendNotificationDto sendNotificationDto, List<string> userIds);
+
+        /// <summary>
+        /// 发送消息到所有客户端
+        /// </summary>
+        /// <param name="sendNotificationDto"></param>
+        Task SendMessageToAllClientAsync(SendNotificationDto sendNotificationDto);
+
+        /// <summary>
+        /// 创建一个消息
+        /// 测试使用
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        Task CreateAsync(CreateNotificationInput input);
+    }
+}

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application/CompanyName.ProjectName.NotificationManagement.Application.csproj

@@ -3,11 +3,13 @@
  <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.NotificationManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="5.0.9" />
+    <PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="4.4.0" />
     <PackageReference Include="Volo.Abp.AutoMapper" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.Ddd.Application" Version="$(AbpPackageVersion)" />
     <ProjectReference Include="..\..\..\QueryManagement\src\CompanyName.ProjectName.QueryManagement.Domain\CompanyName.ProjectName.QueryManagement.Domain.csproj" />

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application/Hubs/NotificationHub.cs

@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.Authorization;
+using Volo.Abp.AspNetCore.SignalR;
+using Volo.Abp.Auditing;
+
+namespace CompanyName.ProjectName.NotificationManagement.Hubs
+{
+    [HubRoute("SignalR/Notification")]
+    [Authorize]
+    [DisableAuditing]
+    public class NotificationHub : AbpHub<INotificationHub>
+    {
+        
+    }
+}

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application/NotificationManagementApplicationModule.cs

@@ -3,6 +3,8 @@ using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.Application;
 using CompanyName.ProjectName.QueryManagement;
+using Microsoft.Extensions.Configuration;
+using Volo.Abp.AspNetCore.SignalR;
 
 namespace CompanyName.ProjectName.NotificationManagement
 {
@@ -11,7 +13,8 @@ namespace CompanyName.ProjectName.NotificationManagement
         typeof(NotificationManagementApplicationContractsModule),
         typeof(AbpDddApplicationModule),
         typeof(AbpAutoMapperModule),
-        typeof(QueryManagementDomainModule)
+        typeof(QueryManagementDomainModule),
+        typeof(AbpAspNetCoreSignalRModule)
         )]
     public class NotificationManagementApplicationModule : AbpModule
     {
@@ -22,6 +25,23 @@ namespace CompanyName.ProjectName.NotificationManagement
             {
                 options.AddMaps<NotificationManagementApplicationModule>(validate: true);
             });
+
+            ConfigurationSignalR(context);
+        }
+        
+        private void ConfigurationSignalR(ServiceConfigurationContext context)
+        {
+            var redisConnectionString =
+                context.Services.GetConfiguration().GetSection("Cache:Redis:ConnectionString").Value;
+            var redisDatabaseId = context.Services.GetConfiguration().GetValue<int>("Cache:Redis:DatabaseId");
+            var password = context.Services.GetConfiguration().GetValue<string>("Cache:Redis:Password");
+            context.Services.AddSignalR().AddStackExchangeRedis(options =>
+            {
+                options.Configuration.ChannelPrefix = "CompanyName.ProjectName";
+                options.Configuration.DefaultDatabase = redisDatabaseId;
+                options.Configuration.Password = password;
+                options.Configuration.EndPoints.Add(redisConnectionString);
+            });
         }
     }
 }

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application/Notifications/NotificationAppService.cs

@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using CompanyName.ProjectName.NotificationManagement.Hubs;
+using CompanyName.ProjectName.NotificationManagement.Notifications.Dtos;
+using Microsoft.AspNetCore.SignalR;
+using Volo.Abp;
+using Volo.Abp.Users;
+
+namespace CompanyName.ProjectName.NotificationManagement.Notifications
+{
+    public class NotificationAppService : NotificationManagementAppService, INotificationAppService
+    {
+        private readonly IHubContext<NotificationHub, INotificationHub> _hubContext;
+        private readonly NotificationManager _notificationManager;
+        private readonly ICurrentUser _currentUser;
+
+        public NotificationAppService(
+            IHubContext<NotificationHub, INotificationHub> hubContext, NotificationManager notificationManager,
+            ICurrentUser currentUser)
+        {
+            _hubContext = hubContext;
+            _notificationManager = notificationManager;
+            _currentUser = currentUser;
+        }
+
+        /// <summary>
+        /// 发送消息
+        /// </summary>
+        public async Task SendMessageAsync(string title, string content, MessageType messageType, List<string> users)
+        {
+            switch (messageType)
+            {
+                case MessageType.Text:
+                    await SendMessageToClientByUserIdAsync(new SendNotificationDto(title, content, messageType), users);
+                    break;
+                case MessageType.BroadCast:
+                    await SendMessageToAllClientAsync(new SendNotificationDto(title, content, messageType));
+                    break;
+                default:
+                    throw new UserFriendlyException("未知的消息类型");
+            }
+        }
+
+
+        /// <summary>
+        /// 发送消息指定客户端用户
+        /// </summary>
+        /// <param name="sendNotificationDto"></param>
+        /// <param name="users"></param>
+        /// <returns></returns>
+        public async Task SendMessageToClientByUserIdAsync(SendNotificationDto sendNotificationDto,
+            List<string> users)
+        {
+            if (users is {Count: > 0})
+            {
+                await _hubContext.Clients
+                    .Users(users.AsReadOnly().ToList())
+                    .ReceiveTextMessageAsync(sendNotificationDto);
+            }
+        }
+
+        /// <summary>
+        /// 发送消息到所有客户端
+        /// 广播消息
+        /// </summary>
+        /// <param name="sendNotificationDto"></param>
+        public async Task SendMessageToAllClientAsync(SendNotificationDto sendNotificationDto)
+        {
+            await _hubContext.Clients.All.ReceiveBroadCastMessageAsync(sendNotificationDto);
+        }
+
+
+        public async Task CreateAsync(CreateNotificationInput input)
+        {
+            await _notificationManager.CreateAsync(input.Title, input.Content, _currentUser.Id.Value, input.ReceiveIds,
+                input.MessageType);
+        }
+    }
+}

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Domain.Shared/CompanyName.ProjectName.NotificationManagement.Domain.Shared.csproj

@@ -3,7 +3,7 @@
  <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.NotificationManagement</RootNamespace>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Domain/CompanyName.ProjectName.NotificationManagement.Domain.csproj

@@ -3,7 +3,7 @@
     <Import Project="../../../../common.props" />
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>CompanyName.ProjectName.NotificationManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore/CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore.csproj

@@ -3,7 +3,7 @@
  <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.NotificationManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.HttpApi.Client/CompanyName.ProjectName.NotificationManagement.HttpApi.Client.csproj

@@ -3,7 +3,7 @@
  <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.NotificationManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.MongoDB/CompanyName.ProjectName.NotificationManagement.MongoDB.csproj

@@ -3,7 +3,7 @@
  <Import Project="../../../../common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.NotificationManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/QueryManagement/src/CompanyName.ProjectName.QueryManagement.Application.Contracts/CompanyName.ProjectName.QueryManagement.Application.Contracts.csproj

@@ -3,13 +3,13 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.QueryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.QueryManagement.Domain.Shared\CompanyName.ProjectName.QueryManagement.Domain.Shared.csproj" />
   </ItemGroup>
 

aspnet-core/modules/QueryManagement/src/CompanyName.ProjectName.QueryManagement.Application/CompanyName.ProjectName.QueryManagement.Application.csproj

@@ -3,13 +3,13 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.QueryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.QueryManagement.Application.Contracts\CompanyName.ProjectName.QueryManagement.Application.Contracts.csproj" />
     <ProjectReference Include="..\CompanyName.ProjectName.QueryManagement.Domain\CompanyName.ProjectName.QueryManagement.Domain.csproj" />
   </ItemGroup>

aspnet-core/modules/QueryManagement/src/CompanyName.ProjectName.QueryManagement.Domain.Shared/CompanyName.ProjectName.QueryManagement.Domain.Shared.csproj

@@ -3,13 +3,13 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.QueryManagement</RootNamespace>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Validation" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Validation" Version="4.4.0" />
   </ItemGroup>
 
   <ItemGroup>

aspnet-core/modules/QueryManagement/src/CompanyName.ProjectName.QueryManagement.Domain/CompanyName.ProjectName.QueryManagement.Domain.csproj

@@ -3,12 +3,12 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.QueryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.QueryManagement.Domain.Shared\CompanyName.ProjectName.QueryManagement.Domain.Shared.csproj" />
   </ItemGroup>
 

aspnet-core/modules/QueryManagement/src/CompanyName.ProjectName.QueryManagement.EntityFrameworkCore/CompanyName.ProjectName.QueryManagement.EntityFrameworkCore.csproj

@@ -3,12 +3,12 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.QueryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.QueryManagement.Domain\CompanyName.ProjectName.QueryManagement.Domain.csproj" />
   </ItemGroup>
 

aspnet-core/modules/QueryManagement/src/CompanyName.ProjectName.QueryManagement.FreeSqlMySql/CompanyName.ProjectName.QueryManagement.FreeSqlMySql.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
 	<ItemGroup>

aspnet-core/modules/QueryManagement/src/CompanyName.ProjectName.QueryManagement.FreeSqlMySql/Systems/Users/UserFreeSqlRepository.cs

@@ -16,8 +16,7 @@ namespace CompanyName.ProjectName.QueryManagement.FreeSqlMySql.Systems.Users
         public async Task<AbpUserFreeSqlDto> GetUserNameByIdAsync(Guid id)
         {
      
-            // todo 参数注入查询不到数据
+            var sql = $"select a.Id,a.Name,a.UserName,a.Email from AbpUsers a where a.Id=?id";
-            var sql = $"select a.Id,a.Name,a.UserName,a.Email from AbpUsers a where a.Id='39fdb236-a90e-e4b5-02a0-2866a8cf9823'";
             var se= await FreeSql.Select<AbpUserFreeSqlDto>()
                 .WithSql(sql,new {id})
                 .ToListAsync();

aspnet-core/modules/QueryManagement/src/CompanyName.ProjectName.QueryManagement.HttpApi.Client/CompanyName.ProjectName.QueryManagement.HttpApi.Client.csproj

@@ -3,12 +3,12 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.QueryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Http.Client" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.QueryManagement.Application.Contracts\CompanyName.ProjectName.QueryManagement.Application.Contracts.csproj" />
   </ItemGroup>
 

aspnet-core/modules/QueryManagement/src/CompanyName.ProjectName.QueryManagement.HttpApi/CompanyName.ProjectName.QueryManagement.HttpApi.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.QueryManagement.Application.Contracts\CompanyName.ProjectName.QueryManagement.Application.Contracts.csproj" />
   </ItemGroup>
 

aspnet-core/modules/QueryManagement/src/CompanyName.ProjectName.QueryManagement.MongoDB/CompanyName.ProjectName.QueryManagement.MongoDB.csproj

@@ -3,12 +3,12 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName.QueryManagement</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.MongoDB" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.MongoDB" Version="4.4.0" />
     <ProjectReference Include="..\CompanyName.ProjectName.QueryManagement.Domain\CompanyName.ProjectName.QueryManagement.Domain.csproj" />
   </ItemGroup>
 

aspnet-core/modules/QueryManagement/test/CompanyName.ProjectName.QueryManagement.EntityFrameworkCore.Tests/CompanyName.ProjectName.QueryManagement.EntityFrameworkCore.Tests.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.*" />
     <ProjectReference Include="..\..\src\CompanyName.ProjectName.QueryManagement.EntityFrameworkCore\CompanyName.ProjectName.QueryManagement.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\CompanyName.ProjectName.QueryManagement.TestBase\CompanyName.ProjectName.QueryManagement.TestBase.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="4.4.0" />
   </ItemGroup>
 
 </Project>

aspnet-core/modules/QueryManagement/test/CompanyName.ProjectName.QueryManagement.TestBase/CompanyName.ProjectName.QueryManagement.TestBase.csproj

@@ -14,9 +14,9 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="4.4.0" />
-    <PackageReference Include="Volo.Abp.TestBase" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.TestBase" Version="4.4.0" />
     <ProjectReference Include="..\..\src\CompanyName.ProjectName.QueryManagement.Domain\CompanyName.ProjectName.QueryManagement.Domain.csproj" />
   </ItemGroup>
 

aspnet-core/services/src/CompanyName.ProjectName.Application.Contracts/CompanyName.ProjectName.Application.Contracts.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName</RootNamespace>
   </PropertyGroup>
 

aspnet-core/services/src/CompanyName.ProjectName.Application/AuditLogs/AuditLogAppService.cs

@@ -29,6 +29,7 @@ namespace CompanyName.ProjectName.AuditLogs
                 input.EndTime,
                 input.HttpMethod,
                 input.Url,
+                null,
                 input.UserName,
                 input.ApplicationName,
                 input.CorrelationId,
@@ -41,6 +42,7 @@ namespace CompanyName.ProjectName.AuditLogs
                 input.EndTime,
                 input.HttpMethod,
                 input.Url,
+                null,
                 input.UserName,
                 input.ApplicationName,
                 input.CorrelationId,

aspnet-core/services/src/CompanyName.ProjectName.Domain.Shared/CompanyName.ProjectName.Domain.Shared.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName</RootNamespace>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>

aspnet-core/services/src/CompanyName.ProjectName.HttpApi.Client/CompanyName.ProjectName.HttpApi.Client.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CompanyName.ProjectName</RootNamespace>
   </PropertyGroup>
 

aspnet-core/services/src/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="Volo.Abp.Account.Web" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpPackageVersion)" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.HangFire" Version="4.3.3" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.HangFire" Version="4.4.0" />
     <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.Swashbuckle" Version="$(AbpPackageVersion)" />

aspnet-core/services/src/CompanyName.ProjectName.IdentityServer/Logs/logs.txt

@@ -134,7 +134,7 @@ StackExchange.Redis.RedisConnectionException: It was not possible to connect to
    at Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.GetAsync(String key, CancellationToken token)
    at Volo.Abp.Caching.DistributedCache`2.GetAsync(TCacheKey key, Nullable`1 hideErrors, Boolean considerUow, CancellationToken token)
 2021-08-14 12:59:14.893 +08:00 [ERR] An unhandled exception has occurred while executing the request.
-Autofac.Core.DependencyResolutionException: An exception was thrown while activating Volo.Abp.SettingManagement.EntityFrameworkCore.SettingManagementDbContext -> λ:Microsoft.EntityFrameworkCore.DbContextOptions`1[[Volo.Abp.SettingManagement.EntityFrameworkCore.SettingManagementDbContext, Volo.Abp.SettingManagement.EntityFrameworkCore, Version=4.3.3.0, Culture=neutral, PublicKeyToken=null]].
+Autofac.Core.DependencyResolutionException: An exception was thrown while activating Volo.Abp.SettingManagement.EntityFrameworkCore.SettingManagementDbContext -> λ:Microsoft.EntityFrameworkCore.DbContextOptions`1[[Volo.Abp.SettingManagement.EntityFrameworkCore.SettingManagementDbContext, Volo.Abp.SettingManagement.EntityFrameworkCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null]].
  ---> MySqlConnector.MySqlException (0x80004005): Unable to connect to any of the specified MySQL hosts.
    at MySqlConnector.Core.ServerSession.ConnectAsync(ConnectionSettings cs, Int32 startTickCount, ILoadBalancer loadBalancer, IOBehavior ioBehavior, CancellationToken cancellationToken) in /_/src/MySqlConnector/Core/ServerSession.cs:line 381
    at MySqlConnector.Core.ConnectionPool.GetSessionAsync(MySqlConnection connection, Int32 startTickCount, IOBehavior ioBehavior, CancellationToken cancellationToken) in /_/src/MySqlConnector/Core/ConnectionPool.cs:line 110
@@ -213,7 +213,7 @@ StackExchange.Redis.RedisConnectionException: It was not possible to connect to
    at Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.GetAsync(String key, CancellationToken token)
    at Volo.Abp.Caching.DistributedCache`2.GetAsync(TCacheKey key, Nullable`1 hideErrors, Boolean considerUow, CancellationToken token)
 2021-08-14 12:59:28.604 +08:00 [ERR] An unhandled exception has occurred while executing the request.
-Autofac.Core.DependencyResolutionException: An exception was thrown while activating Volo.Abp.SettingManagement.EntityFrameworkCore.SettingManagementDbContext -> λ:Microsoft.EntityFrameworkCore.DbContextOptions`1[[Volo.Abp.SettingManagement.EntityFrameworkCore.SettingManagementDbContext, Volo.Abp.SettingManagement.EntityFrameworkCore, Version=4.3.3.0, Culture=neutral, PublicKeyToken=null]].
+Autofac.Core.DependencyResolutionException: An exception was thrown while activating Volo.Abp.SettingManagement.EntityFrameworkCore.SettingManagementDbContext -> λ:Microsoft.EntityFrameworkCore.DbContextOptions`1[[Volo.Abp.SettingManagement.EntityFrameworkCore.SettingManagementDbContext, Volo.Abp.SettingManagement.EntityFrameworkCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null]].
  ---> MySqlConnector.MySqlException (0x80004005): Unable to connect to any of the specified MySQL hosts.
    at MySqlConnector.Core.ServerSession.ConnectAsync(ConnectionSettings cs, Int32 startTickCount, ILoadBalancer loadBalancer, IOBehavior ioBehavior, CancellationToken cancellationToken) in /_/src/MySqlConnector/Core/ServerSession.cs:line 381
    at MySqlConnector.Core.ConnectionPool.GetSessionAsync(MySqlConnection connection, Int32 startTickCount, IOBehavior ioBehavior, CancellationToken cancellationToken) in /_/src/MySqlConnector/Core/ConnectionPool.cs:line 110

aspnet-core/services/src/CompanyName.ProjectName.IdentityServer/package.json

@@ -3,6 +3,6 @@
   "name": "my-app-identityserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.3"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^4.4.0"
   }
 }

aspnet-core/services/src/CompanyName.ProjectName.IdentityServer/yarn.lock

@@ -2,36 +2,36 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^4.3.3":
+"@abp/aspnetcore.mvc.ui.theme.basic@^4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.3.3.tgz#ca82af2a2929ec2356c0f000e1c05be2b47da454"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.4.0.tgz#ca82af2a2929ec2356c0f000e1c05be2b47da454"
   integrity sha512-TjI3ZKJWzYkLGYNzhun6ZhA1C971wW+HaUEXJbAeZU2SryvpRIX7vSAKRUjQhpj6B2pUksWW/HIbMndpjcikDA==
   dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.3.3"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~4.4.0"
 
-"@abp/aspnetcore.mvc.ui.theme.shared@~4.3.3":
+"@abp/aspnetcore.mvc.ui.theme.shared@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.3.3.tgz#01152192c12a6cf7c91b752523046bad7911b3b9"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.4.0.tgz#01152192c12a6cf7c91b752523046bad7911b3b9"
   integrity sha512-fWT1gFLh+9uMaH6OGMjwWAfwxcQGn7NJoQCd6o6xAeYiC6HdtXSkfKcn6Xvwa3rTI+Yu/JAf+5MhO1bz8oj2Wg==
   dependencies:
-    "@abp/aspnetcore.mvc.ui" "~4.3.3"
+    "@abp/aspnetcore.mvc.ui" "~4.4.0"
-    "@abp/bootstrap" "~4.3.3"
+    "@abp/bootstrap" "~4.4.0"
-    "@abp/bootstrap-datepicker" "~4.3.3"
+    "@abp/bootstrap-datepicker" "~4.4.0"
-    "@abp/datatables.net-bs4" "~4.3.3"
+    "@abp/datatables.net-bs4" "~4.4.0"
-    "@abp/font-awesome" "~4.3.3"
+    "@abp/font-awesome" "~4.4.0"
-    "@abp/jquery-form" "~4.3.3"
+    "@abp/jquery-form" "~4.4.0"
-    "@abp/jquery-validation-unobtrusive" "~4.3.3"
+    "@abp/jquery-validation-unobtrusive" "~4.4.0"
-    "@abp/lodash" "~4.3.3"
+    "@abp/lodash" "~4.4.0"
-    "@abp/luxon" "~4.3.3"
+    "@abp/luxon" "~4.4.0"
-    "@abp/malihu-custom-scrollbar-plugin" "~4.3.3"
+    "@abp/malihu-custom-scrollbar-plugin" "~4.4.0"
-    "@abp/select2" "~4.3.3"
+    "@abp/select2" "~4.4.0"
-    "@abp/sweetalert" "~4.3.3"
+    "@abp/sweetalert" "~4.4.0"
-    "@abp/timeago" "~4.3.3"
+    "@abp/timeago" "~4.4.0"
-    "@abp/toastr" "~4.3.3"
+    "@abp/toastr" "~4.4.0"
-
+
-"@abp/aspnetcore.mvc.ui@~4.3.3":
+"@abp/aspnetcore.mvc.ui@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.3.3.tgz#f6b7cf416a26f92dcb4a43f12901a3216a883fdc"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.4.0.tgz#f6b7cf416a26f92dcb4a43f12901a3216a883fdc"
   integrity sha512-19upZ8GTB8CPAyBJYNi0NWXxrdks+dgcgrVVyd6jjB2/03I3cc6j/sRz2+lQ9G+AL7nuF/K3q2u/KLzywSB/1g==
   dependencies:
     ansi-colors "^4.1.1"
@@ -41,144 +41,144 @@
     merge-stream "^2.0.0"
     micromatch "^4.0.2"
 
-"@abp/bootstrap-datepicker@~4.3.3":
+"@abp/bootstrap-datepicker@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.3.3.tgz#c0aa0e64b3c44c6601a758c0d20e869ad1f6f706"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.4.0.tgz#c0aa0e64b3c44c6601a758c0d20e869ad1f6f706"
   integrity sha512-xagwxUN6SdPE5wRxX4PCp7nf5q5PXJdk04agYjIh2/oEUo/Q8fjUBhfAfMjD7DX09iXOLaWF43FJ0q3QCQeZDw==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~4.3.3":
+"@abp/bootstrap@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.3.3.tgz#ba904bed5f5824ea2cbad91e7ffbf3db8b2c2a4f"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.4.0.tgz#ba904bed5f5824ea2cbad91e7ffbf3db8b2c2a4f"
   integrity sha512-68jAvd8U1OrBAPoY9iTuGOd/tlC/44RJHVUQaArXZQ2Xr6kLacCyChDW4QSgMtehHMSXJ/yeJuFLKm5k7iNcoQ==
   dependencies:
-    "@abp/core" "~4.3.3"
+    "@abp/core" "~4.4.0"
     bootstrap "^4.6.0"
     bootstrap-v4-rtl "4.6.0-1"
 
-"@abp/core@~4.3.3":
+"@abp/core@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.3.3.tgz#4e7c438c2ee8cbaf505767a4e2882c3ff8d9e705"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.4.0.tgz#4e7c438c2ee8cbaf505767a4e2882c3ff8d9e705"
   integrity sha512-Bak6DgD+xniPr6i0tRYyZBajLdkjo13JgUTV1piuvQWSYfg29KnwJ8yobrjO/c2ipKJlTtcdNehgEPoBieM5fA==
   dependencies:
-    "@abp/utils" "^4.3.3"
+    "@abp/utils" "^4.4.0"
 
-"@abp/datatables.net-bs4@~4.3.3":
+"@abp/datatables.net-bs4@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.3.3.tgz#15d8e1b55f1444cabc537e7227cc853a72b35556"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.4.0.tgz#15d8e1b55f1444cabc537e7227cc853a72b35556"
   integrity sha512-dAdcVUrrpYlvRVYn6RdH1PTqbKdCJrmPx95j/VQsjfvFNLtorMBqBNuQV0sAHgYtra6q2WsRYt+jJP2OmQcyQA==
   dependencies:
-    "@abp/datatables.net" "~4.3.3"
+    "@abp/datatables.net" "~4.4.0"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~4.3.3":
+"@abp/datatables.net@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.3.3.tgz#be193b630ab40a23ce3a57d9209eda63938e74ff"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.4.0.tgz#be193b630ab40a23ce3a57d9209eda63938e74ff"
   integrity sha512-zLDirf+Ut4QgMvSaDM1RVq+VPF/U7tw7Lp5pnuA0ray8t4v5Szo44MGk6GZCk6uCdUI8QooOMaWcQuGk89xlQQ==
   dependencies:
-    "@abp/jquery" "~4.3.3"
+    "@abp/jquery" "~4.4.0"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~4.3.3":
+"@abp/font-awesome@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.3.3.tgz#d612ede5afb9dd07cc7824c7147c1f1e08defb77"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.4.0.tgz#d612ede5afb9dd07cc7824c7147c1f1e08defb77"
   integrity sha512-njuvwvjN3vhwJk2ln8SXDShsO/GdZ4M4zJCKy73s9qZh7Uyr6aiNGMap3bo8yK8MyNx0AXWi7QGYp3Zp2FA7QQ==
   dependencies:
-    "@abp/core" "~4.3.3"
+    "@abp/core" "~4.4.0"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~4.3.3":
+"@abp/jquery-form@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.3.3.tgz#fa850cb5c9de9f584a8a57da934199719a2f71e7"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.4.0.tgz#fa850cb5c9de9f584a8a57da934199719a2f71e7"
   integrity sha512-24/X/SKe/wJNxIeXxFfW3EfKLXR7eAygdMm2X8lleqcS1K5aRTXCxt/tDlyHgrDh5nFMBaFwbJ1p3ii7ukRWRw==
   dependencies:
-    "@abp/jquery" "~4.3.3"
+    "@abp/jquery" "~4.4.0"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~4.3.3":
+"@abp/jquery-validation-unobtrusive@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.3.3.tgz#183ddca2f96035f21de75097bcd15a5ff54b662f"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.4.0.tgz#183ddca2f96035f21de75097bcd15a5ff54b662f"
   integrity sha512-YlDIgOe98H8HNzTFmFukz5+p/AW8baSfppXQLJNlY9xzx83lkW9/gLc/LdSO9243NI2a1nowLVZ7vcL6dMv9kQ==
   dependencies:
-    "@abp/jquery-validation" "~4.3.3"
+    "@abp/jquery-validation" "~4.4.0"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~4.3.3":
+"@abp/jquery-validation@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.3.3.tgz#a76f0ca233abf134cb557019c2aa7777c1b0ba1b"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.4.0.tgz#a76f0ca233abf134cb557019c2aa7777c1b0ba1b"
   integrity sha512-PYVcz6ehbI43LEwhet89wHZBBoPdbHu/aSgaYHRC4scQu0EhXN8RpPyHmEsb7SyvRP6c8QBFvofDDY3LO73pWA==
   dependencies:
-    "@abp/jquery" "~4.3.3"
+    "@abp/jquery" "~4.4.0"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~4.3.3":
+"@abp/jquery@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.3.3.tgz#889245ae382bbefeee3b932b68c86e8016f33aab"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.4.0.tgz#889245ae382bbefeee3b932b68c86e8016f33aab"
   integrity sha512-qY1f3EDDjaJyAKSxl2gxrt/U1y2yLWLq1x7QReTtuhkHEwrs+xZ5AOy4Lum3Q7awiGKysvJhPS2JfaRKeG+skA==
   dependencies:
-    "@abp/core" "~4.3.3"
+    "@abp/core" "~4.4.0"
     jquery "~3.5.1"
 
-"@abp/lodash@~4.3.3":
+"@abp/lodash@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.3.3.tgz#6ca17141ee9d5cfb89c51b4bbb49e06289c10b36"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.4.0.tgz#6ca17141ee9d5cfb89c51b4bbb49e06289c10b36"
   integrity sha512-1pxZ5pNwY0ZBDkchY94ji6ctEK+0dK1APMMctxOpd5BYynQbdjj/skKWiPl6HfznxI/qi2y6vJheFnKUhLDjAA==
   dependencies:
-    "@abp/core" "~4.3.3"
+    "@abp/core" "~4.4.0"
     lodash "^4.17.15"
 
-"@abp/luxon@~4.3.3":
+"@abp/luxon@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.3.3.tgz#da0448cb6d9a93a85e0885fb0fdbd432aec3e7f1"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.4.0.tgz#da0448cb6d9a93a85e0885fb0fdbd432aec3e7f1"
   integrity sha512-0mf0A1bIfzcsvoxkfY203iZfnHIO5KjhLbZsRZT7A2xp3g9Nmnj8YGD3CSAJCAs0Usi/FBetBtEIs3vv2wzvWw==
   dependencies:
-    "@abp/core" "~4.3.3"
+    "@abp/core" "~4.4.0"
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~4.3.3":
+"@abp/malihu-custom-scrollbar-plugin@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.3.3.tgz#64d83674d0da1f50c48ffcf9aed5d7669f12ba77"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.4.0.tgz#64d83674d0da1f50c48ffcf9aed5d7669f12ba77"
   integrity sha512-6NqOWufGqs5Hfivwt8fTJCz51c2XFtCRG9NSef5qhWIsqB8T3R0+pCUueA91oNaBDA0gmMpXQAL4fP0vSb96sg==
   dependencies:
-    "@abp/core" "~4.3.3"
+    "@abp/core" "~4.4.0"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~4.3.3":
+"@abp/select2@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.3.3.tgz#6fe97eb15873493821560ff3bb0188094f58f9b3"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.4.0.tgz#6fe97eb15873493821560ff3bb0188094f58f9b3"
   integrity sha512-L/03kw/UwB5bMgEifuGp2WAi/mD7NdzVGhV85vxnIFDqNL5YJzki6khCFy1gOP9A8fIaWbra0d81RwrEFDHcBw==
   dependencies:
-    "@abp/core" "~4.3.3"
+    "@abp/core" "~4.4.0"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~4.3.3":
+"@abp/sweetalert@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.3.3.tgz#56a6fd89956851c9801085ac17beb1199878a887"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.4.0.tgz#56a6fd89956851c9801085ac17beb1199878a887"
   integrity sha512-tHGYWKum8YFBdfhvCeCpv5Qn4tfSHvXYxWxQysB+K2t+s5F6YGOo/IsEGipRVzfO5E4BsdWZ2UTp18MMRgCmGw==
   dependencies:
-    "@abp/core" "~4.3.3"
+    "@abp/core" "~4.4.0"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~4.3.3":
+"@abp/timeago@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.3.3.tgz#64140843778b0da67bddc693a980fe06740774cb"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.4.0.tgz#64140843778b0da67bddc693a980fe06740774cb"
   integrity sha512-eJa6C38eINvcu9dLZSgsIp/o/KLOHgertxMCIraSnkH3QwngUqVLfXRZg2DOEh14dxAUPpTiKp6cHS+YLe8PEg==
   dependencies:
-    "@abp/jquery" "~4.3.3"
+    "@abp/jquery" "~4.4.0"
     timeago "^1.6.7"
 
-"@abp/toastr@~4.3.3":
+"@abp/toastr@~4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.3.3.tgz#31927392bcaefb4d00ac208b6d32e63c4d08da50"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.4.0.tgz#31927392bcaefb4d00ac208b6d32e63c4d08da50"
   integrity sha512-jfknDSeljI5sUcj57B4U+UgR5l9Ii7bBhJiAOSl+pE0oJh9NJckHgAI7vlT5m8LqdRsT+wpFZ+go+VaoHTCStw==
   dependencies:
-    "@abp/jquery" "~4.3.3"
+    "@abp/jquery" "~4.4.0"
     toastr "^2.1.4"
 
-"@abp/utils@^4.3.3":
+"@abp/utils@^4.4.0":
-  version "4.3.3"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.3.tgz#2e724cf80800fef678627f6f212a8be895cc75bd"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.4.0.tgz#2e724cf80800fef678627f6f212a8be895cc75bd"
   integrity sha512-gXoTV7AltWyiqqOi6NE2DwUAJfI08AbByD2YVsst5LmqZGY5oX7CQOLdbDuuXlKou/kHwNzc25EMe1O4/r6rYw==
   dependencies:
     just-compare "^1.3.0"