✨ 日常Bug提交

aspnet-core/Directory.Build.props

@@ -1,36 +1,38 @@
 <Project>
 
-  <PropertyGroup>
+	<PropertyGroup>
-    <AbpPackageVersion>4.4.0</AbpPackageVersion>
+		<AbpPackageVersion>4.4.0</AbpPackageVersion>
-   
-    <DotNetCoreCAPVersion>5.1.4</DotNetCoreCAPVersion>
-    <MicrosoftVersion>5.0.12</MicrosoftVersion>
-    <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
-    <MicrosoftExtensionsHttpVersion>5.0.0</MicrosoftExtensionsHttpVersion>
-    <SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
-    <MicrosoftExtensionsDependencyModelVersion>5.0.0</MicrosoftExtensionsDependencyModelVersion>
-    <EasyAbpSttingVersion>1.5.0</EasyAbpSttingVersion>
-    <SerilogVersion>2.10.0</SerilogVersion>
-    <SerilogExtensionsLoggingVersion>3.0.1</SerilogExtensionsLoggingVersion>
-    <SerilogSinksAsyncVersion>1.4.0</SerilogSinksAsyncVersion>
-    <SerilogSinksFileVersion>5.0.0</SerilogSinksFileVersion>
-    <SerilogSinksConsoleVersion>3.1.1</SerilogSinksConsoleVersion>
-    <SerilogAspNetCoreVersion>4.1.0</SerilogAspNetCoreVersion>
-    <SerilogExceptionsVersion>7.0.0</SerilogExceptionsVersion>
-    <SerilogSettingsConfigurationVersion>3.1.0</SerilogSettingsConfigurationVersion>
-    <SerilogSinksElasticsearchVersion>8.4.1</SerilogSinksElasticsearchVersion>
-    <NESTVersion>7.15.1</NESTVersion>
-    <HangfireMySqlStorageVersion>2.0.3</HangfireMySqlStorageVersion>
-    <SwashbuckleAspNetCoreAnnotationsVersion>6.1.4</SwashbuckleAspNetCoreAnnotationsVersion>
-    <MicrosoftNETTestSdkVersion>16.9.1</MicrosoftNETTestSdkVersion>
-    <NSubstituteVersion>4.2.2</NSubstituteVersion>
-    <ShouldlyVersion>4.0.3</ShouldlyVersion>
-    <XunitVersion>2.4.1</XunitVersion>
-    <Xunitrunnervisualstudio>2.4.3</Xunitrunnervisualstudio>
-    <OcelotVersion>17.0.0</OcelotVersion>
-    <SwaggerUIVersion>6.2.3</SwaggerUIVersion>
-    <FreeSqlVersion>2.5.200</FreeSqlVersion>
 
-  </PropertyGroup>
+		<DotNetCoreCAPVersion>5.1.4</DotNetCoreCAPVersion>
+		<MicrosoftVersion>5.0.12</MicrosoftVersion>
+		<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
+		<MicrosoftExtensionsHttpVersion>5.0.0</MicrosoftExtensionsHttpVersion>
+		<SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
+		<MicrosoftExtensionsDependencyModelVersion>5.0.0</MicrosoftExtensionsDependencyModelVersion>
+		<EasyAbpSttingVersion>1.5.0</EasyAbpSttingVersion>
+		<SerilogVersion>2.10.0</SerilogVersion>
+		<SerilogExtensionsLoggingVersion>3.0.1</SerilogExtensionsLoggingVersion>
+		<SerilogSinksAsyncVersion>1.4.0</SerilogSinksAsyncVersion>
+		<SerilogSinksFileVersion>5.0.0</SerilogSinksFileVersion>
+		<SerilogSinksConsoleVersion>3.1.1</SerilogSinksConsoleVersion>
+		<SerilogAspNetCoreVersion>4.1.0</SerilogAspNetCoreVersion>
+		<SerilogExceptionsVersion>7.0.0</SerilogExceptionsVersion>
+		<SerilogSettingsConfigurationVersion>3.1.0</SerilogSettingsConfigurationVersion>
+		<SerilogSinksElasticsearchVersion>8.4.1</SerilogSinksElasticsearchVersion>
+		<NESTVersion>7.15.1</NESTVersion>
+		<HangfireMySqlStorageVersion>2.0.3</HangfireMySqlStorageVersion>
+		<SwashbuckleAspNetCoreAnnotationsVersion>6.1.4</SwashbuckleAspNetCoreAnnotationsVersion>
+		<MicrosoftNETTestSdkVersion>16.9.1</MicrosoftNETTestSdkVersion>
+		<NSubstituteVersion>4.2.2</NSubstituteVersion>
+		<ShouldlyVersion>4.0.3</ShouldlyVersion>
+		<XunitVersion>2.4.1</XunitVersion>
+		<Xunitrunnervisualstudio>2.4.3</Xunitrunnervisualstudio>
+		<OcelotVersion>17.0.0</OcelotVersion>
+		<SwaggerUIVersion>6.2.3</SwaggerUIVersion>
+		<FreeSqlVersion>2.5.200</FreeSqlVersion>
+
+		<MicrosoftAspNetCoreSignalRStackExchangeRedisVersion>2.5.200</MicrosoftAspNetCoreSignalRStackExchangeRedisVersion>
+
+	</PropertyGroup>
 
 </Project>

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

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpPackageVersion)" />
-    <PackageReference Include="Volo.Abp.Caching" Version="4.4.0" />
+    <PackageReference Include="Volo.Abp.Caching" Version="$(AbpPackageVersion)" />
    
     <ProjectReference Include="..\CompanyName.ProjectName.DataDictionaryManagement.Domain.Shared\CompanyName.ProjectName.DataDictionaryManagement.Domain.Shared.csproj" />
   </ItemGroup>

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

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="$(SwashbuckleAspNetCoreAnnotationsVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="$(AbpPackageVersion)" />
     <ProjectReference Include="..\CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts\CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts.csproj" />
   </ItemGroup>

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

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="5.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="$(MicrosoftAspNetCoreSignalRStackExchangeRedisVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.AutoMapper" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.Ddd.Application" Version="$(AbpPackageVersion)" />

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

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="$(SwashbuckleAspNetCoreAnnotationsVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="$(AbpPackageVersion)" />
     <ProjectReference Include="..\CompanyName.ProjectName.NotificationManagement.Application.Contracts\CompanyName.ProjectName.NotificationManagement.Application.Contracts.csproj" />
   </ItemGroup>

aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.HttpApi/Notifications/NotificationController.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using CompanyName.ProjectName.NotificationManagement.Notifications.Dtos;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
@@ -9,7 +10,7 @@ using Volo.Abp.AspNetCore.Mvc;
 namespace CompanyName.ProjectName.NotificationManagement.Notifications
 {
     [Route("Notification")]
-    public class NotificationController : AbpController, IApplicationService
+    public class NotificationController : AbpController, INotificationAppService
     {
         private readonly INotificationAppService _notificationAppService;
 
@@ -61,5 +62,12 @@ namespace CompanyName.ProjectName.NotificationManagement.Notifications
         {
             return _notificationAppService.CreateAsync(input);
         }
+
+        [HttpPost("SendMessage")]
+        [SwaggerOperation(summary: "发送消息-测试使用", Tags = new[] { "Notification" })]
+        public Task SendMessageAsync(string title, string content, MessageType messageType, List<string> users)
+        {
+            return _notificationAppService.SendMessageAsync(title, content, messageType, users);
+        }
     }
 }

aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/Pages/Login.cshtml.cs

@@ -40,6 +40,7 @@ namespace CompanyName.ProjectName.Pages
             if (userName.IsNullOrWhiteSpace() || password.IsNullOrWhiteSpace())
             {
                 Response.Redirect("/Login");
+                return;
             }
 
             try
@@ -56,7 +57,7 @@ namespace CompanyName.ProjectName.Pages
 
 
                 var result = await _accountAppService.LoginAsync(new LoginInput()
-                    { Name = userName, Password = password });
+                { Name = userName, Password = password });
                 Response.Cookies.Append(ProjectNameHttpApiHostConsts.DefaultCookieName,
                     result.Token, options);
             }
@@ -64,6 +65,7 @@ namespace CompanyName.ProjectName.Pages
             {
                 _logger.LogError($"登录失败：{e.Message}");
                 Response.Redirect("/Login");
+                return;
             }
 
             Response.Redirect("/monitor");

aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs

@@ -293,13 +293,13 @@ namespace CompanyName.ProjectName
                     options.AddSecurityDefinition(JwtBearerDefaults.AuthenticationScheme,
                         new OpenApiSecurityScheme()
                         {
-                            Description =
+                            Description = "直接在下框输入JWT生成的Token",
-                                "Please enter into field the word 'Bearer' followed by a space and the JWT value",
                             Name = "Authorization",
                             In = ParameterLocation.Header,
                             Type = SecuritySchemeType.Http,
                             Scheme = JwtBearerDefaults.AuthenticationScheme,
                             BearerFormat = "JWT"
+
                         });
                     options.AddSecurityRequirement(new OpenApiSecurityRequirement
                     {
@@ -320,7 +320,7 @@ namespace CompanyName.ProjectName
                         Type = SecuritySchemeType.ApiKey,
                         In = ParameterLocation.Header,
                         Name = "Accept-Language",
-                        Description = "多语言"
+                        Description = "多语言设置，系统预设语言有zh-Hans、en，默认为zh-Hans"
                     });
 
                     options.AddSecurityRequirement(new OpenApiSecurityRequirement

aspnet-core/services/src/CompanyName.ProjectName.Application/ElasticSearchs/ElasticSearchApplicationAutoMapperProfile.cs

@@ -0,0 +1,18 @@
+using AutoMapper;
+using CompanyName.ProjectName.ElasticsearchRepository.Dto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CompanyName.ProjectName.ElasticSearchs
+{
+    public class ElasticSearchApplicationAutoMapperProfile : Profile
+    {
+        public ElasticSearchApplicationAutoMapperProfile()
+        {
+            CreateMap<PagingElasticSearchLogDto, PagingElasticSearchLogOutput>();
+        }
+    }
+}

aspnet-core/services/src/CompanyName.ProjectName.Application/IdentityServers/IdentityServerApplicationAutoMapperProfile.cs

@@ -38,7 +38,6 @@ namespace CompanyName.ProjectName.IdentityServers.Mappers
             CreateMap<ApiScope, PagingApiScopeListOutput>();
             CreateMap<IdentityResource, PagingIdentityResourceListOutput>();
 
-            CreateMap<PagingElasticSearchLogDto, PagingElasticSearchLogOutput>();
         }
     }
 }

aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/IProjectNameDbContext.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Data;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace CompanyName.ProjectName.EntityFrameworkCore
+{
+    [ConnectionStringName("Default")]
+    public interface IProjectNameDbContext : IEfCoreDbContext
+    {
+
+    }
+}

aspnet-core/services/src/CompanyName.ProjectName.EntityFrameworkCore/EntityFrameworkCore/ProjectNameDbContext.cs

@@ -36,7 +36,7 @@ namespace CompanyName.ProjectName.EntityFrameworkCore
      * used modules (as explained above). See ProjectNameMigrationsDbContext for migrations.
      */
     [ConnectionStringName("Default")]
-    public class ProjectNameDbContext : AbpDbContext<ProjectNameDbContext>,
+    public class ProjectNameDbContext : AbpDbContext<ProjectNameDbContext>, IProjectNameDbContext,
         IFeatureManagementDbContext,
         IIdentityDbContext,
         IPermissionManagementDbContext,
@@ -70,7 +70,7 @@ namespace CompanyName.ProjectName.EntityFrameworkCore
 
         protected override void OnModelCreating(ModelBuilder builder)
         {
-            
+
             // 如何设置表前缀
             // Abp框架表前缀 Abp得不建议修改表前缀
             // AbpCommonDbProperties.DbTablePrefix = "xxx";
@@ -80,7 +80,7 @@ namespace CompanyName.ProjectName.EntityFrameworkCore
             //NotificationManagementDbProperties = "xxx"
             base.OnModelCreating(builder);
 
-            builder.ConfigurePermissionManagement( );
+            builder.ConfigurePermissionManagement();
             builder.ConfigureSettingManagement();
             builder.ConfigureBackgroundJobs();
             builder.ConfigureAuditLogging();
@@ -89,8 +89,8 @@ namespace CompanyName.ProjectName.EntityFrameworkCore
             builder.ConfigureTenantManagement();
             builder.ConfigureIdentityServer();
             builder.ConfigureProjectName();
-            
+
-            
+
             // 数据字典
             builder.ConfigureDataDictionaryManagement();
 

aspnet-core/services/src/CompanyName.ProjectName.HttpApi/Controllers/ProjectNameController.cs

@@ -6,7 +6,7 @@ namespace CompanyName.ProjectName.Controllers
 {
     /* Inherit your controllers from this class.
      */
-    public abstract class ProjectNameController : AbpController, IApplicationService
+    public abstract class ProjectNameController : AbpController
     {
         protected ProjectNameController()
         {