Browse Source

⬆️ 升级abp5.0.0.rc-1

⬆️  升级net6.0
5.0.0.1
王军 4 years ago
parent
commit
c3ce4cd22c
  1. 20
      aspnet-core/Directory.Build.props
  2. 2
      aspnet-core/frameworks/CAP/src/CompanyName.ProjectName.CAP/CompanyName.ProjectName.CAP.csproj
  3. 38
      aspnet-core/frameworks/CAP/src/CompanyName.ProjectName.CAP/ProjectNameAbpCapDistributedEventBus.cs
  4. 4
      aspnet-core/frameworks/Extensions/src/CompanyName.ProjectName.Extension/CompanyName.ProjectName.Extension.csproj
  5. 2
      aspnet-core/gateways/CompanyName.ProjectName.WebGateway/CompanyName.ProjectName.WebGateway.csproj
  6. 2
      aspnet-core/global.json
  7. 2
      aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj
  8. 2
      aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts/CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts.csproj
  9. 2
      aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.Application/CompanyName.ProjectName.DataDictionaryManagement.Application.csproj
  10. 2
      aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.Domain.Shared/CompanyName.ProjectName.DataDictionaryManagement.Domain.Shared.csproj
  11. 2
      aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.Domain/CompanyName.ProjectName.DataDictionaryManagement.Domain.csproj
  12. 2
      aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore/CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore.csproj
  13. 13
      aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore/EntityFrameworkCore/DataDictionaries/EfCoreDataDictionaryRepository.cs
  14. 2
      aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Client/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Client.csproj
  15. 4
      aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.HttpApi/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.csproj
  16. 2
      aspnet-core/modules/DataDictionaryManagement/test/CompanyName.ProjectName.DataDictionaryManagement.Application.Tests/CompanyName.ProjectName.DataDictionaryManagement.Application.Tests.csproj
  17. 2
      aspnet-core/modules/DataDictionaryManagement/test/CompanyName.ProjectName.DataDictionaryManagement.Domain.Tests/CompanyName.ProjectName.DataDictionaryManagement.Domain.Tests.csproj
  18. 2
      aspnet-core/modules/DataDictionaryManagement/test/CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore.Tests/CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore.Tests.csproj
  19. 2
      aspnet-core/modules/DataDictionaryManagement/test/CompanyName.ProjectName.DataDictionaryManagement.TestBase/CompanyName.ProjectName.DataDictionaryManagement.TestBase.csproj
  20. 2
      aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application.Contracts/CompanyName.ProjectName.NotificationManagement.Application.Contracts.csproj
  21. 2
      aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Application/CompanyName.ProjectName.NotificationManagement.Application.csproj
  22. 2
      aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Domain.Shared/CompanyName.ProjectName.NotificationManagement.Domain.Shared.csproj
  23. 2
      aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.Domain/CompanyName.ProjectName.NotificationManagement.Domain.csproj
  24. 2
      aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore/CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore.csproj
  25. 2
      aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.HttpApi.Client/CompanyName.ProjectName.NotificationManagement.HttpApi.Client.csproj
  26. 4
      aspnet-core/modules/NotificationManagement/src/CompanyName.ProjectName.NotificationManagement.HttpApi/CompanyName.ProjectName.NotificationManagement.HttpApi.csproj
  27. 2
      aspnet-core/modules/NotificationManagement/test/CompanyName.ProjectName.NotificationManagement.Application.Tests/CompanyName.ProjectName.NotificationManagement.Application.Tests.csproj
  28. 2
      aspnet-core/modules/NotificationManagement/test/CompanyName.ProjectName.NotificationManagement.Domain.Tests/CompanyName.ProjectName.NotificationManagement.Domain.Tests.csproj
  29. 2
      aspnet-core/modules/NotificationManagement/test/CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore.Tests/CompanyName.ProjectName.NotificationManagement.EntityFrameworkCore.Tests.csproj
  30. 2
      aspnet-core/modules/NotificationManagement/test/CompanyName.ProjectName.NotificationManagement.TestBase/CompanyName.ProjectName.NotificationManagement.TestBase.csproj
  31. 6
      aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj
  32. 2
      aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.json
  33. BIN
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer.zip
  34. 20
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/CompanyName.ProjectName.IdentityServer.csproj
  35. 44
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/Pages/Index.cshtml
  36. 16
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/Pages/Index.cshtml.cs
  37. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/Program.cs
  38. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/Properties/launchSettings.json
  39. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/abp.resourcemapping.js
  40. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.Development.json
  41. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.json
  42. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/package.json
  43. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/tempkey.jwk
  44. 0
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/css/login_gobal.css
  45. 0
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/css/login_portal.css
  46. 0
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/fonts/login_font.css
  47. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/global-styles.css
  48. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js
  49. 15007
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.css
  50. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.css.map
  51. 6
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.min.css
  52. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.min.css.map
  53. 11197
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.css
  54. 1
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.css.map
  55. 7
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css
  56. 1
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css.map
  57. 9921
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js
  58. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js.map
  59. 4
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js
  60. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map
  61. 5
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.enable.tooltips.everywhere.js
  62. 224
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/datatables.net-bs5/css/dataTables.bootstrap5.css
  63. 184
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/datatables.net-bs5/js/dataTables.bootstrap5.js
  64. 4
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/select2/js/select2-bootstrap-modal-patch.js
  65. 3123
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.all.js
  66. 2
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.all.min.js
  67. 1319
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.css
  68. 3121
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.js
  69. 1
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.min.css
  70. 1
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.min.js
  71. 248
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/yarn.lock
  72. 64
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/CompanyName.ProjectName.IdentityServer.csproj
  73. 0
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Dockerfile
  74. 71
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Extensions/SameSiteCookiesServiceCollectionExtensions.cs
  75. 8536
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Logs/logs.txt
  76. 33
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Account/LoggedOut.cshtml
  77. 70
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Account/Login.cshtml
  78. 0
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Account/ReWriteLogin.cshtml
  79. 36
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Index.cshtml
  80. 16
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Index.cshtml.cs
  81. 35
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Welcome.cshtml
  82. 22
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Welcome.cshtml.cs
  83. 4
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/_ViewImports.cshtml
  84. 54
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Program.cs
  85. 11
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/ProjectNameBrandingProvider.cs
  86. 190
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/ProjectNameIdentityServerModule.cs
  87. 12
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Properties/launchSettings.json
  88. 18
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Startup.cs
  89. 11
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/abp.resourcemapping.js
  90. 15
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/appsettings.Production.json
  91. 15
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/appsettings.json
  92. 0
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/gulpfile.js
  93. 8
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/package.json
  94. 1
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/tempkey.jwk
  95. 1
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/tempkey.rsa
  96. 21844
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/wwwroot/css/argon.css
  97. 18
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/wwwroot/css/argon.min.css
  98. 71
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/wwwroot/css/site.css
  99. 1
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/wwwroot/css/yh_gobal.css
  100. 1
      aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/wwwroot/css/yh_portal.css

20
aspnet-core/Directory.Build.props

@ -1,13 +1,17 @@
<Project>
<PropertyGroup>
<AbpPackageVersion>4.4.0</AbpPackageVersion>
<DotNetCoreCAPVersion>5.1.4</DotNetCoreCAPVersion>
<MicrosoftVersion>5.0.12</MicrosoftVersion>
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
<AbpPackageVersion>5.0.0-rc.1</AbpPackageVersion>
<DotNetCoreCAPVersion>6.0.0-preview-153999281</DotNetCoreCAPVersion>
<MicrosoftVersion>6.0.0</MicrosoftVersion>
<MicrosoftExtensionsHttpVersion>5.0.0</MicrosoftExtensionsHttpVersion>
<SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
<MicrosoftExtensionsDependencyModelVersion>5.0.0</MicrosoftExtensionsDependencyModelVersion>
<SwashbuckleVersion>6.2.3</SwashbuckleVersion>
<MicrosoftNETTestSdkVersion>17.0.0</MicrosoftNETTestSdkVersion>
<FreeSqlVersion>2.5.200</FreeSqlVersion>
<MiniProfilerVersion>4.2.22</MiniProfilerVersion>
<SerilogVersion>2.10.0</SerilogVersion>
<SerilogExtensionsLoggingVersion>3.0.1</SerilogExtensionsLoggingVersion>
<SerilogSinksAsyncVersion>1.4.0</SerilogSinksAsyncVersion>
@ -17,18 +21,14 @@
<SerilogExceptionsVersion>7.0.0</SerilogExceptionsVersion>
<SerilogSettingsConfigurationVersion>3.1.0</SerilogSettingsConfigurationVersion>
<SerilogSinksElasticsearchVersion>8.4.1</SerilogSinksElasticsearchVersion>
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
<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>
<XunitrunnervisualstudioVersion>2.4.3</XunitrunnervisualstudioVersion>
<OcelotVersion>17.0.0</OcelotVersion>
<SwaggerUIVersion>6.2.3</SwaggerUIVersion>
<FreeSqlVersion>2.5.200</FreeSqlVersion>
<MiniProfiler>4.2.22</MiniProfiler>
</PropertyGroup>
</Project>

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

@ -2,7 +2,7 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="5.1.1" />

38
aspnet-core/frameworks/CAP/src/CompanyName.ProjectName.CAP/ProjectNameAbpCapDistributedEventBus.cs

@ -12,6 +12,7 @@ using Volo.Abp.EventBus;
using Volo.Abp.EventBus.Distributed;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Threading;
using Volo.Abp.Uow;
namespace CompanyName.ProjectName.CAP
{
@ -20,20 +21,22 @@ namespace CompanyName.ProjectName.CAP
IDistributedEventBus,
ISingletonDependency
{
protected AbpDistributedEventBusOptions AbpDistributedEventBusOptions { get; }
protected ConcurrentDictionary<Type, List<IEventHandlerFactory>> HandlerFactories { get; }
protected ConcurrentDictionary<string, Type> EventTypes { get; }
private AbpDistributedEventBusOptions AbpDistributedEventBusOptions { get; }
private ConcurrentDictionary<Type, List<IEventHandlerFactory>> HandlerFactories { get; }
private ConcurrentDictionary<string, Type> EventTypes { get; }
protected readonly ICapPublisher CapPublisher;
private readonly ICapPublisher CapPublisher;
private readonly UnitOfWorkManager _unitOfWorkManager;
public ProjectNameAbpCapDistributedEventBus(IServiceScopeFactory serviceScopeFactory,
IOptions<AbpDistributedEventBusOptions> distributedEventBusOptions,
ICapPublisher capPublisher,
ICurrentTenant currentTenant,
IEventErrorHandler errorHandler)
: base(serviceScopeFactory, currentTenant, errorHandler)
ICurrentTenant currentTenant, UnitOfWorkManager unitOfWorkManager)
: base(serviceScopeFactory, currentTenant,unitOfWorkManager)
{
CapPublisher = capPublisher;
_unitOfWorkManager = unitOfWorkManager;
AbpDistributedEventBusOptions = distributedEventBusOptions.Value;
HandlerFactories = new ConcurrentDictionary<Type, List<IEventHandlerFactory>>();
EventTypes = new ConcurrentDictionary<string, Type>();
@ -95,17 +98,36 @@ namespace CompanyName.ProjectName.CAP
GetOrCreateHandlerFactories(eventType).Locking(factories => factories.Clear());
}
protected override Task PublishToEventBusAsync(Type eventType, object eventData)
{
throw new NotImplementedException();
}
protected override void AddToUnitOfWork(IUnitOfWork unitOfWork, UnitOfWorkEventRecord eventRecord)
{
throw new NotImplementedException();
}
public IDisposable Subscribe<TEvent>(IDistributedEventHandler<TEvent> handler) where TEvent : class
{
return Subscribe(typeof(TEvent), handler);
}
public async Task PublishAsync<TEvent>(TEvent eventData, bool onUnitOfWorkComplete = true,
bool useOutbox = true) where TEvent : class
{
var eventName = EventNameAttribute.GetNameOrDefault(typeof(TEvent));
await CapPublisher.PublishAsync(eventName, eventData);
}
public override async Task PublishAsync(Type eventType, object eventData)
public async Task PublishAsync(Type eventType, object eventData, bool onUnitOfWorkComplete = true,
bool useOutbox = true)
{
var eventName = EventNameAttribute.GetNameOrDefault(eventType);
await CapPublisher.PublishAsync(eventName, eventData);
}
protected override IEnumerable<EventTypeWithEventHandlerFactories> GetHandlerFactories(Type eventType)
{

4
aspnet-core/frameworks/Extensions/src/CompanyName.ProjectName.Extension/CompanyName.ProjectName.Extension.csproj

@ -2,11 +2,11 @@
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" />
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpPackageVersion)" />

2
aspnet-core/gateways/CompanyName.ProjectName.WebGateway/CompanyName.ProjectName.WebGateway.csproj

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

2
aspnet-core/global.json

@ -1,6 +1,6 @@
{
"sdk": {
"version": "5.0.101",
"version": "6.0.100",
"rollForward": "latestFeature"
}
}

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

@ -3,7 +3,7 @@
<Import Project="../../../../common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>CompanyName.ProjectName.DataDictionaryManagement</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>CompanyName.ProjectName.DataDictionaryManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>

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

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

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

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

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

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

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

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

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

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

13
aspnet-core/modules/DataDictionaryManagement/src/CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore/EntityFrameworkCore/DataDictionaries/EfCoreDataDictionaryRepository.cs

@ -5,8 +5,8 @@ using System.Threading;
using System.Threading.Tasks;
using CompanyName.ProjectName.DataDictionaryManagement.DataDictionaries.Aggregates;
using CompanyName.ProjectName.DataDictionaryManagement.EntityFrameworkCore;
using CompanyName.ProjectName.Extension.System;
using Microsoft.EntityFrameworkCore;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
@ -63,7 +63,7 @@ namespace CompanyName.ProjectName.DataDictionaryManagement.DataDictionaries
{
return await (await GetDbSetAsync())
.IncludeDetails(includeDetails)
.WhereIf(filter.IsNotNullOrWhiteSpace(),
.WhereIf(!filter.IsNullOrWhiteSpace(),
e => (e.Code.Contains(filter) || e.DisplayText.Contains(filter)))
.OrderByDescending(e => e.CreationTime)
.PageBy(skipCount, maxResultCount)
@ -73,10 +73,15 @@ namespace CompanyName.ProjectName.DataDictionaryManagement.DataDictionaries
public async Task<long> GetPagingCountAsync(string filter = null,
CancellationToken cancellationToken = default)
{
return await this
.WhereIf(filter.IsNotNullOrWhiteSpace(),
return await (await GetDbSetAsync())
.WhereIf(!filter.IsNullOrWhiteSpace(),
e => (e.Code.Contains(filter) || e.DisplayText.Contains(filter)))
.CountAsync(cancellationToken: cancellationToken);
}
public override async Task<IQueryable<DataDictionary>> WithDetailsAsync()
{
return (await GetQueryableAsync()).IncludeDetails();
}
}
}

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

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

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

@ -3,12 +3,12 @@
<Import Project="../../../../common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>CompanyName.ProjectName.DataDictionaryManagement</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="$(SwashbuckleAspNetCoreAnnotationsVersion)" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="$(SwashbuckleVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="$(AbpPackageVersion)" />
<ProjectReference Include="..\CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts\CompanyName.ProjectName.DataDictionaryManagement.Application.Contracts.csproj" />
</ItemGroup>

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

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

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

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

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

@ -2,7 +2,7 @@
<Import Project="../../../../common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>CompanyName.ProjectName.DataDictionaryManagement</RootNamespace>
</PropertyGroup>

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

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

2
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>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>CompanyName.ProjectName.NotificationManagement</RootNamespace>
</PropertyGroup>

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

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

2
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>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>CompanyName.ProjectName.NotificationManagement</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>

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

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

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

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

2
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>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>CompanyName.ProjectName.NotificationManagement</RootNamespace>
</PropertyGroup>

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

@ -3,12 +3,12 @@
<Import Project="../../../../common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>CompanyName.ProjectName.NotificationManagement</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="$(SwashbuckleAspNetCoreAnnotationsVersion)" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="$(SwashbuckleVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="$(AbpPackageVersion)" />
<ProjectReference Include="..\CompanyName.ProjectName.NotificationManagement.Application.Contracts\CompanyName.ProjectName.NotificationManagement.Application.Contracts.csproj" />
</ItemGroup>

2
aspnet-core/modules/NotificationManagement/test/CompanyName.ProjectName.NotificationManagement.Application.Tests/CompanyName.ProjectName.NotificationManagement.Application.Tests.csproj

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

2
aspnet-core/modules/NotificationManagement/test/CompanyName.ProjectName.NotificationManagement.Domain.Tests/CompanyName.ProjectName.NotificationManagement.Domain.Tests.csproj

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

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

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

2
aspnet-core/modules/NotificationManagement/test/CompanyName.ProjectName.NotificationManagement.TestBase/CompanyName.ProjectName.NotificationManagement.TestBase.csproj

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

6
aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/CompanyName.ProjectName.HttpApi.Host.csproj

@ -2,7 +2,7 @@
<Import Project="..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>CompanyName.ProjectName</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>CompanyName.ProjectName-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
@ -32,8 +32,8 @@
<PackageReference Include="Hangfire.MySqlStorage" Version="$(HangfireMySqlStorageVersion)" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(MicrosoftVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(AbpPackageVersion)" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="$(MiniProfiler)" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="$(MiniProfiler)" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="$(MiniProfilerVersion)" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="$(MiniProfilerVersion)" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/appsettings.json

@ -16,7 +16,7 @@
"CorsOrigins": "https://*.ProjectName.com,http://localhost:4200,http://localhost:3100"
},
"ConnectionStrings": {
"Default": "Data Source=localhost;Database=CompanyNameProjectNameDB20211106;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
"Default": "Data Source=localhost;Database=CompanyNameProjectNameDB6;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
},
"Redis": {
"Configuration": "localhost,password=mypassword,defaultdatabase=1"

BIN
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer.zip

Binary file not shown.

20
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/CompanyName.ProjectName.IdentityServer.csproj

@ -1,15 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>CompanyName.ProjectName</RootNamespace>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PreserveCompilationContext>true</PreserveCompilationContext>
<MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>CompanyName.ProjectName-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
@ -44,21 +43,12 @@
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpPackageVersion)" />
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="$(AbpPackageVersion)" />
<PackageReference Include="Volo.Abp.Account.Application" Version="$(AbpPackageVersion)" />
<ProjectReference Include="..\..\src\CompanyName.ProjectName.Domain.Shared\CompanyName.ProjectName.Domain.Shared.csproj" />
<ProjectReference Include="..\..\src\CompanyName.ProjectName.EntityFrameworkCore\CompanyName.ProjectName.EntityFrameworkCore.csproj" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="$(AbpPackageVersion)" />
</ItemGroup>
<ItemGroup>
<_ContentIncludedByDefault Remove="publish\CompanyName.ProjectName.IdentityServer.dll.config" />
<_ContentIncludedByDefault Remove="publish\web.config" />
<_ContentIncludedByDefault Remove="publish\appsettings.Development.json" />
<_ContentIncludedByDefault Remove="publish\appsettings.json" />
<_ContentIncludedByDefault Remove="publish\appsettings.Production.json" />
<_ContentIncludedByDefault Remove="publish\appsettings.secrets.json" />
<_ContentIncludedByDefault Remove="publish\CompanyName.ProjectName.IdentityServer.deps.json" />
<_ContentIncludedByDefault Remove="publish\CompanyName.ProjectName.IdentityServer.runtimeconfig.json" />
<_ContentIncludedByDefault Remove="publish\package.json" />
<_ContentIncludedByDefault Remove="publish\wwwroot\libs\malihu-custom-scrollbar-plugin\package.json" />
<ProjectReference Include="..\..\src\CompanyName.ProjectName.EntityFrameworkCore\CompanyName.ProjectName.EntityFrameworkCore.csproj" />
</ItemGroup>
</Project>

44
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/Pages/Index.cshtml

@ -3,34 +3,32 @@
@using Volo.Abp.Users
@model IndexModel
@inject ICurrentUser CurrentUser
@if (CurrentUser.IsAuthenticated)
@if (CurrentUser.IsAuthenticated)
{
<div>
<abp-row>
<abp-column size-md="_3" class="text-center">
<i class="fa fa-user d-block" style="font-size: 10em; color: #12b900"></i>
<a abp-button="Primary" href="/Account/Logout">Logout</a>
</abp-column>
<abp-column size-md="_9">
<h2>@CurrentUser.UserName</h2>
<h5 class="text-muted">@CurrentUser.Email</h5>
<div>
<strong>Roles</strong>: @CurrentUser.Roles.JoinAsString(", ")
<br />
<strong>Claims</strong>: <br />
@Html.Raw(CurrentUser.GetAllClaims().Select(c => $"{c.Type}={c.Value}").JoinAsString(" <br /> "))
</div>
</abp-column>
</abp-row>
</div>
<div>
<abp-row>
<abp-column size-md="_3" class="text-center">
<i class="fa fa-user d-block" style="font-size: 10em; color: #12b900"></i>
<a abp-button="Primary" href="/Account/Logout">Logout</a>
</abp-column>
<abp-column size-md="_9">
<h2>@CurrentUser.UserName</h2>
<h5 class="text-muted">@CurrentUser.Email</h5>
<div>
<strong>Roles</strong>: @CurrentUser.Roles.JoinAsString(", ")
<br />
<strong>Claims</strong>: <br />
@Html.Raw(CurrentUser.GetAllClaims().Select(c => $"{c.Type}={c.Value}").JoinAsString(" <br /> "))
</div>
</abp-column>
</abp-row>
</div>
}
@if (!CurrentUser.IsAuthenticated)
@if (!CurrentUser.IsAuthenticated)
{
<div class="text-center">
<i class="fa fa-user d-block" style="font-size: 10em; color: #aaa"></i><br /><br />
<i class="fa fa-user d-block" style="font-size: 10em; color: #aaa"></i><br/><br />
<a abp-button="Primary" asp-page="/Account/Login">Login</a>
</div>
}

16
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/Pages/Index.cshtml.cs

@ -1,25 +1,11 @@
using Microsoft.AspNetCore.Mvc;
using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
using Volo.Abp.Users;
namespace CompanyName.ProjectName.Pages
{
public class IndexModel : AbpPageModel
{
private readonly ICurrentUser _currentUser;
public IndexModel(ICurrentUser currentUser)
public void OnGet()
{
_currentUser = currentUser;
}
// public IActionResult OnGet()
// {
// if (_currentUser.IsAuthenticated)
// {
// return RedirectToPage("/Welcome");
// }
// return RedirectToPage("/Account/Login");
// }
}
}

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/Program.cs

@ -1,5 +1,6 @@
using System;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Serilog;
using Serilog.Events;
@ -44,6 +45,7 @@ namespace CompanyName.ProjectName
internal static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.AddAppSettingsSecretsJson()
.ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStartup<Startup>();

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/Properties/launchSettings.json

@ -1,4 +1,4 @@
{
{
"profiles": {
"CompanyName.ProjectName.IdentityServer": {
"commandName": "Project",

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/abp.resourcemapping.js

@ -1,4 +1,4 @@
module.exports = {
module.exports = {
aliases: {
},

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.Development.json

@ -0,0 +1,2 @@
{
}

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/appsettings.json

@ -6,7 +6,7 @@
"RedirectAllowedUrls": "http://localhost:4200,https://localhost:44307"
},
"ConnectionStrings": {
"Default": "Data Source=localhost;Database=CompanyNameProjectNameDB20211106;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
"Default": "Data Source=localhost;Database=CompanyNameProjectNameDB6;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
},
"Redis": {
"Configuration": "localhost,password=mypassword,defaultdatabase=1"

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/package.json

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

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/tempkey.jwk

@ -1 +1 @@
{"alg":"RS256","d":"Y_Mo7J2gdKgMLqrDtdW8JZtIiHvJWpWb2qAljxeQSiTAZs4-Cuss9CWpKJxYe3ZBzCLXHiZr6Zx5CMWC7yhAh0ojM71q4Tyw4N3YQfiAm--lWqIMJSMhGK0Hj2PiHdctt9J3NHSuwjD-HfHcNOMVzLiBaGuvlaVyIqz959FwxNsb5QzuxcRXNOMoO7d7uKR9ZYdFECWfBCthf4Mfr2YOLSORtyikooDMDmAJCL6U3igO11rdqWAMNMPfCmA0qKU4YNyhZgXpC-FrobiHbiSug5_xgBLSvSfIquBz7yW_tUkbM-NHy1Iz1erkK1tY3x5HWANtu5tbLqM6UGn0ivb3AQ","dp":"a4b7gwmFr-ukqza608XDNaGKgzQlaEum6h0qAbjtdUrydWARYiNAiSLuxn5vQ6CVobDfAhsD1x0Tnfy8DHaHBu89yncs0Fzu7szeBcLpU3OAlY6wx2swouBHT0gXMweL37sZpS9wJ14mKJ60EuLhhcZnKJdhQG1e1A5NICZecPk","dq":"oZEXJ7lc2emvnJxoBqVmYt_Uf49M4izkQ5dtYFncYVSZGErDsUlcR7wtmTpvdfKV2zQ9d6ZAMrzGmTIxRq7gXRF7hDpADxvAfJVTT0DH5nxJwiMPf9FA_g0QZANZgkMrRfZ7fXFhSAA96JYy60x45n731hsh0lIMYnJWS9S7p4c","e":"AQAB","kid":"CBCA50D09AFE5E5FC45E5D80805CC5BC","kty":"RSA","n":"rlyLVmVEmEMq5OYtJF76THrc6xiLRf1RcjwvbCMaZYpSEYtfPqU7hnNVk3HVbEHVtovMG-UHhfHYIZIttwbd3u2JXK3IYtTyrovyQtcFzww4VDiF77_u9oBwDrAXj99evUaI_M9lHd9LHRxOw8-p-Y5FIXO7-ZoAfdA_0JFk5QxXNTd7BfP7FFX1JZn-ossHm0-dFEL9cLE4YKpA8SQ1z0KLFCjMYV_NG9J5kPcPjdTYH3ZxrSCr65hWgEw7ombPwTp87KmWU-DYAdJP8ur32-lzv1JgKAlsCNJfS5U57FUIGClY8FZ-6KEyWUeA6k3UYEjc4Gl_XjS6x4bL1nGZ4Q","p":"0KoX6IJTNjGUSo4CM7tn_xDUSGV1Z_qJRsUOk3FdKbHFHn3iHsfV4xme3Ma06RtEojS0AgQ6t7EBFZ8cDlS-RnPsLtptRfa3aNkyBOtIqr5iu65siOYi-cqHxiSdwNy6d_EnNQojKcy9IgbT1Zp1SViLWPsh3fgr6mPD1NlzjFs","q":"1epav74nxH7spLZXTkhr0tSW87SeKXTG3pAFAVNBLSETdLDq54b3f34xtV7sCJiGvtyFBMhQb_GmYe1nkfxdTKPzJC-fpUkHeZqkX7MpvOwlig5AbLx8bjDtfuEDXWbEUV9HE3IEPNlkUnXHz4wXFOiz4arHQdIztd7vajLGN3M","qi":"rwQvfIRyqvgqRPQkF1Xvzv9fIjGzuVV01Wt38Cp2kajSoM-3AzxOlpe3LS4hnrwKiXNgmfFAuuDJELRTBqICwTJslErqIyoLXVz2nERN8nvOGhPJPKjpOPjS_5FPpeImpEkQP0fbk3dCv2kyykO0qMS8HIcsf1M1Y02WplRz9TM"}
{"alg":"RS256","d":"M1neGBzlwZaXv1HDB_z7wnHYDpYM3BYo7rYNI8pu65NXqF4p19KgppiZAc5znxLUkGDIW6Udxq5666uypRpHsgnmAmk2VRGT89y5SuyS3dvuahw6jKW-ZBAMVh3LTh6DzXOqJbhzwG259loIvUqJtBMggYgscJ8Vm7dNmvGZmoAPTMiNSPUYMLA5-nviOTXfOqoiWXHEiZKDwKH1nN9KRR9ogze-dmaS21dWkCaRK7kD5ye6Q54EogIsZWikfj8_pfWbpI5xFuUrsK2vaJjnXrt6r7Odn56TkBKggw-Sxn-l4C2clZlJZQGUR9HzB66q_ckKB63DNiPuzhwjjbWtHQ","dp":"aQJaX_2nlKuhxAr8HC4yzAkGVGMPX1KEWfLsjDsC0v5rkr7KcRTSWiyyODp1nrB44_qr-jpzj8mB_l24z7f19EGOwj5jP0UG7Th9gN4criWoMYYOJBa8wcZKceeo60fSEZWXjvZE7fqcucDDBO-EqeCVHqfC8OrsDuHuPFZW7iE","dq":"XUCgEZ1doux8t2RA50htNxtm1u1tTbvweOPi3GQlMd9sCuqEk2wT57Fg8tWeR2PWhlBilUH_NV_Yy-lKnCzZVozjCbUAdKuPutyu65LQHPNF1TUhIPsc68GcN-pjMPIseVocClW3wDVGB7-zPPFmDF6IyQduPmWbkQ6wTbIDcws","e":"AQAB","kid":"A4B5BBC4DC86B77B4A7DABC098DD0531","kty":"RSA","n":"vZbFZ317RPvwGyJ1Y6PQDc9vU9XD5GlZ2HDkHts4bq0UFdT394bdRpVf3fT5OrekF-bb7_v7f1ynYXTdIBoHPoqJJ7EYVWAT7DkgbeuiLbMUFw4g3YWad-EzcdUhWy-a39im2bgOjL-c1l1Lodg13AtQpC_LDg3n5f8RNWvIC5FuRWOvf_743cANFRmAoXcskoJa5kDo7pYoH46XKx3LPjuEMMP7iN_oHBXIoLR4bA307uKnMx316lWl94viMicV75DHblddO7N9ey5dkPPydXyehjsK1exOIeG92IUlXl0M9hNpJrgR5hr09kV8rLFOiRWhpNkCsH_cKsqdIPsboQ","p":"3V8F8sJE7VE2zrJlxhzYjsm8hSZfJZDUOm1pAHUfV10jlV0grJfPX8cvE7xkV0WhCpHaOgZwE3nBnOr6cfl1fovy2xXI6DhxMjGg0XRRyf_roxkplhvwZCiuYR7reG4gGArhEzfla6PcERuCnbtNjKA0shtrDnm3e9VJowTFJG8","q":"2z8BE6OagK9x8WgVVspcll0fsk6Y-hsvpO-o3bnU32429ZTbQT0q4JgEX5vxY3ivLJ1FyOupe3fg4gP44wUcZnBVSWgsieeqnMWwj98xQDeRzFJ0rDfIJtpDZ7gG79b6xSCuBRE4c9YRlliwOcppgIPaotTuIsTKlWfDNNZvaO8","qi":"E05-UW4SDxBNxwhwxj99w7quMq1dZK8Z4RBnPIZsgw20A0Ltfzypxd0RvU-Og3YmdJH9bb8FVQO0xR3EUKl9abA_uDHOCt_B0Ngivzbpx5DJ3ikQbKKD97EtLm4uDP0OlER3SfhKihv1myvxo8EOo-RrtTQkbbN9YJhynK9dmWE"}

0
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/css/yh_gobal.css → aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/css/login_gobal.css

0
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/css/yh_portal.css → aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/css/login_portal.css

0
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/fonts/yh_font.css → aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/fonts/login_font.css

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/global-styles.css

@ -1 +1 @@
/* Your Global Styles */
/* Your Global Styles */

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js

@ -106,7 +106,7 @@ var abp = abp || {};
$dfd.resolve(data);
userOptions.success && userOptions.success(data);
}).fail(function (jqXHR) {
if(jqXHR.status === 0 || jqXHR.statusText === 'abort') {
if(jqXHR.statusText === 'abort') {
//ajax request is abort, ignore error handle.
return;
}

15007
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.css

File diff suppressed because it is too large

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.css.map

File diff suppressed because one or more lines are too long

6
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.min.css

File diff suppressed because one or more lines are too long

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.min.css.map

File diff suppressed because one or more lines are too long

11197
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.css

File diff suppressed because it is too large

1
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.css.map

File diff suppressed because one or more lines are too long

7
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css

File diff suppressed because one or more lines are too long

1
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.rtl.min.css.map

File diff suppressed because one or more lines are too long

9921
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js

File diff suppressed because it is too large

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js.map

File diff suppressed because one or more lines are too long

4
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js

File diff suppressed because one or more lines are too long

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map

File diff suppressed because one or more lines are too long

5
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.enable.tooltips.everywhere.js

@ -0,0 +1,5 @@
(function () {
[].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')).map(function (tooltipTriggerEl) {
return new bootstrap.Tooltip(tooltipTriggerEl)
});
})();

224
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/datatables.net-bs5/css/dataTables.bootstrap5.css

@ -0,0 +1,224 @@
@charset "UTF-8";
/*! Bootstrap 5 integration for DataTables
*
* ©2020 SpryMedia Ltd, all rights reserved.
* License: MIT datatables.net/license/mit
*/
table.dataTable {
clear: both;
margin-top: 6px !important;
margin-bottom: 6px !important;
max-width: none !important;
border-collapse: separate !important;
border-spacing: 0;
}
table.dataTable td,
table.dataTable th {
-webkit-box-sizing: content-box;
box-sizing: content-box;
}
table.dataTable td.dataTables_empty,
table.dataTable th.dataTables_empty {
text-align: center;
}
table.dataTable.nowrap th,
table.dataTable.nowrap td {
white-space: nowrap;
}
div.dataTables_wrapper div.dataTables_length label {
font-weight: normal;
text-align: left;
white-space: nowrap;
}
div.dataTables_wrapper div.dataTables_length select {
width: auto;
display: inline-block;
}
div.dataTables_wrapper div.dataTables_filter {
text-align: right;
}
div.dataTables_wrapper div.dataTables_filter label {
font-weight: normal;
white-space: nowrap;
text-align: left;
}
div.dataTables_wrapper div.dataTables_filter input {
margin-left: 0.5em;
display: inline-block;
width: auto;
}
div.dataTables_wrapper div.dataTables_info {
padding-top: 0.85em;
}
div.dataTables_wrapper div.dataTables_paginate {
margin: 0;
white-space: nowrap;
text-align: right;
}
div.dataTables_wrapper div.dataTables_paginate ul.pagination {
margin: 2px 0;
white-space: nowrap;
justify-content: flex-end;
}
div.dataTables_wrapper div.dataTables_processing {
position: absolute;
top: 50%;
left: 50%;
width: 200px;
margin-left: -100px;
margin-top: -26px;
text-align: center;
padding: 1em 0;
}
table.dataTable > thead > tr > th:active,
table.dataTable > thead > tr > td:active {
outline: none;
}
table.dataTable > thead > tr > th:not(.sorting_disabled),
table.dataTable > thead > tr > td:not(.sorting_disabled) {
padding-right: 30px;
}
table.dataTable > thead .sorting,
table.dataTable > thead .sorting_asc,
table.dataTable > thead .sorting_desc,
table.dataTable > thead .sorting_asc_disabled,
table.dataTable > thead .sorting_desc_disabled {
cursor: pointer;
position: relative;
}
table.dataTable > thead .sorting:before, table.dataTable > thead .sorting:after,
table.dataTable > thead .sorting_asc:before,
table.dataTable > thead .sorting_asc:after,
table.dataTable > thead .sorting_desc:before,
table.dataTable > thead .sorting_desc:after,
table.dataTable > thead .sorting_asc_disabled:before,
table.dataTable > thead .sorting_asc_disabled:after,
table.dataTable > thead .sorting_desc_disabled:before,
table.dataTable > thead .sorting_desc_disabled:after {
position: absolute;
bottom: 0.5em;
display: block;
opacity: 0.3;
}
table.dataTable > thead .sorting:before,
table.dataTable > thead .sorting_asc:before,
table.dataTable > thead .sorting_desc:before,
table.dataTable > thead .sorting_asc_disabled:before,
table.dataTable > thead .sorting_desc_disabled:before {
right: 1em;
content: "↑";
}
table.dataTable > thead .sorting:after,
table.dataTable > thead .sorting_asc:after,
table.dataTable > thead .sorting_desc:after,
table.dataTable > thead .sorting_asc_disabled:after,
table.dataTable > thead .sorting_desc_disabled:after {
right: 0.5em;
content: "↓";
}
table.dataTable > thead .sorting_asc:before,
table.dataTable > thead .sorting_desc:after {
opacity: 1;
}
table.dataTable > thead .sorting_asc_disabled:before,
table.dataTable > thead .sorting_desc_disabled:after {
opacity: 0;
}
div.dataTables_scrollHead table.dataTable {
margin-bottom: 0 !important;
}
div.dataTables_scrollBody table {
border-top: none;
margin-top: 0 !important;
margin-bottom: 0 !important;
}
div.dataTables_scrollBody table thead .sorting:before,
div.dataTables_scrollBody table thead .sorting_asc:before,
div.dataTables_scrollBody table thead .sorting_desc:before,
div.dataTables_scrollBody table thead .sorting:after,
div.dataTables_scrollBody table thead .sorting_asc:after,
div.dataTables_scrollBody table thead .sorting_desc:after {
display: none;
}
div.dataTables_scrollBody table tbody tr:first-child th,
div.dataTables_scrollBody table tbody tr:first-child td {
border-top: none;
}
div.dataTables_scrollFoot > .dataTables_scrollFootInner {
box-sizing: content-box;
}
div.dataTables_scrollFoot > .dataTables_scrollFootInner > table {
margin-top: 0 !important;
border-top: none;
}
@media screen and (max-width: 767px) {
div.dataTables_wrapper div.dataTables_length,
div.dataTables_wrapper div.dataTables_filter,
div.dataTables_wrapper div.dataTables_info,
div.dataTables_wrapper div.dataTables_paginate {
text-align: center;
}
div.dataTables_wrapper div.dataTables_paginate ul.pagination {
justify-content: center !important;
}
}
table.dataTable.table-sm > thead > tr > th:not(.sorting_disabled) {
padding-right: 20px;
}
table.dataTable.table-sm .sorting:before,
table.dataTable.table-sm .sorting_asc:before,
table.dataTable.table-sm .sorting_desc:before {
top: 5px;
right: 0.85em;
}
table.dataTable.table-sm .sorting:after,
table.dataTable.table-sm .sorting_asc:after,
table.dataTable.table-sm .sorting_desc:after {
top: 5px;
}
table.table-bordered.dataTable {
border-right-width: 0;
}
table.table-bordered.dataTable thead tr:first-child th,
table.table-bordered.dataTable thead tr:first-child td {
border-top-width: 1px;
}
table.table-bordered.dataTable th,
table.table-bordered.dataTable td {
border-left-width: 0;
}
table.table-bordered.dataTable th:first-child, table.table-bordered.dataTable th:first-child,
table.table-bordered.dataTable td:first-child,
table.table-bordered.dataTable td:first-child {
border-left-width: 1px;
}
table.table-bordered.dataTable th:last-child, table.table-bordered.dataTable th:last-child,
table.table-bordered.dataTable td:last-child,
table.table-bordered.dataTable td:last-child {
border-right-width: 1px;
}
table.table-bordered.dataTable th,
table.table-bordered.dataTable td {
border-bottom-width: 1px;
}
div.dataTables_scrollHead table.table-bordered {
border-bottom-width: 0;
}
div.table-responsive > div.dataTables_wrapper > div.row {
margin: 0;
}
div.table-responsive > div.dataTables_wrapper > div.row > div[class^=col-]:first-child {
padding-left: 0;
}
div.table-responsive > div.dataTables_wrapper > div.row > div[class^=col-]:last-child {
padding-right: 0;
}

184
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/datatables.net-bs5/js/dataTables.bootstrap5.js

@ -0,0 +1,184 @@
/*! DataTables Bootstrap 5 integration
* 2020 SpryMedia Ltd - datatables.net/license
*/
/**
* DataTables integration for Bootstrap 4. This requires Bootstrap 5 and
* DataTables 1.10 or newer.
*
* This file sets the defaults and adds options to DataTables to style its
* controls using Bootstrap. See http://datatables.net/manual/styling/bootstrap
* for further information.
*/
(function( factory ){
if ( typeof define === 'function' && define.amd ) {
// AMD
define( ['jquery', 'datatables.net'], function ( $ ) {
return factory( $, window, document );
} );
}
else if ( typeof exports === 'object' ) {
// CommonJS
module.exports = function (root, $) {
if ( ! root ) {
root = window;
}
if ( ! $ || ! $.fn.dataTable ) {
// Require DataTables, which attaches to jQuery, including
// jQuery if needed and have a $ property so we can access the
// jQuery object that is used
$ = require('datatables.net')(root, $).$;
}
return factory( $, root, root.document );
};
}
else {
// Browser
factory( jQuery, window, document );
}
}(function( $, window, document, undefined ) {
'use strict';
var DataTable = $.fn.dataTable;
/* Set the defaults for DataTables initialisation */
$.extend( true, DataTable.defaults, {
dom:
"<'row'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>>" +
"<'row'<'col-sm-12'tr>>" +
"<'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
renderer: 'bootstrap'
} );
/* Default class modification */
$.extend( DataTable.ext.classes, {
sWrapper: "dataTables_wrapper dt-bootstrap5",
sFilterInput: "form-control form-control-sm",
sLengthSelect: "form-select form-select-sm",
sProcessing: "dataTables_processing card",
sPageButton: "paginate_button page-item"
} );
/* Bootstrap paging button renderer */
DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, buttons, page, pages ) {
var api = new DataTable.Api( settings );
var classes = settings.oClasses;
var lang = settings.oLanguage.oPaginate;
var aria = settings.oLanguage.oAria.paginate || {};
var btnDisplay, btnClass, counter=0;
var attach = function( container, buttons ) {
var i, ien, node, button;
var clickHandler = function ( e ) {
e.preventDefault();
if ( !$(e.currentTarget).hasClass('disabled') && api.page() != e.data.action ) {
api.page( e.data.action ).draw( 'page' );
}
};
for ( i=0, ien=buttons.length ; i<ien ; i++ ) {
button = buttons[i];
if ( Array.isArray( button ) ) {
attach( container, button );
}
else {
btnDisplay = '';
btnClass = '';
switch ( button ) {
case 'ellipsis':
btnDisplay = '&#x2026;';
btnClass = 'disabled';
break;
case 'first':
btnDisplay = lang.sFirst;
btnClass = button + (page > 0 ?
'' : ' disabled');
break;
case 'previous':
btnDisplay = lang.sPrevious;
btnClass = button + (page > 0 ?
'' : ' disabled');
break;
case 'next':
btnDisplay = lang.sNext;
btnClass = button + (page < pages-1 ?
'' : ' disabled');
break;
case 'last':
btnDisplay = lang.sLast;
btnClass = button + (page < pages-1 ?
'' : ' disabled');
break;
default:
btnDisplay = button + 1;
btnClass = page === button ?
'active' : '';
break;
}
if ( btnDisplay ) {
node = $('<li>', {
'class': classes.sPageButton+' '+btnClass,
'id': idx === 0 && typeof button === 'string' ?
settings.sTableId +'_'+ button :
null
} )
.append( $('<a>', {
'href': '#',
'aria-controls': settings.sTableId,
'aria-label': aria[ button ],
'data-dt-idx': counter,
'tabindex': settings.iTabIndex,
'class': 'page-link'
} )
.html( btnDisplay )
)
.appendTo( container );
settings.oApi._fnBindAction(
node, {action: button}, clickHandler
);
counter++;
}
}
}
};
// IE9 throws an 'unknown error' if document.activeElement is used
// inside an iframe or frame.
var activeEl;
try {
// Because this approach is destroying and recreating the paging
// elements, focus is lost on the select button which is bad for
// accessibility. So we want to restore focus once the draw has
// completed
activeEl = $(host).find(document.activeElement).data('dt-idx');
}
catch (e) {}
attach(
$(host).empty().html('<ul class="pagination"/>').children('ul'),
buttons
);
if ( activeEl !== undefined ) {
$(host).find( '[data-dt-idx='+activeEl+']' ).trigger('focus');
}
};
return DataTable;
}));

4
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/select2/js/select2-bootstrap-modal-patch.js

@ -1,4 +1,6 @@
/*
https://select2.org/troubleshooting/common-problems
*/
$.fn.modal.Constructor.prototype._enforceFocus = function () { };
if ($.fn.modal) {
$.fn.modal.Constructor.prototype._enforceFocus = function () { };
}

3123
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.all.js

File diff suppressed because one or more lines are too long

2
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.all.min.js

File diff suppressed because one or more lines are too long

1319
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.css

File diff suppressed because it is too large

3121
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.js

File diff suppressed because it is too large

1
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.min.css

File diff suppressed because one or more lines are too long

1
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/wwwroot/libs/sweetalert2/sweetalert2.min.js

File diff suppressed because one or more lines are too long

248
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/yarn.lock

@ -2,37 +2,37 @@
# yarn lockfile v1
"@abp/aspnetcore.mvc.ui.theme.basic@^4.4.0":
version "4.4.0"
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.4.0"
"@abp/aspnetcore.mvc.ui.theme.shared@~4.4.0":
version "4.4.0"
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.4.0"
"@abp/bootstrap" "~4.4.0"
"@abp/bootstrap-datepicker" "~4.4.0"
"@abp/datatables.net-bs4" "~4.4.0"
"@abp/font-awesome" "~4.4.0"
"@abp/jquery-form" "~4.4.0"
"@abp/jquery-validation-unobtrusive" "~4.4.0"
"@abp/lodash" "~4.4.0"
"@abp/luxon" "~4.4.0"
"@abp/malihu-custom-scrollbar-plugin" "~4.4.0"
"@abp/select2" "~4.4.0"
"@abp/sweetalert" "~4.4.0"
"@abp/timeago" "~4.4.0"
"@abp/toastr" "~4.4.0"
"@abp/aspnetcore.mvc.ui@~4.4.0":
version "4.4.0"
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==
"@abp/aspnetcore.mvc.ui.theme.basic@^4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.4.4.tgz#ecaaee9d8af8e14a1c9fa65bf3cb6e56c6a82e99"
integrity sha512-FBctV4JuYnTqCCzA/1EG2wUdTYYcilTNSWvk/4YZkndvu9T5iu48qdac1Gq3Ux8JIFer9D0oAPld0YlweYYOGw==
dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~4.4.4"
"@abp/aspnetcore.mvc.ui.theme.shared@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.4.4.tgz#22191efb159572abbd071e12cce847768721a2ee"
integrity sha512-Fp4OXxaSSsTzDlWlVYksSTKXbXvUdILbJNlk+r03TD7VmJCaNx49BxLyUEhJIyP3SY8oOno1UnsDjygbFHJ0xw==
dependencies:
"@abp/aspnetcore.mvc.ui" "~4.4.4"
"@abp/bootstrap" "~4.4.4"
"@abp/bootstrap-datepicker" "~4.4.4"
"@abp/datatables.net-bs4" "~4.4.4"
"@abp/font-awesome" "~4.4.4"
"@abp/jquery-form" "~4.4.4"
"@abp/jquery-validation-unobtrusive" "~4.4.4"
"@abp/lodash" "~4.4.4"
"@abp/luxon" "~4.4.4"
"@abp/malihu-custom-scrollbar-plugin" "~4.4.4"
"@abp/select2" "~4.4.4"
"@abp/sweetalert" "~4.4.4"
"@abp/timeago" "~4.4.4"
"@abp/toastr" "~4.4.4"
"@abp/aspnetcore.mvc.ui@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.4.4.tgz#2f8e9488cad566f333d62fa717621477fb7fe658"
integrity sha512-/ngxU+vyUfBfpJ7+4/2Fyo5arUAY+LrjauoH9rkdXxpNjNNKjSUsoVqRAwRc1QMJh3iuUOeJgzx0gtkcE2ihiQ==
dependencies:
ansi-colors "^4.1.1"
extend-object "^1.0.0"
@ -41,145 +41,145 @@
merge-stream "^2.0.0"
micromatch "^4.0.2"
"@abp/bootstrap-datepicker@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.4.0.tgz#c0aa0e64b3c44c6601a758c0d20e869ad1f6f706"
integrity sha512-xagwxUN6SdPE5wRxX4PCp7nf5q5PXJdk04agYjIh2/oEUo/Q8fjUBhfAfMjD7DX09iXOLaWF43FJ0q3QCQeZDw==
"@abp/bootstrap-datepicker@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.4.4.tgz#f2bddae93c4d126f926e4c9f0b4d41b5638ec4ba"
integrity sha512-WfP8KqMNcwAIyVim0MpyMo7sg1kVd9LzrqeAOdu5nPrJ9iV5N3y/JIw4JUkSaOh/zQPLgZUMg1NEhDHOkbaOHw==
dependencies:
bootstrap-datepicker "^1.9.0"
"@abp/bootstrap@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.4.0.tgz#ba904bed5f5824ea2cbad91e7ffbf3db8b2c2a4f"
integrity sha512-68jAvd8U1OrBAPoY9iTuGOd/tlC/44RJHVUQaArXZQ2Xr6kLacCyChDW4QSgMtehHMSXJ/yeJuFLKm5k7iNcoQ==
"@abp/bootstrap@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.4.4.tgz#34ff3d94cea5b95fa78acdd5837d36569e0244db"
integrity sha512-fE8MsiUJD7K/lzKCsQ5FUU6KbZL6GORBMUdenm5OAUGpQWKPdLZ8mF2rjNsb2+kQgVQCuei7eYl+6712idCF9A==
dependencies:
"@abp/core" "~4.4.0"
"@abp/core" "~4.4.4"
bootstrap "^4.6.0"
bootstrap-v4-rtl "4.6.0-1"
"@abp/core@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.4.0.tgz#4e7c438c2ee8cbaf505767a4e2882c3ff8d9e705"
integrity sha512-Bak6DgD+xniPr6i0tRYyZBajLdkjo13JgUTV1piuvQWSYfg29KnwJ8yobrjO/c2ipKJlTtcdNehgEPoBieM5fA==
"@abp/core@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.4.4.tgz#e157da92b884d7d9a1e3ba50f65be42c60047d78"
integrity sha512-t3Mu7Bvs0o439CVSx9uxBJ+yTFrt2Pyep9/6Vh6Su+b4aoZeQt6ZTKWeJqUVZ7Y/LMt+AbJ/dtbFHvhV8yVuXg==
dependencies:
"@abp/utils" "^4.4.0"
"@abp/utils" "~4.4.4"
"@abp/datatables.net-bs4@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.4.0.tgz#15d8e1b55f1444cabc537e7227cc853a72b35556"
integrity sha512-dAdcVUrrpYlvRVYn6RdH1PTqbKdCJrmPx95j/VQsjfvFNLtorMBqBNuQV0sAHgYtra6q2WsRYt+jJP2OmQcyQA==
"@abp/datatables.net-bs4@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.4.4.tgz#37f4c5664ba1a8c4f5b03e675192f6b0ef66cf1b"
integrity sha512-byccQ1dSzhxpLggDwyPoOSOGF+6lBrr9r+WC3OCzWkBUuD6gXpRzDumjAAgIe12hGfXGDRibuD7Ji3qPLzcHzw==
dependencies:
"@abp/datatables.net" "~4.4.0"
"@abp/datatables.net" "~4.4.4"
datatables.net-bs4 "^1.10.21"
"@abp/datatables.net@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.4.0.tgz#be193b630ab40a23ce3a57d9209eda63938e74ff"
integrity sha512-zLDirf+Ut4QgMvSaDM1RVq+VPF/U7tw7Lp5pnuA0ray8t4v5Szo44MGk6GZCk6uCdUI8QooOMaWcQuGk89xlQQ==
"@abp/datatables.net@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.4.4.tgz#add4b07eef578dd02f84892bbe495642459c4669"
integrity sha512-+9JHEu71xADrTFIKoujXAO0nwUvAuRU9gJpVuJFg4G6juILbEqARo2mUTXEx+UyqnzhwoRJ0K1VFyBJnCY0R0Q==
dependencies:
"@abp/jquery" "~4.4.0"
"@abp/jquery" "~4.4.4"
datatables.net "^1.10.21"
"@abp/font-awesome@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.4.0.tgz#d612ede5afb9dd07cc7824c7147c1f1e08defb77"
integrity sha512-njuvwvjN3vhwJk2ln8SXDShsO/GdZ4M4zJCKy73s9qZh7Uyr6aiNGMap3bo8yK8MyNx0AXWi7QGYp3Zp2FA7QQ==
"@abp/font-awesome@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.4.4.tgz#47ff0c880ceb95382e0b1371912230cd7d7602c8"
integrity sha512-lkuyC7drFfzavkNJNLuQ+EJYTBb5ZlPNPnGFAxEpRyjJuJ5j+n84JxVBXwg+oPOfmZ+hOeEQPA7j7TdcC4EZDQ==
dependencies:
"@abp/core" "~4.4.0"
"@abp/core" "~4.4.4"
"@fortawesome/fontawesome-free" "^5.13.0"
"@abp/jquery-form@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.4.0.tgz#fa850cb5c9de9f584a8a57da934199719a2f71e7"
integrity sha512-24/X/SKe/wJNxIeXxFfW3EfKLXR7eAygdMm2X8lleqcS1K5aRTXCxt/tDlyHgrDh5nFMBaFwbJ1p3ii7ukRWRw==
"@abp/jquery-form@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.4.4.tgz#0638484b9318ba98acaf765aac0396f5f523dce5"
integrity sha512-JWN82DzSbSk2vAPQaapv+8PPCN8si4peLoWJAoHTVizAvis3YamdcG+QLYbTCAVKRlh7kiLRgbAAroy3ppbZ7Q==
dependencies:
"@abp/jquery" "~4.4.0"
"@abp/jquery" "~4.4.4"
jquery-form "^4.3.0"
"@abp/jquery-validation-unobtrusive@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.4.0.tgz#183ddca2f96035f21de75097bcd15a5ff54b662f"
integrity sha512-YlDIgOe98H8HNzTFmFukz5+p/AW8baSfppXQLJNlY9xzx83lkW9/gLc/LdSO9243NI2a1nowLVZ7vcL6dMv9kQ==
"@abp/jquery-validation-unobtrusive@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.4.4.tgz#2ef0ce29eeb9e6aac9a87338a67aab2060b63026"
integrity sha512-XA9s0uzGXjBju1ZS42xd3IWproSxLBdGEZIYoSbVmaxS0YDBa8FqffbNb/fgY9M8dqujZEasDVuQPhXLBRN+jA==
dependencies:
"@abp/jquery-validation" "~4.4.0"
"@abp/jquery-validation" "~4.4.4"
jquery-validation-unobtrusive "^3.2.11"
"@abp/jquery-validation@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.4.0.tgz#a76f0ca233abf134cb557019c2aa7777c1b0ba1b"
integrity sha512-PYVcz6ehbI43LEwhet89wHZBBoPdbHu/aSgaYHRC4scQu0EhXN8RpPyHmEsb7SyvRP6c8QBFvofDDY3LO73pWA==
"@abp/jquery-validation@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.4.4.tgz#fa71e1729b692b40097175d68caad29ea13d5155"
integrity sha512-vrP/Vpne86GbPnHR8M8PGvm+B9kGd/JJiPzVN/egxEvvBKdw0APGk9R03Tji2Qu8CuZxvPnKzHHBwKRinWX3Ng==
dependencies:
"@abp/jquery" "~4.4.0"
"@abp/jquery" "~4.4.4"
jquery-validation "^1.19.2"
"@abp/jquery@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.4.0.tgz#889245ae382bbefeee3b932b68c86e8016f33aab"
integrity sha512-qY1f3EDDjaJyAKSxl2gxrt/U1y2yLWLq1x7QReTtuhkHEwrs+xZ5AOy4Lum3Q7awiGKysvJhPS2JfaRKeG+skA==
"@abp/jquery@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.4.4.tgz#cbf5f99562ad5f01c41aa61704b0136c4ad68594"
integrity sha512-0fltJprq9DMHHWeTAN7i8kAcod5czQ48LdjeIY3wuLDWkGgMVcfarECQ9cu7QekMryB0HFdrUjMJHIhxqzxc3Q==
dependencies:
"@abp/core" "~4.4.0"
jquery "~3.5.1"
"@abp/core" "~4.4.4"
jquery "~3.6.0"
"@abp/lodash@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.4.0.tgz#6ca17141ee9d5cfb89c51b4bbb49e06289c10b36"
integrity sha512-1pxZ5pNwY0ZBDkchY94ji6ctEK+0dK1APMMctxOpd5BYynQbdjj/skKWiPl6HfznxI/qi2y6vJheFnKUhLDjAA==
"@abp/lodash@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.4.4.tgz#8abd3986bcf64561ecbc86f23f53677b3c34eda9"
integrity sha512-IyAZHiR1vPYhbla0lTH/iYK38PCR+9wP5zgrWGD0JSP9R642GEEhdeiuzwclv1aNGretg+TSATr+zSWB5V1DYQ==
dependencies:
"@abp/core" "~4.4.0"
"@abp/core" "~4.4.4"
lodash "^4.17.15"
"@abp/luxon@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.4.0.tgz#da0448cb6d9a93a85e0885fb0fdbd432aec3e7f1"
integrity sha512-0mf0A1bIfzcsvoxkfY203iZfnHIO5KjhLbZsRZT7A2xp3g9Nmnj8YGD3CSAJCAs0Usi/FBetBtEIs3vv2wzvWw==
"@abp/luxon@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.4.4.tgz#429b28dddbd8fa65c6c58978451d426bb886c5a3"
integrity sha512-pw75sGoQ/d4OaNlmGwt55Eq7AGWXUBuXyrsNQWSJmkPV9AS2s//ZoxZut1Wu/qaKo5DV4VitEW1U21MuKoEZPA==
dependencies:
"@abp/core" "~4.4.0"
"@abp/core" "~4.4.4"
luxon "^1.24.1"
"@abp/malihu-custom-scrollbar-plugin@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.4.0.tgz#64d83674d0da1f50c48ffcf9aed5d7669f12ba77"
integrity sha512-6NqOWufGqs5Hfivwt8fTJCz51c2XFtCRG9NSef5qhWIsqB8T3R0+pCUueA91oNaBDA0gmMpXQAL4fP0vSb96sg==
"@abp/malihu-custom-scrollbar-plugin@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.4.4.tgz#fea9aa4755993dac45a8ad10938da789ec523518"
integrity sha512-Mgtzpw94SjN91YWPdV/TfvDt5JZNpW6iCHfL2NjfH3sTXCywK/CanmhdQ0FYJCasRWVPTHfQPWydFsnyzHWXRQ==
dependencies:
"@abp/core" "~4.4.0"
"@abp/core" "~4.4.4"
malihu-custom-scrollbar-plugin "^3.1.5"
"@abp/select2@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.4.0.tgz#6fe97eb15873493821560ff3bb0188094f58f9b3"
integrity sha512-L/03kw/UwB5bMgEifuGp2WAi/mD7NdzVGhV85vxnIFDqNL5YJzki6khCFy1gOP9A8fIaWbra0d81RwrEFDHcBw==
"@abp/select2@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.4.4.tgz#80d0e0b64cec86a3aa069e9086958946f631d2bf"
integrity sha512-8qx0nj9ZHrdnEPccpLhavHu4YnVp0Z5ZyfpfACVS2GgaxsR31DbltlGdnr2IfRyhK8nJWLNsW8UNhSoXQwGYEw==
dependencies:
"@abp/core" "~4.4.0"
"@abp/core" "~4.4.4"
select2 "^4.0.13"
"@abp/sweetalert@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.4.0.tgz#56a6fd89956851c9801085ac17beb1199878a887"
integrity sha512-tHGYWKum8YFBdfhvCeCpv5Qn4tfSHvXYxWxQysB+K2t+s5F6YGOo/IsEGipRVzfO5E4BsdWZ2UTp18MMRgCmGw==
"@abp/sweetalert@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.4.4.tgz#1af8934290d4e5adb7c620363ef2a9b746a6eeab"
integrity sha512-TgXm4rhqzTghKzgbxDT5NQcQ/PRFkgwJtnNWZK3XDZiKzw0auT8Wa3GtSsJJD5tl3Dx6VfnTtmf0gpPU5/9fKQ==
dependencies:
"@abp/core" "~4.4.0"
"@abp/core" "~4.4.4"
sweetalert "^2.1.2"
"@abp/timeago@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.4.0.tgz#64140843778b0da67bddc693a980fe06740774cb"
integrity sha512-eJa6C38eINvcu9dLZSgsIp/o/KLOHgertxMCIraSnkH3QwngUqVLfXRZg2DOEh14dxAUPpTiKp6cHS+YLe8PEg==
"@abp/timeago@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.4.4.tgz#91ddb61439eaa138a42b9179ec92845efb05af29"
integrity sha512-r53FieaMDar60tGAu+NLr2qCem1+NhPgd7MtYEemJil8HUYci7T0fXvWcYhlrn98zipzEx3eiWo4eBwvIP8MLg==
dependencies:
"@abp/jquery" "~4.4.0"
"@abp/jquery" "~4.4.4"
timeago "^1.6.7"
"@abp/toastr@~4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.4.0.tgz#31927392bcaefb4d00ac208b6d32e63c4d08da50"
integrity sha512-jfknDSeljI5sUcj57B4U+UgR5l9Ii7bBhJiAOSl+pE0oJh9NJckHgAI7vlT5m8LqdRsT+wpFZ+go+VaoHTCStw==
"@abp/toastr@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.4.4.tgz#1cd04ad6dfcb866bfaad3ec288407b0bf3f47c41"
integrity sha512-B7Q0Gza71nITTbryHcHqiIxtJzFbVmXeoPlcLlc/i4zvMaoibihevN10vXmPnfkdQUvTgViIjwA4/ZnBmyM11Q==
dependencies:
"@abp/jquery" "~4.4.0"
"@abp/jquery" "~4.4.4"
toastr "^2.1.4"
"@abp/utils@^4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.4.0.tgz#2e724cf80800fef678627f6f212a8be895cc75bd"
integrity sha512-gXoTV7AltWyiqqOi6NE2DwUAJfI08AbByD2YVsst5LmqZGY5oX7CQOLdbDuuXlKou/kHwNzc25EMe1O4/r6rYw==
"@abp/utils@~4.4.4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.4.4.tgz#0bd79fa4635224fcae7ff61224a8c54266db73bf"
integrity sha512-h8Nt2OPqi8EiXKAuvJIpBlCHhavL7BHr+ntJXY6yM4aCdcQtJdSAgNmh0skzEGnf1hZxrYOugtAz4Pk1WNjv/g==
dependencies:
just-compare "^1.3.0"
@ -1473,10 +1473,10 @@ jquery@>=1.12.0, "jquery@>=1.5.0 <4.0", jquery@>=1.7, "jquery@>=1.7.1 <4.0.0", j
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
jquery@~3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
jquery@~3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
json-stable-stringify-without-jsonify@^1.0.1:
version "1.0.1"

64
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/CompanyName.ProjectName.IdentityServer.csproj

@ -0,0 +1,64 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>CompanyName.ProjectName</RootNamespace>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PreserveCompilationContext>true</PreserveCompilationContext>
<MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>CompanyName.ProjectName-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Logs\**" />
<Content Remove="Logs\**" />
<EmbeddedResource Remove="Logs\**" />
<None Remove="Logs\**" />
</ItemGroup>
<ItemGroup>
<None Update="Pages\**\*.js">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Pages\**\*.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="$(SerilogAspNetCoreVersion)" />
<PackageReference Include="Serilog.Sinks.Async" Version="$(SerilogSinksAsyncVersion)" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="$(MicrosoftVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpPackageVersion)" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="$(AbpPackageVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(AbpPackageVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpPackageVersion)" />
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="$(AbpPackageVersion)" />
<PackageReference Include="Volo.Abp.Account.Application" Version="$(AbpPackageVersion)" />
<ProjectReference Include="..\..\src\CompanyName.ProjectName.Domain.Shared\CompanyName.ProjectName.Domain.Shared.csproj" />
<ProjectReference Include="..\..\src\CompanyName.ProjectName.EntityFrameworkCore\CompanyName.ProjectName.EntityFrameworkCore.csproj" />
</ItemGroup>
<ItemGroup>
<_ContentIncludedByDefault Remove="publish\CompanyName.ProjectName.IdentityServer.dll.config" />
<_ContentIncludedByDefault Remove="publish\web.config" />
<_ContentIncludedByDefault Remove="publish\appsettings.Development.json" />
<_ContentIncludedByDefault Remove="publish\appsettings.json" />
<_ContentIncludedByDefault Remove="publish\appsettings.Production.json" />
<_ContentIncludedByDefault Remove="publish\appsettings.secrets.json" />
<_ContentIncludedByDefault Remove="publish\CompanyName.ProjectName.IdentityServer.deps.json" />
<_ContentIncludedByDefault Remove="publish\CompanyName.ProjectName.IdentityServer.runtimeconfig.json" />
<_ContentIncludedByDefault Remove="publish\package.json" />
<_ContentIncludedByDefault Remove="publish\wwwroot\libs\malihu-custom-scrollbar-plugin\package.json" />
</ItemGroup>
</Project>

0
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/Dockerfile → aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Dockerfile

71
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Extensions/SameSiteCookiesServiceCollectionExtensions.cs

@ -0,0 +1,71 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
namespace CompanyName.ProjectName.Extensions
{
public static class SameSiteCookiesServiceCollectionExtensions
{
public static IServiceCollection AddSameSiteCookiePolicy(this IServiceCollection services)
{
services.Configure<CookiePolicyOptions>(options =>
{
options.MinimumSameSitePolicy = SameSiteMode.Unspecified;
options.OnAppendCookie = cookieContext =>
CheckSameSite(cookieContext.Context, cookieContext.CookieOptions);
options.OnDeleteCookie = cookieContext =>
CheckSameSite(cookieContext.Context, cookieContext.CookieOptions);
});
return services;
}
private static void CheckSameSite(HttpContext httpContext, CookieOptions options)
{
if (options.SameSite == SameSiteMode.None)
{
var userAgent = httpContext.Request.Headers["User-Agent"].ToString();
if (!httpContext.Request.IsHttps || DisallowsSameSiteNone(userAgent))
{
// For .NET Core < 3.1 set SameSite = (SameSiteMode)(-1)
options.SameSite = SameSiteMode.Unspecified;
}
}
}
private static bool DisallowsSameSiteNone(string userAgent)
{
// Cover all iOS based browsers here. This includes:
// - Safari on iOS 12 for iPhone, iPod Touch, iPad
// - WkWebview on iOS 12 for iPhone, iPod Touch, iPad
// - Chrome on iOS 12 for iPhone, iPod Touch, iPad
// All of which are broken by SameSite=None, because they use the iOS networking stack
if (userAgent.Contains("CPU iPhone OS 12") || userAgent.Contains("iPad; CPU OS 12"))
{
return true;
}
// Cover Mac OS X based browsers that use the Mac OS networking stack. This includes:
// - Safari on Mac OS X.
// This does not include:
// - Chrome on Mac OS X
// Because they do not use the Mac OS networking stack.
if (userAgent.Contains("Macintosh; Intel Mac OS X 10_14") &&
userAgent.Contains("Version/") && userAgent.Contains("Safari"))
{
return true;
}
// Cover Chrome 50-69, because some versions are broken by SameSite=None,
// and none in this range require it.
// Note: this covers some pre-Chromium Edge versions,
// but pre-Chromium Edge does not require SameSite=None.
if (userAgent.Contains("Chrome/5") || userAgent.Contains("Chrome/6"))
{
return true;
}
return false;
}
}
}

8536
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Logs/logs.txt

File diff suppressed because it is too large

33
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Account/LoggedOut.cshtml

@ -0,0 +1,33 @@
@page "/Account/LoggedOut"
@model Volo.Abp.Account.Web.Pages.Account.LoggedOutModel
@using Volo.Abp.Account.Localization
@using Microsoft.AspNetCore.Mvc.Localization
@inject IHtmlLocalizer<AccountResource> L
@{
ViewData["Title"] = "登出";
Layout = null;
}
<head>
<title>登出</title>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no"/>
</head>
<div>
@if (Model.PostLogoutRedirectUri != null)
{
<a abp-button="Primary" id="redirectButton" href="@Model.PostLogoutRedirectUri" cname="@Model.ClientName">@L["ReturnToText"]</a>
}
@if (Model.SignOutIframeUrl != null)
{
<iframe class="signout logoutiframe" src="@Model.SignOutIframeUrl"></iframe>
}
</div>
<script>
document.addEventListener('DOMContentLoaded', function (event) {
window.clientName = document.getElementById("redirectButton").getAttribute("cname");
window.location = document.getElementById('redirectButton').getAttribute('href');
});
</script>

70
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Account/Login.cshtml

@ -0,0 +1,70 @@
@page
@using Microsoft.AspNetCore.Mvc.Localization
@using Volo.Abp.Account.Localization
@using Volo.Abp.Account.Settings
@using Volo.Abp.Settings
@model Volo.Abp.Account.Web.Pages.Account.LoginModel
@inject IHtmlLocalizer<AccountResource> L
@inject Volo.Abp.Settings.ISettingProvider SettingProvider
<div class="card mt-3 shadow-sm rounded">
<div class="card-body p-5">
<h4>@L["Login"]</h4>
@* @if (await SettingProvider.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled)) *@
@* { *@
@* <strong> *@
@* @L["AreYouANewUser"] *@
@* <a href="@Url.Page("./Register", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})" class="text-decoration-none">@L["Register"]</a> *@
@* </strong> *@
@* } *@
@if (Model.EnableLocalLogin)
{
<form method="post" class="mt-4">
<div class="form-group">
<label asp-for="LoginInput.UserNameOrEmailAddress"></label>
<input asp-for="LoginInput.UserNameOrEmailAddress" class="form-control"/>
<span asp-validation-for="LoginInput.UserNameOrEmailAddress" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="LoginInput.Password"></label>
<input asp-for="LoginInput.Password" class="form-control"/>
<span asp-validation-for="LoginInput.Password" class="text-danger"></span>
</div>
<abp-row>
<abp-column>
<abp-input asp-for="LoginInput.RememberMe" class="mb-4"/>
</abp-column>
@* <abp-column class="text-right"> *@
@* <a href="@Url.Page("./ForgotPassword", new {returnUrl = Model.ReturnUrl, returnUrlHash = Model.ReturnUrlHash})">@L["ForgotPassword"]</a> *@
@* </abp-column> *@
</abp-row>
<abp-button type="submit" button-type="Primary" name="Action" value="Login" class="btn-block btn-lg mt-3">@L["Login"]</abp-button>
@if (Model.ShowCancelButton)
{
<abp-button type="submit" button-type="Secondary" formnovalidate="formnovalidate" name="Action" value="Cancel" class="btn-block btn-lg mt-3">@L["Cancel"]</abp-button>
}
</form>
}
@if (Model.VisibleExternalProviders.Any())
{
<div class="mt-2">
<h5>@L["OrLoginWith"]</h5>
<form asp-page="./Login" asp-page-handler="ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" asp-route-returnUrlHash="@Model.ReturnUrlHash" method="post">
@foreach (var provider in Model.VisibleExternalProviders)
{
<button type="submit" class="btn btn-primary m-1" name="provider" value="@provider.AuthenticationScheme" title="@L["LogInUsingYourProviderAccount", provider.DisplayName]">@provider.DisplayName</button>
}
</form>
</div>
}
@if (!Model.EnableLocalLogin && !Model.VisibleExternalProviders.Any())
{
<div class="alert alert-warning">
<strong>@L["InvalidLoginRequest"]</strong>
@L["ThereAreNoLoginSchemesConfiguredForThisClient"]
</div>
}
</div>
</div>

0
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/Pages/Account/ReWriteLogin.cshtml → aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Account/ReWriteLogin.cshtml

36
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Index.cshtml

@ -0,0 +1,36 @@
@page
@using CompanyName.ProjectName.Pages
@using Volo.Abp.Users
@model IndexModel
@inject ICurrentUser CurrentUser
@if (CurrentUser.IsAuthenticated)
{
<div>
<abp-row>
<abp-column size-md="_3" class="text-center">
<i class="fa fa-user d-block" style="font-size: 10em; color: #12b900"></i>
<a abp-button="Primary" href="/Account/Logout">Logout</a>
</abp-column>
<abp-column size-md="_9">
<h2>@CurrentUser.UserName</h2>
<h5 class="text-muted">@CurrentUser.Email</h5>
<div>
<strong>Roles</strong>: @CurrentUser.Roles.JoinAsString(", ")
<br />
<strong>Claims</strong>: <br />
@Html.Raw(CurrentUser.GetAllClaims().Select(c => $"{c.Type}={c.Value}").JoinAsString(" <br /> "))
</div>
</abp-column>
</abp-row>
</div>
}
@if (!CurrentUser.IsAuthenticated)
{
<div class="text-center">
<i class="fa fa-user d-block" style="font-size: 10em; color: #aaa"></i><br /><br />
<a abp-button="Primary" asp-page="/Account/Login">Login</a>
</div>
}

16
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Index.cshtml.cs

@ -0,0 +1,16 @@
using Microsoft.AspNetCore.Mvc;
using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
using Volo.Abp.Users;
namespace CompanyName.ProjectName.Pages
{
public class IndexModel : AbpPageModel
{
private readonly ICurrentUser _currentUser;
public IndexModel(ICurrentUser currentUser)
{
_currentUser = currentUser;
}
}
}

35
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Welcome.cshtml

@ -0,0 +1,35 @@
@page
@model CompanyName.ProjectName.Pages.Welcome
@using Volo.Abp.Users
@inject ICurrentUser CurrentUser
@if (CurrentUser.IsAuthenticated)
{
<div>
<abp-row>
<abp-column size-md="_3" class="text-center">
<i class="fa fa-user d-block" style="font-size: 10em; color: #12b900"></i>
<a abp-button="Primary" href="/Account/Logout">Logout</a>
</abp-column>
<abp-column size-md="_9">
<h2>@CurrentUser.UserName</h2>
<h5 class="text-muted">@CurrentUser.Email</h5>
<div>
<strong>Roles</strong>: @CurrentUser.Roles.JoinAsString(", ")
<br />
<strong>Claims</strong>: <br />
@Html.Raw(CurrentUser.GetAllClaims().Select(c => $"{c.Type}={c.Value}").JoinAsString(" <br /> "))
</div>
</abp-column>
</abp-row>
</div>
}
@if (!CurrentUser.IsAuthenticated)
{
<div class="text-center">
<i class="fa fa-user d-block" style="font-size: 10em; color: #aaa"></i><br /><br />
<a abp-button="Primary" asp-page="/Account/Login">Login</a>
</div>
}

22
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/Welcome.cshtml.cs

@ -0,0 +1,22 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
using Volo.Abp.Users;
namespace CompanyName.ProjectName.Pages
{
[Authorize]
public class Welcome : AbpPageModel
{
private readonly ICurrentUser _currentUser;
public Welcome(ICurrentUser currentUser)
{
_currentUser = currentUser;
}
public void OnGet()
{
}
}
}

4
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Pages/_ViewImports.cshtml

@ -0,0 +1,4 @@
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling

54
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Program.cs

@ -0,0 +1,54 @@
using System;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;
using Serilog;
using Serilog.Events;
namespace CompanyName.ProjectName
{
public class Program
{
public static int Main(string[] args)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()
#else
.MinimumLevel.Information()
#endif
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
.Enrich.FromLogContext()
.WriteTo.Async(c => c.File("Logs/logs.txt"))
#if DEBUG
.WriteTo.Async(c => c.Console())
#endif
.CreateLogger();
try
{
Log.Information("Starting CompanyName.ProjectName.IdentityServer.");
CreateHostBuilder(args).Build().Run();
return 0;
}
catch (Exception ex)
{
Log.Fatal(ex, "CompanyName.ProjectName.IdentityServer terminated unexpectedly!");
return 1;
}
finally
{
Log.CloseAndFlush();
}
}
internal static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStartup<Startup>();
})
.UseAutofac()
.UseSerilog();
}
}

11
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/ProjectNameBrandingProvider.cs

@ -0,0 +1,11 @@
using Volo.Abp.Ui.Branding;
using Volo.Abp.DependencyInjection;
namespace CompanyName.ProjectName
{
[Dependency(ReplaceServices = true)]
public class ProjectNameBrandingProvider : DefaultBrandingProvider
{
public override string AppName => "ProjectName";
}
}

190
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/ProjectNameIdentityServerModule.cs

@ -0,0 +1,190 @@
using System;
using System.Linq;
using Localization.Resources.AbpUi;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using CompanyName.ProjectName.EntityFrameworkCore;
using CompanyName.ProjectName.Extensions;
using CompanyName.ProjectName.Localization;
using CompanyName.ProjectName.MultiTenancy;
using Microsoft.Extensions.Configuration;
using StackExchange.Redis;
using Volo.Abp;
using Volo.Abp.Account;
using Volo.Abp.Account.Web;
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
using Volo.Abp.AspNetCore.Serilog;
using Volo.Abp.Auditing;
using Volo.Abp.Autofac;
using Volo.Abp.BackgroundJobs;
using Volo.Abp.Caching;
using Volo.Abp.Caching.StackExchangeRedis;
using Volo.Abp.Localization;
using Volo.Abp.Modularity;
using Volo.Abp.UI.Navigation.Urls;
using Volo.Abp.VirtualFileSystem;
namespace CompanyName.ProjectName
{
[DependsOn(
typeof(AbpAutofacModule),
typeof(AbpCachingStackExchangeRedisModule),
typeof(AbpAccountWebIdentityServerModule),
typeof(AbpAccountApplicationModule),
typeof(AbpAspNetCoreMvcUiBasicThemeModule),
typeof(ProjectNameEntityFrameworkCoreModule),
typeof(AbpAspNetCoreSerilogModule)
)]
public class ProjectNameIdentityServerModule : AbpModule
{
private const string DefaultCorsPolicyName = "Default";
public override void ConfigureServices(ServiceConfigurationContext context)
{
var hostingEnvironment = context.Services.GetHostingEnvironment();
var configuration = context.Services.GetConfiguration();
context.Services.AddSameSiteCookiePolicy();
ConfigureLocalization();
ConfigureVirtualFileSystem(context);
ConfigureCache(context);
ConfigureCors(context, configuration);
ConfigureOther(configuration);
}
public override void OnApplicationInitialization(ApplicationInitializationContext context)
{
var app = context.GetApplicationBuilder();
var env = context.GetEnvironment();
if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
}
app.UseAbpRequestLocalization();
if (!env.IsDevelopment())
{
app.UseErrorPage();
}
app.UseCorrelationId();
app.UseStaticFiles();
app.UseRouting();
app.UseCors(DefaultCorsPolicyName);
app.UseCookiePolicy();
app.UseAuthentication();
if (MultiTenancyConsts.IsEnabled)
{
app.UseMultiTenancy();
}
app.UseUnitOfWork();
app.UseIdentityServer();
app.UseAuthorization();
app.UseAuditing();
app.UseAbpSerilogEnrichers();
app.UseConfiguredEndpoints();
}
private void ConfigureOther(IConfiguration configuration)
{
Configure<AppUrlOptions>(options =>
{
options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"];
options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"].Split(','));
options.Applications["Angular"].RootUrl = configuration["App:ClientUrl"];
options.Applications["Angular"].Urls[AccountUrlNames.PasswordReset] = "account/reset-password";
});
Configure<AbpBackgroundJobOptions>(options => { options.IsJobExecutionEnabled = false; });
Configure<AbpAuditingOptions>(options =>
{
//options.IsEnabledForGetRequests = true;
options.ApplicationName = "AuthServer";
});
}
private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration)
{
context.Services.AddCors(options =>
{
options.AddPolicy(DefaultCorsPolicyName, builder =>
{
builder
.WithOrigins(
configuration["App:CorsOrigins"]
.Split(",", StringSplitOptions.RemoveEmptyEntries)
.Select(o => o.RemovePostFix("/"))
.ToArray()
)
.WithAbpExposedHeaders()
.SetIsOriginAllowedToAllowWildcardSubdomains()
.AllowAnyHeader()
.AllowAnyMethod()
.AllowCredentials();
});
});
}
private void ConfigureLocalization()
{
Configure<AbpLocalizationOptions>(options =>
{
options.Resources
.Get<ProjectNameResource>()
.AddBaseTypes(
typeof(AbpUiResource)
);
options.Languages.Add(new LanguageInfo("ar", "ar", "العربية"));
options.Languages.Add(new LanguageInfo("cs", "cs", "Čeština"));
options.Languages.Add(new LanguageInfo("en", "en", "English"));
options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)"));
options.Languages.Add(new LanguageInfo("fr", "fr", "Français"));
options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar"));
options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português"));
options.Languages.Add(new LanguageInfo("ru", "ru", "Русский"));
options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文"));
options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch", "de"));
options.Languages.Add(new LanguageInfo("es", "es", "Español", "es"));
});
}
/// <summary>
/// Redis缓存
/// </summary>
private void ConfigureCache(ServiceConfigurationContext context)
{
Configure<AbpDistributedCacheOptions>(options => { options.KeyPrefix = "ProjectName:"; });
var configuration = context.Services.GetConfiguration();
var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
context.Services
.AddDataProtection()
.PersistKeysToStackExchangeRedis(redis, "ProjectName-Protection-Keys");
}
private void ConfigureVirtualFileSystem(ServiceConfigurationContext context)
{
Configure<AbpVirtualFileSystemOptions>(options => { options.FileSets.AddEmbedded<ProjectNameIdentityServerModule>(); });
Configure<AbpBundlingOptions>(options =>
{
options.StyleBundles.Configure(
BasicThemeBundles.Styles.Global,
bundle => { bundle.AddFiles("/global-styles.css"); }
);
});
}
}
}

12
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Properties/launchSettings.json

@ -0,0 +1,12 @@
{
"profiles": {
"CompanyName.ProjectName.IdentityServer": {
"commandName": "Project",
"launchBrowser": false,
"applicationUrl": "http://localhost:44354",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}

18
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/Startup.cs

@ -0,0 +1,18 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
namespace CompanyName.ProjectName
{
public class Startup
{
public void ConfigureServices(IServiceCollection services)
{
services.AddApplication<ProjectNameIdentityServerModule>();
}
public void Configure(IApplicationBuilder app)
{
app.InitializeApplication();
}
}
}

11
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/abp.resourcemapping.js

@ -0,0 +1,11 @@
module.exports = {
aliases: {
},
clean: [
],
mappings: {
}
};

15
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/appsettings.Production.json

@ -0,0 +1,15 @@
{
"App": {
"SelfUrl": "https://localhost:44354",
"ClientUrl": "http://localhost:4200",
"CorsOrigins": "https://*.ProjectName.com,http://localhost:4200,https://localhost:44307,https://localhost:44315,http://120.24.194.14:8012,http://120.24.194.14:8011,http://120.24.194.14:8013",
"RedirectAllowedUrls": "http://localhost:4200,https://localhost:44307"
},
"ConnectionStrings": {
"Default": "Data Source=120.24.194.14;Database=CompanyNameProjectName20211114;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
},
"Redis": {
"Configuration": "120.24.194.14,password=1q2w3E*,defaultdatabase=1"
}
}

15
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/appsettings.json

@ -0,0 +1,15 @@
{
"App": {
"SelfUrl": "https://localhost:44354",
"ClientUrl": "http://localhost:4200",
"CorsOrigins": "https://*.ProjectName.com,http://localhost:4200,https://localhost:44307,https://localhost:44315",
"RedirectAllowedUrls": "http://localhost:4200,https://localhost:44307"
},
"ConnectionStrings": {
"Default": "Data Source=localhost;Database=CompanyNameProjectNameDB6;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
},
"Redis": {
"Configuration": "localhost,password=mypassword,defaultdatabase=1"
}
}

0
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer/gulpfile.js → aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/gulpfile.js

8
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/package.json

@ -0,0 +1,8 @@
{
"version": "1.0.0",
"name": "my-app-identityserver",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "^5.0.0-rc.1"
}
}

1
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/tempkey.jwk

@ -0,0 +1 @@
{"alg":"RS256","d":"Y_Mo7J2gdKgMLqrDtdW8JZtIiHvJWpWb2qAljxeQSiTAZs4-Cuss9CWpKJxYe3ZBzCLXHiZr6Zx5CMWC7yhAh0ojM71q4Tyw4N3YQfiAm--lWqIMJSMhGK0Hj2PiHdctt9J3NHSuwjD-HfHcNOMVzLiBaGuvlaVyIqz959FwxNsb5QzuxcRXNOMoO7d7uKR9ZYdFECWfBCthf4Mfr2YOLSORtyikooDMDmAJCL6U3igO11rdqWAMNMPfCmA0qKU4YNyhZgXpC-FrobiHbiSug5_xgBLSvSfIquBz7yW_tUkbM-NHy1Iz1erkK1tY3x5HWANtu5tbLqM6UGn0ivb3AQ","dp":"a4b7gwmFr-ukqza608XDNaGKgzQlaEum6h0qAbjtdUrydWARYiNAiSLuxn5vQ6CVobDfAhsD1x0Tnfy8DHaHBu89yncs0Fzu7szeBcLpU3OAlY6wx2swouBHT0gXMweL37sZpS9wJ14mKJ60EuLhhcZnKJdhQG1e1A5NICZecPk","dq":"oZEXJ7lc2emvnJxoBqVmYt_Uf49M4izkQ5dtYFncYVSZGErDsUlcR7wtmTpvdfKV2zQ9d6ZAMrzGmTIxRq7gXRF7hDpADxvAfJVTT0DH5nxJwiMPf9FA_g0QZANZgkMrRfZ7fXFhSAA96JYy60x45n731hsh0lIMYnJWS9S7p4c","e":"AQAB","kid":"CBCA50D09AFE5E5FC45E5D80805CC5BC","kty":"RSA","n":"rlyLVmVEmEMq5OYtJF76THrc6xiLRf1RcjwvbCMaZYpSEYtfPqU7hnNVk3HVbEHVtovMG-UHhfHYIZIttwbd3u2JXK3IYtTyrovyQtcFzww4VDiF77_u9oBwDrAXj99evUaI_M9lHd9LHRxOw8-p-Y5FIXO7-ZoAfdA_0JFk5QxXNTd7BfP7FFX1JZn-ossHm0-dFEL9cLE4YKpA8SQ1z0KLFCjMYV_NG9J5kPcPjdTYH3ZxrSCr65hWgEw7ombPwTp87KmWU-DYAdJP8ur32-lzv1JgKAlsCNJfS5U57FUIGClY8FZ-6KEyWUeA6k3UYEjc4Gl_XjS6x4bL1nGZ4Q","p":"0KoX6IJTNjGUSo4CM7tn_xDUSGV1Z_qJRsUOk3FdKbHFHn3iHsfV4xme3Ma06RtEojS0AgQ6t7EBFZ8cDlS-RnPsLtptRfa3aNkyBOtIqr5iu65siOYi-cqHxiSdwNy6d_EnNQojKcy9IgbT1Zp1SViLWPsh3fgr6mPD1NlzjFs","q":"1epav74nxH7spLZXTkhr0tSW87SeKXTG3pAFAVNBLSETdLDq54b3f34xtV7sCJiGvtyFBMhQb_GmYe1nkfxdTKPzJC-fpUkHeZqkX7MpvOwlig5AbLx8bjDtfuEDXWbEUV9HE3IEPNlkUnXHz4wXFOiz4arHQdIztd7vajLGN3M","qi":"rwQvfIRyqvgqRPQkF1Xvzv9fIjGzuVV01Wt38Cp2kajSoM-3AzxOlpe3LS4hnrwKiXNgmfFAuuDJELRTBqICwTJslErqIyoLXVz2nERN8nvOGhPJPKjpOPjS_5FPpeImpEkQP0fbk3dCv2kyykO0qMS8HIcsf1M1Y02WplRz9TM"}

1
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/tempkey.rsa

@ -0,0 +1 @@
{"KeyId":"ac0d2edf3c04d13cd95cc41b9b33ab03","Parameters":{"D":"FFymEWbX3XBT5YnTngOKwtz3XKsyaQbyDvvw9jbmkdvLKUmrb1hkmylqVYwU/3G1u79rrD8AZXJDoYVLegyZymK/iNeePMLI4i5vScF7PdQXn/g6CvQ8j3J60YYyfDWuxjBH8nCEUIfQIv14BpcH6CWi1BVZUbnbWcpe2ji8D5I3FHOZpvksQztst5eE836ODdN9jgk35kgrdUQ14MEFHA6m6fAzvFI1csFxD3Kwej4rI8RYZ0WYLkndz9ID88+v9VxqI8+wN6wR6tIOR510uT1FI5wONBVBUzgeZ6cCEpg0jC9tgqcP03gMDpmE7vKp34ExxH/iOWyhQ0gAxHOVlQ==","DP":"qSQfNZvEkepgY12d+uwTbRoOp+0g1CBiMU9kqyoIB56hAUnzENSCDzunjLRrvDLFPgXiUcoccskyVRnKKOGPOqPE6VjgzBrdLgA/hBf8hPg0GnTVoPyLxR9G6GsGUKsAYVn8G7cnK5wXzK4jCjsflkfxCzFfdASJ/+sa5QPWZMM=","DQ":"u+56T1+rhMvlurid9kBS2Ypfm4vOiNAXLD9kGz2wx8Ob0yYlWo55kn11qPs6Ej9bnQIY3N+TY2tXMamfhAhntoHaKrFjOpCmlHZ0GAeQOJVuWSlFvu/NBoxfjZzcUCNua22oJjy++wSdkkLLGEqau62byaQoSSqUxUzwL36RexM=","Exponent":"AQAB","InverseQ":"E+uq9g6D5LjUk+M7gtt0srnT8duwu8P83AgFqjtGOnSCy71omSboxb4zC9bGq/WaEFauFBwqxbkXwFyXuYNfIelfmSERulU9jgf0+KH6QmFdtjrJ5UO7VArqET1WUquwiDvOyO8udCxi8RRAiM5G3dTzIs5JTalGhlKEZSAgPtQ=","Modulus":"rgHACxzqvuE72RF/NdDTLsIEy3F/n6P4lkgrER60FU8uRNwSmAMRxvxYOaE3Ot/krRYcw2+MP8ewR1VBXywXVT1zuACA3SacMHJYmZQ2UkuwsD9bmpjvqoMhR/hjsI74jTzKpclHtEu7D7WYDZaIPAEIs/8+5H/z1mXVfgACaeaQt3C0OhwXSOPPDP71VKGfoFucXYED1keZ0PKxYAlhiHOe7cnSlfJseujwD2Rhyq8mUhe6aEMTYBjuruWgpfvnSOARAqu5vwzK35KpAirHwa1DJSZyanNMFdlLkVNKWUKEqd6PwRneiHacmaaDF6oQQstuSbf9cuJeSMbKh7WVQQ==","P":"0CJDit2NHk0Z1bN5ZVIYZRUYbrAI2bEOafAKqfffcA/Os7yXsY14Ye4pSpDxfdZGcPGRL04HPkJsogFtyI7k4ujrvsC66I5cg45+BhBMM0zyLJ7LZkD2HGwX2+a/xrXhhIIOnGWWy2zzW3dkayRhi1bR9krfTA5uBw1LX9qZ3Yc=","Q":"1gZITAaB+r0+PgOfyDCeVzSnTyQuKSkgbUkIgQP9jQZa6edrbAXogdJipxmUTrW7JaxifG1z9ubK+TOqhjZHqT4gd8U8Bh7jCBizZNVe60pez1OtNGpEOW2N+ZrXBSMNcV8PFaMg/B+fcaX+i7NWpTqmztR/V0DGXmD+XosuaPc="}}

21844
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/wwwroot/css/argon.css

File diff suppressed because it is too large

18
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/wwwroot/css/argon.min.css

File diff suppressed because one or more lines are too long

71
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/wwwroot/css/site.css

@ -0,0 +1,71 @@
/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
for details on configuring this project to bundle and minify static web assets. */
a.navbar-brand {
white-space: normal;
text-align: center;
word-break: break-all;
}
/* Provide sufficient contrast against white background */
a {
color: #0366d6;
}
.btn-primary {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}
.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}
/* Sticky footer styles
-------------------------------------------------- */
html {
font-size: 14px;
}
@media (min-width: 768px) {
html {
font-size: 16px;
}
}
.border-top {
border-top: 1px solid #e5e5e5;
}
.border-bottom {
border-bottom: 1px solid #e5e5e5;
}
.box-shadow {
box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
}
button.accept-policy {
font-size: 1rem;
line-height: inherit;
}
/* Sticky footer styles
-------------------------------------------------- */
html {
position: relative;
min-height: 100%;
}
body {
/* Margin bottom by footer height */
margin-bottom: 60px;
}
.footer {
position: absolute;
bottom: 0;
width: 100%;
white-space: nowrap;
line-height: 60px; /* Vertically center the text there */
}

1
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/wwwroot/css/yh_gobal.css

File diff suppressed because one or more lines are too long

1
aspnet-core/services/host/CompanyName.ProjectName.IdentityServer1/wwwroot/css/yh_portal.css

File diff suppressed because one or more lines are too long

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save