konsoft/KonSoft.Clean
7
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'master' (#2) from master into dv_karl

Browse Source 
Reviewed-on: #2
This commit is contained in:
KarlsEcho
2025-10-03 15:37:37 +08:00
parent a342a69347 0647bf54b5
commit fdfb005974
58 changed files with 348 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
.dockerignore Normal file
View File

@ -0,0 +1,30 @@
**/.classpath
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
LICENSE
README.md
!**/.gitignore
!.git/HEAD
!.git/config
!.git/packed-refs
!.git/refs/heads/**

24
applications/KonSoft.AuthServer/Dockerfile Normal file
View File

@ -0,0 +1,24 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
USER $APP_UID
WORKDIR /app
EXPOSE 8080
EXPOSE 8081
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["NuGet.Config", "."]
COPY ["applications/KonSoft.AuthServer/KonSoft.AuthServer.csproj", "applications/KonSoft.AuthServer/"]
RUN dotnet restore "./applications/KonSoft.AuthServer/KonSoft.AuthServer.csproj"
COPY . .
WORKDIR "/src/applications/KonSoft.AuthServer"
RUN dotnet build "./KonSoft.AuthServer.csproj" -c $BUILD_CONFIGURATION -o /app/build
FROM build AS publish
ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "./KonSoft.AuthServer.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "KonSoft.AuthServer.dll"]

12
applications/KonSoft.AuthServer/KonSoft.AuthServer.csproj
View File

@ -11,6 +11,8 @@
<MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>KonSoft-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..</DockerfileContext>
</PropertyGroup>
<ItemGroup>
@ -37,6 +39,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" />
@ -55,6 +58,15 @@
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="8.3.4" />
<PackageReference Include="Volo.Abp.Account.Application" Version="8.3.4" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="8.3.4" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="8.3.4" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="8.3.4" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="8.3.4" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="8.3.4" />
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="8.3.4" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="8.3.4" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="8.3.4" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="8.3.4" />
<PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="8.3.4" />
</ItemGroup>
</Project>

35
applications/KonSoft.AuthServer/KonSoftAuthServerModule.cs
View File

@ -1,8 +1,3 @@
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
using System;
using System.IO;
using System.Linq;
using Localization.Resources.AbpUi;
using Medallion.Threading;
using Medallion.Threading.Redis;
@ -11,15 +6,14 @@ using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using KonSoft.EntityFrameworkCore;
using KonSoft.Localization;
using KonSoft.MultiTenancy;
using StackExchange.Redis;
using System;
using System.IO;
using System.Linq;
using Volo.Abp;
using Volo.Abp.Account;
using Volo.Abp.Account.Localization;
using Volo.Abp.Account.Web;
using Volo.Abp.AspNetCore.Mvc.UI;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
@ -36,9 +30,7 @@ using Volo.Abp.Modularity;
using Volo.Abp.OpenIddict;
using Volo.Abp.Security.Claims;
using Volo.Abp.UI.Navigation.Urls;
using Volo.Abp.UI;
using Volo.Abp.VirtualFileSystem;
using Volo.Abp.Account.Localization;
namespace KonSoft;
@ -50,7 +42,6 @@ namespace KonSoft;
typeof(AbpAccountApplicationModule),
typeof(AbpAccountHttpApiModule),
typeof(AbpAspNetCoreMvcUiBasicThemeModule),
typeof(KonSoftEntityFrameworkCoreModule),
typeof(AbpAspNetCoreSerilogModule)
)]
public class KonSoftAuthServerModule : AbpModule
@ -112,26 +103,14 @@ public class KonSoftAuthServerModule : AbpModule
Configure<AbpAuditingOptions>(options =>
{
//options.IsEnabledForGetRequests = true;
options.IsEnabledForGetRequests = true;
options.ApplicationName = "AuthServer";
});
if (hostingEnvironment.IsDevelopment())
{
Configure<AbpVirtualFileSystemOptions>(options =>
{
options.FileSets.ReplaceEmbeddedByPhysical<KonSoftDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}KonSoft.Domain.Shared"));
options.FileSets.ReplaceEmbeddedByPhysical<KonSoftDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}KonSoft.Domain"));
});
}
Configure<AppUrlOptions>(options =>
{
options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"];
options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"]?.Split(',') ?? Array.Empty<string>());
options.Applications["Angular"].RootUrl = configuration["App:ClientUrl"];
options.Applications["Angular"].Urls[AccountUrlNames.PasswordReset] = "account/reset-password";
options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"]?.Split(',') ?? []);
});
Configure<AbpBackgroundJobOptions>(options =>
@ -166,7 +145,7 @@ public class KonSoftAuthServerModule : AbpModule
configuration["App:CorsOrigins"]?
.Split(",", StringSplitOptions.RemoveEmptyEntries)
.Select(o => o.RemovePostFix("/"))
.ToArray() ?? Array.Empty<string>()
.ToArray() ?? []
)
.WithAbpExposedHeaders()
.SetIsOriginAllowedToAllowWildcardSubdomains()

31
applications/KonSoft.AuthServer/Properties/launchSettings.json
View File

@ -1,12 +1,4 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "https://localhost:44322",
"sslPort": 44322
}
},
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
@ -18,10 +10,29 @@
"KonSoft.AuthServer": {
"commandName": "Project",
"launchBrowser": true,
"applicationUrl": "https://localhost:44322",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"applicationUrl": "https://localhost:44322"
},
"Container (Dockerfile)": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
"environmentVariables": {
"ASPNETCORE_HTTPS_PORTS": "8081",
"ASPNETCORE_HTTP_PORTS": "8080"
},
"publishAllPorts": true,
"useSSL": true
}
},
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "https://localhost:44322",
"sslPort": 44322
}
}
}

6
applications/KonSoft.BackgroundJobs/Controllers/WeatherForecastController.cs
View File

@ -6,10 +6,10 @@ namespace KonSoft.BackgroundJobs.Controllers
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
{
private static readonly string[] Summaries = new[]
{
private static readonly string[] Summaries =
[
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
};
];
private readonly ILogger<WeatherForecastController> _logger;

6
applications/KonSoft.BackgroundWorker/Controllers/WeatherForecastController.cs
View File

@ -6,10 +6,10 @@ namespace KonSoft.BackgroundWorker.Controllers
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
{
private static readonly string[] Summaries = new[]
{
private static readonly string[] Summaries =
[
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
};
];
private readonly ILogger<WeatherForecastController> _logger;

6
gateways/KonSoft.InternalGateway/Controllers/WeatherForecastController.cs
View File

@ -6,10 +6,10 @@ namespace KonSoft.InternalGateway.Controllers
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
{
private static readonly string[] Summaries = new[]
{
private static readonly string[] Summaries =
[
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
};
];
private readonly ILogger<WeatherForecastController> _logger;

6
gateways/KonSoft.PublicGateway/Controllers/WeatherForecastController.cs
View File

@ -6,10 +6,10 @@ namespace KonSoft.PublicGateway.Controllers
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
{
private static readonly string[] Summaries = new[]
{
private static readonly string[] Summaries =
[
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
};
];
private readonly ILogger<WeatherForecastController> _logger;

2
microservices/KonSoft.Admin.HttpApi.Host/AdminHttpApiHostModule.cs
View File

@ -166,7 +166,7 @@ public class AdminHttpApiHostModule : AbpModule
.WithOrigins(configuration["App:CorsOrigins"]?
.Split(",", StringSplitOptions.RemoveEmptyEntries)
.Select(o => o.RemovePostFix("/"))
.ToArray() ?? Array.Empty<string>())
.ToArray() ?? [])
.WithAbpExposedHeaders()
.SetIsOriginAllowedToAllowWildcardSubdomains()
.AllowAnyHeader()

30
microservices/KonSoft.Admin.HttpApi.Host/Dockerfile Normal file
View File

@ -0,0 +1,30 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
USER $APP_UID
WORKDIR /app
EXPOSE 8080
EXPOSE 8081
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["NuGet.Config", "."]
COPY ["microservices/KonSoft.Admin.HttpApi.Host/KonSoft.Admin.HttpApi.Host.csproj", "microservices/KonSoft.Admin.HttpApi.Host/"]
COPY ["modules/admin/src/KonSoft.Admin.Application/KonSoft.Admin.Application.csproj", "modules/admin/src/KonSoft.Admin.Application/"]
COPY ["modules/admin/src/KonSoft.Admin.Domain/KonSoft.Admin.Domain.csproj", "modules/admin/src/KonSoft.Admin.Domain/"]
COPY ["modules/admin/src/KonSoft.Admin.Domain.Shared/KonSoft.Admin.Domain.Shared.csproj", "modules/admin/src/KonSoft.Admin.Domain.Shared/"]
COPY ["modules/admin/src/KonSoft.Admin.Application.Contracts/KonSoft.Admin.Application.Contracts.csproj", "modules/admin/src/KonSoft.Admin.Application.Contracts/"]
COPY ["modules/admin/src/KonSoft.Admin.EntityFrameworkCore/KonSoft.Admin.EntityFrameworkCore.csproj", "modules/admin/src/KonSoft.Admin.EntityFrameworkCore/"]
COPY ["modules/admin/src/KonSoft.Admin.HttpApi/KonSoft.Admin.HttpApi.csproj", "modules/admin/src/KonSoft.Admin.HttpApi/"]
RUN dotnet restore "./microservices/KonSoft.Admin.HttpApi.Host/KonSoft.Admin.HttpApi.Host.csproj"
COPY . .
WORKDIR "/src/microservices/KonSoft.Admin.HttpApi.Host"
RUN dotnet build "./KonSoft.Admin.HttpApi.Host.csproj" -c $BUILD_CONFIGURATION -o /app/build
FROM build AS publish
ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "./KonSoft.Admin.HttpApi.Host.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "KonSoft.Admin.HttpApi.Host.dll"]

9
microservices/KonSoft.Admin.HttpApi.Host/KonSoft.Admin.HttpApi.Host.csproj
View File

@ -6,9 +6,12 @@
<RootNamespace>KonSoft.Admin</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>KonSoft.Admin-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..</DockerfileContext>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
@ -30,4 +33,10 @@
<None Remove="Logs\**" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.Application\KonSoft.Admin.Application.csproj" />
<ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.EntityFrameworkCore\KonSoft.Admin.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.HttpApi\KonSoft.Admin.HttpApi.csproj" />
</ItemGroup>
</Project>

31
microservices/KonSoft.Admin.HttpApi.Host/Properties/launchSettings.json
View File

@ -1,12 +1,4 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "https://localhost:44354",
"sslPort": 44354
}
},
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
@ -18,10 +10,29 @@
"KonSoft.Admin.HttpApi.Host": {
"commandName": "Project",
"launchBrowser": true,
"applicationUrl": "https://localhost:44354",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"applicationUrl": "https://localhost:44354"
},
"Container (Dockerfile)": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
"environmentVariables": {
"ASPNETCORE_HTTPS_PORTS": "8081",
"ASPNETCORE_HTTP_PORTS": "8080"
},
"publishAllPorts": true,
"useSSL": true
}
},
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "https://localhost:44354",
"sslPort": 44354
}
}
}

2
microservices/KonSoft.Dispatch.HttpApi.Host/DispatchHttpApiHostModule.cs
View File

@ -166,7 +166,7 @@ public class DispatchHttpApiHostModule : AbpModule
.WithOrigins(configuration["App:CorsOrigins"]?
.Split(",", StringSplitOptions.RemoveEmptyEntries)
.Select(o => o.RemovePostFix("/"))
.ToArray() ?? Array.Empty<string>())
.ToArray() ?? [])
.WithAbpExposedHeaders()
.SetIsOriginAllowedToAllowWildcardSubdomains()
.AllowAnyHeader()

6
microservices/KonSoft.Dispatch.HttpApi.Host/KonSoft.Dispatch.HttpApi.Host.csproj
View File

@ -30,4 +30,10 @@
<None Remove="Logs\**" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\modules\dispatch\src\KonSoft.Dispatch.Application\KonSoft.Dispatch.Application.csproj" />
<ProjectReference Include="..\..\modules\dispatch\src\KonSoft.Dispatch.EntityFrameworkCore\KonSoft.Dispatch.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\modules\dispatch\src\KonSoft.Dispatch.HttpApi\KonSoft.Dispatch.HttpApi.csproj" />
</ItemGroup>
</Project>

6
microservices/KonSoft.Payment.HttpApi.Host/KonSoft.Payment.HttpApi.Host.csproj
View File

@ -30,4 +30,10 @@
<None Remove="Logs\**" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\modules\payment\src\KonSoft.Payment.Application\KonSoft.Payment.Application.csproj" />
<ProjectReference Include="..\..\modules\payment\src\KonSoft.Payment.EntityFrameworkCore\KonSoft.Payment.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\modules\payment\src\KonSoft.Payment.HttpApi\KonSoft.Payment.HttpApi.csproj" />
</ItemGroup>
</Project>

2
microservices/KonSoft.Payment.HttpApi.Host/PaymentHttpApiHostModule.cs
View File

@ -166,7 +166,7 @@ public class PaymentHttpApiHostModule : AbpModule
.WithOrigins(configuration["App:CorsOrigins"]?
.Split(",", StringSplitOptions.RemoveEmptyEntries)
.Select(o => o.RemovePostFix("/"))
.ToArray() ?? Array.Empty<string>())
.ToArray() ?? [])
.WithAbpExposedHeaders()
.SetIsOriginAllowedToAllowWildcardSubdomains()
.AllowAnyHeader()

6
microservices/KonSoft.Report.HttpApi.Host/KonSoft.Report.HttpApi.Host.csproj
View File

@ -30,4 +30,10 @@
<None Remove="Logs\**" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\modules\report\src\KonSoft.Report.Application\KonSoft.Report.Application.csproj" />
<ProjectReference Include="..\..\modules\report\src\KonSoft.Report.EntityFrameworkCore\KonSoft.Report.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\modules\report\src\KonSoft.Report.HttpApi\KonSoft.Report.HttpApi.csproj" />
</ItemGroup>
</Project>

2
microservices/KonSoft.Report.HttpApi.Host/ReportHttpApiHostModule.cs
View File

@ -166,7 +166,7 @@ public class ReportHttpApiHostModule : AbpModule
.WithOrigins(configuration["App:CorsOrigins"]?
.Split(",", StringSplitOptions.RemoveEmptyEntries)
.Select(o => o.RemovePostFix("/"))
.ToArray() ?? Array.Empty<string>())
.ToArray() ?? [])
.WithAbpExposedHeaders()
.SetIsOriginAllowedToAllowWildcardSubdomains()
.AllowAnyHeader()

6
microservices/KonSoft.TenantManagement.HttpApi.Host/KonSoft.TenantManagement.HttpApi.Host.csproj
View File

@ -30,4 +30,10 @@
<None Remove="Logs\**" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\modules\tenant-management\src\KonSoft.TenantManagement.Application\KonSoft.TenantManagement.Application.csproj" />
<ProjectReference Include="..\..\modules\tenant-management\src\KonSoft.TenantManagement.EntityFrameworkCore\KonSoft.TenantManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\modules\tenant-management\src\KonSoft.TenantManagement.HttpApi\KonSoft.TenantManagement.HttpApi.csproj" />
</ItemGroup>
</Project>

2
microservices/KonSoft.TenantManagement.HttpApi.Host/TenantManagementHttpApiHostModule.cs
View File

@ -166,7 +166,7 @@ public class TenantManagementHttpApiHostModule : AbpModule
.WithOrigins(configuration["App:CorsOrigins"]?
.Split(",", StringSplitOptions.RemoveEmptyEntries)
.Select(o => o.RemovePostFix("/"))
.ToArray() ?? Array.Empty<string>())
.ToArray() ?? [])
.WithAbpExposedHeaders()
.SetIsOriginAllowedToAllowWildcardSubdomains()
.AllowAnyHeader()

2
modules/admin/src/KonSoft.Admin.Domain/OpenIddict/OpenIddictDataSeedContributor.cs
View File

@ -96,7 +96,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
consentType: OpenIddictConstants.ConsentTypes.Implicit,
displayName: "Swagger Application",
secret: null,
grantTypes: new List<string> { OpenIddictConstants.GrantTypes.AuthorizationCode, },
grantTypes: [OpenIddictConstants.GrantTypes.AuthorizationCode],
scopes: commonScopes,
redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html",
clientUri: swaggerRootUrl

5
modules/admin/test/KonSoft.Admin.Application.Tests/KonSoft.Admin.Application.Tests.csproj
View File

@ -10,4 +10,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Admin.Application\KonSoft.Admin.Application.csproj" />
<ProjectReference Include="..\KonSoft.Admin.Domain.Tests\KonSoft.Admin.Domain.Tests.csproj" />
</ItemGroup>
</Project>

5
modules/admin/test/KonSoft.Admin.Domain.Tests/KonSoft.Admin.Domain.Tests.csproj
View File

@ -10,4 +10,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Admin.Domain\KonSoft.Admin.Domain.csproj" />
<ProjectReference Include="..\KonSoft.Admin.TestBase\KonSoft.Admin.TestBase.csproj" />
</ItemGroup>
</Project>

5
modules/admin/test/KonSoft.Admin.EntityFrameworkCore.Tests/KonSoft.Admin.EntityFrameworkCore.Tests.csproj
View File

@ -14,4 +14,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Admin.EntityFrameworkCore\KonSoft.Admin.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\KonSoft.Admin.Application.Tests\KonSoft.Admin.Application.Tests.csproj" />
</ItemGroup>
</Project>

4
modules/admin/test/KonSoft.Admin.HttpApi.Client.ConsoleTestApp/KonSoft.Admin.HttpApi.Client.ConsoleTestApp.csproj
View File

@ -29,4 +29,8 @@
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Admin.HttpApi.Client\KonSoft.Admin.HttpApi.Client.csproj" />
</ItemGroup>
</Project>

2
modules/dispatch/src/KonSoft.Dispatch.Domain/OpenIddict/OpenIddictDataSeedContributor.cs
View File

@ -96,7 +96,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
consentType: OpenIddictConstants.ConsentTypes.Implicit,
displayName: "Swagger Application",
secret: null,
grantTypes: new List<string> { OpenIddictConstants.GrantTypes.AuthorizationCode, },
grantTypes: [OpenIddictConstants.GrantTypes.AuthorizationCode],
scopes: commonScopes,
redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html",
clientUri: swaggerRootUrl

7
modules/dispatch/test/KonSoft.Dispatch.Application.Tests/KonSoft.Dispatch.Application.Tests.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
@ -10,4 +10,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Dispatch.Application\KonSoft.Dispatch.Application.csproj" />
<ProjectReference Include="..\KonSoft.Dispatch.Domain.Tests\KonSoft.Dispatch.Domain.Tests.csproj" />
</ItemGroup>
</Project>

5
modules/dispatch/test/KonSoft.Dispatch.Domain.Tests/KonSoft.Dispatch.Domain.Tests.csproj
View File

@ -10,4 +10,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Dispatch.Domain\KonSoft.Dispatch.Domain.csproj" />
<ProjectReference Include="..\KonSoft.Dispatch.TestBase\KonSoft.Dispatch.TestBase.csproj" />
</ItemGroup>
</Project>

5
modules/dispatch/test/KonSoft.Dispatch.EntityFrameworkCore.Tests/KonSoft.Dispatch.EntityFrameworkCore.Tests.csproj
View File

@ -14,4 +14,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Dispatch.EntityFrameworkCore\KonSoft.Dispatch.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\KonSoft.Dispatch.Application.Tests\KonSoft.Dispatch.Application.Tests.csproj" />
</ItemGroup>
</Project>

4
modules/dispatch/test/KonSoft.Dispatch.HttpApi.Client.ConsoleTestApp/KonSoft.Dispatch.HttpApi.Client.ConsoleTestApp.csproj
View File

@ -29,4 +29,8 @@
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Dispatch.HttpApi.Client\KonSoft.Dispatch.HttpApi.Client.csproj" />
</ItemGroup>
</Project>

2
modules/payment/src/KonSoft.Payment.Domain/OpenIddict/OpenIddictDataSeedContributor.cs
View File

@ -96,7 +96,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
consentType: OpenIddictConstants.ConsentTypes.Implicit,
displayName: "Swagger Application",
secret: null,
grantTypes: new List<string> { OpenIddictConstants.GrantTypes.AuthorizationCode, },
grantTypes: [OpenIddictConstants.GrantTypes.AuthorizationCode],
scopes: commonScopes,
redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html",
clientUri: swaggerRootUrl

5
modules/payment/test/KonSoft.Payment.Application.Tests/KonSoft.Payment.Application.Tests.csproj
View File

@ -10,4 +10,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Payment.Application\KonSoft.Payment.Application.csproj" />
<ProjectReference Include="..\KonSoft.Payment.Domain.Tests\KonSoft.Payment.Domain.Tests.csproj" />
</ItemGroup>
</Project>

7
modules/payment/test/KonSoft.Payment.Domain.Tests/KonSoft.Payment.Domain.Tests.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
@ -10,4 +10,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Payment.Domain\KonSoft.Payment.Domain.csproj" />
<ProjectReference Include="..\KonSoft.Payment.TestBase\KonSoft.Payment.TestBase.csproj" />
</ItemGroup>
</Project>

5
modules/payment/test/KonSoft.Payment.EntityFrameworkCore.Tests/KonSoft.Payment.EntityFrameworkCore.Tests.csproj
View File

@ -14,4 +14,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Payment.EntityFrameworkCore\KonSoft.Payment.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\KonSoft.Payment.Application.Tests\KonSoft.Payment.Application.Tests.csproj" />
</ItemGroup>
</Project>

4
modules/payment/test/KonSoft.Payment.HttpApi.Client.ConsoleTestApp/KonSoft.Payment.HttpApi.Client.ConsoleTestApp.csproj
View File

@ -29,4 +29,8 @@
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Payment.HttpApi.Client\KonSoft.Payment.HttpApi.Client.csproj" />
</ItemGroup>
</Project>

4
modules/report/src/KonSoft.Report.Application.Contracts/KonSoft.Report.Application.Contracts.csproj
View File

@ -16,4 +16,8 @@
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="8.3.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.Report.Domain.Shared\KonSoft.Report.Domain.Shared.csproj" />
</ItemGroup>
</Project>

5
modules/report/src/KonSoft.Report.Application/KonSoft.Report.Application.csproj
View File

@ -15,4 +15,9 @@
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="8.3.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.Report.Application.Contracts\KonSoft.Report.Application.Contracts.csproj" />
<ProjectReference Include="..\KonSoft.Report.Domain\KonSoft.Report.Domain.csproj" />
</ItemGroup>
</Project>

4
modules/report/src/KonSoft.Report.Domain/KonSoft.Report.Domain.csproj
View File

@ -19,4 +19,8 @@
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="8.3.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.Report.Domain.Shared\KonSoft.Report.Domain.Shared.csproj" />
</ItemGroup>
</Project>

2
modules/report/src/KonSoft.Report.Domain/OpenIddict/OpenIddictDataSeedContributor.cs
View File

@ -96,7 +96,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
consentType: OpenIddictConstants.ConsentTypes.Implicit,
displayName: "Swagger Application",
secret: null,
grantTypes: new List<string> { OpenIddictConstants.GrantTypes.AuthorizationCode, },
grantTypes: [OpenIddictConstants.GrantTypes.AuthorizationCode],
scopes: commonScopes,
redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html",
clientUri: swaggerRootUrl

4
modules/report/src/KonSoft.Report.EntityFrameworkCore/KonSoft.Report.EntityFrameworkCore.csproj
View File

@ -25,4 +25,8 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.Report.Domain\KonSoft.Report.Domain.csproj" />
</ItemGroup>
</Project>

4
modules/report/src/KonSoft.Report.HttpApi.Client/KonSoft.Report.HttpApi.Client.csproj
View File

@ -20,4 +20,8 @@
<Content Remove="**\*generate-proxy.json" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.Report.Application.Contracts\KonSoft.Report.Application.Contracts.csproj" />
</ItemGroup>
</Project>

4
modules/report/src/KonSoft.Report.HttpApi/KonSoft.Report.HttpApi.csproj
View File

@ -15,4 +15,8 @@
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="8.3.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.Report.Application.Contracts\KonSoft.Report.Application.Contracts.csproj" />
</ItemGroup>
</Project>

5
modules/report/test/KonSoft.Report.Application.Tests/KonSoft.Report.Application.Tests.csproj
View File

@ -10,4 +10,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Report.Application\KonSoft.Report.Application.csproj" />
<ProjectReference Include="..\KonSoft.Report.Domain.Tests\KonSoft.Report.Domain.Tests.csproj" />
</ItemGroup>
</Project>

7
modules/report/test/KonSoft.Report.Domain.Tests/KonSoft.Report.Domain.Tests.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
@ -10,4 +10,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Report.Domain\KonSoft.Report.Domain.csproj" />
<ProjectReference Include="..\KonSoft.Report.TestBase\KonSoft.Report.TestBase.csproj" />
</ItemGroup>
</Project>

5
modules/report/test/KonSoft.Report.EntityFrameworkCore.Tests/KonSoft.Report.EntityFrameworkCore.Tests.csproj
View File

@ -14,4 +14,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Report.EntityFrameworkCore\KonSoft.Report.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\KonSoft.Report.Application.Tests\KonSoft.Report.Application.Tests.csproj" />
</ItemGroup>
</Project>

4
modules/report/test/KonSoft.Report.HttpApi.Client.ConsoleTestApp/KonSoft.Report.HttpApi.Client.ConsoleTestApp.csproj
View File

@ -29,4 +29,8 @@
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.Report.HttpApi.Client\KonSoft.Report.HttpApi.Client.csproj" />
</ItemGroup>
</Project>

4
modules/tenant-management/src/KonSoft.TenantManagement.Application.Contracts/KonSoft.TenantManagement.Application.Contracts.csproj
View File

@ -16,4 +16,8 @@
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="8.3.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.TenantManagement.Domain.Shared\KonSoft.TenantManagement.Domain.Shared.csproj" />
</ItemGroup>
</Project>

5
modules/tenant-management/src/KonSoft.TenantManagement.Application/KonSoft.TenantManagement.Application.csproj
View File

@ -15,4 +15,9 @@
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="8.3.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.TenantManagement.Application.Contracts\KonSoft.TenantManagement.Application.Contracts.csproj" />
<ProjectReference Include="..\KonSoft.TenantManagement.Domain\KonSoft.TenantManagement.Domain.csproj" />
</ItemGroup>
</Project>

4
modules/tenant-management/src/KonSoft.TenantManagement.Domain/KonSoft.TenantManagement.Domain.csproj
View File

@ -19,4 +19,8 @@
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="8.3.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.TenantManagement.Domain.Shared\KonSoft.TenantManagement.Domain.Shared.csproj" />
</ItemGroup>
</Project>

2
modules/tenant-management/src/KonSoft.TenantManagement.Domain/OpenIddict/OpenIddictDataSeedContributor.cs
View File

@ -96,7 +96,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
consentType: OpenIddictConstants.ConsentTypes.Implicit,
displayName: "Swagger Application",
secret: null,
grantTypes: new List<string> { OpenIddictConstants.GrantTypes.AuthorizationCode, },
grantTypes: [OpenIddictConstants.GrantTypes.AuthorizationCode],
scopes: commonScopes,
redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html",
clientUri: swaggerRootUrl

4
modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/KonSoft.TenantManagement.EntityFrameworkCore.csproj
View File

@ -25,4 +25,8 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.TenantManagement.Domain\KonSoft.TenantManagement.Domain.csproj" />
</ItemGroup>
</Project>

4
modules/tenant-management/src/KonSoft.TenantManagement.HttpApi.Client/KonSoft.TenantManagement.HttpApi.Client.csproj
View File

@ -20,4 +20,8 @@
<Content Remove="**\*generate-proxy.json" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.TenantManagement.Application.Contracts\KonSoft.TenantManagement.Application.Contracts.csproj" />
</ItemGroup>
</Project>

4
modules/tenant-management/src/KonSoft.TenantManagement.HttpApi/KonSoft.TenantManagement.HttpApi.csproj
View File

@ -15,4 +15,8 @@
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="8.3.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KonSoft.TenantManagement.Application.Contracts\KonSoft.TenantManagement.Application.Contracts.csproj" />
</ItemGroup>
</Project>

5
modules/tenant-management/test/KonSoft.TenantManagement.Application.Tests/KonSoft.TenantManagement.Application.Tests.csproj
View File

@ -10,4 +10,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.TenantManagement.Application\KonSoft.TenantManagement.Application.csproj" />
<ProjectReference Include="..\KonSoft.TenantManagement.Domain.Tests\KonSoft.TenantManagement.Domain.Tests.csproj" />
</ItemGroup>
</Project>

5
modules/tenant-management/test/KonSoft.TenantManagement.Domain.Tests/KonSoft.TenantManagement.Domain.Tests.csproj
View File

@ -10,4 +10,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.TenantManagement.Domain\KonSoft.TenantManagement.Domain.csproj" />
<ProjectReference Include="..\KonSoft.TenantManagement.TestBase\KonSoft.TenantManagement.TestBase.csproj" />
</ItemGroup>
</Project>

5
modules/tenant-management/test/KonSoft.TenantManagement.EntityFrameworkCore.Tests/KonSoft.TenantManagement.EntityFrameworkCore.Tests.csproj
View File

@ -14,4 +14,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.TenantManagement.EntityFrameworkCore\KonSoft.TenantManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\KonSoft.TenantManagement.Application.Tests\KonSoft.TenantManagement.Application.Tests.csproj" />
</ItemGroup>
</Project>

4
modules/tenant-management/test/KonSoft.TenantManagement.HttpApi.Client.ConsoleTestApp/KonSoft.TenantManagement.HttpApi.Client.ConsoleTestApp.csproj
View File

@ -29,4 +29,8 @@
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\KonSoft.TenantManagement.HttpApi.Client\KonSoft.TenantManagement.HttpApi.Client.csproj" />
</ItemGroup>
</Project>