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

chore 优化代码

Browse Source
This commit is contained in:
kon1z
2025-10-16 10:30:51 +08:00
parent f1c609b4be
commit 1f5bc3e971
367 changed files with 2705 additions and 3083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ namespace KonSoft;
typeof(AbpAccountApplicationModule), typeof(AbpAccountApplicationModule),
typeof(AbpAccountHttpApiModule), typeof(AbpAccountHttpApiModule),
typeof(KonSoftSharedHostingMicroservicesModule) typeof(KonSoftSharedHostingMicroservicesModule)
)] )]
public class KonSoftAuthServerModule : AbpModule public class KonSoftAuthServerModule : AbpModule
{ {
public override void PreConfigureServices(ServiceConfigurationContext context) public override void PreConfigureServices(ServiceConfigurationContext context)
@ -53,7 +53,8 @@ public class KonSoftAuthServerModule : AbpModule
PreConfigure<OpenIddictServerBuilder>(serverBuilder => PreConfigure<OpenIddictServerBuilder>(serverBuilder =>
{ {
serverBuilder.AddProductionEncryptionAndSigningCertificate("openiddict.pfx", "59464dba-b66e-48cd-8b81-2e4a9c08c977"); serverBuilder.AddProductionEncryptionAndSigningCertificate("openiddict.pfx",
"59464dba-b66e-48cd-8b81-2e4a9c08c977");
}); });
} }
} }
@ -77,23 +78,17 @@ public class KonSoftAuthServerModule : AbpModule
{ {
options.StyleBundles.Configure( options.StyleBundles.Configure(
BasicThemeBundles.Styles.Global, BasicThemeBundles.Styles.Global,
bundle => bundle => { bundle.AddFiles("/global-styles.css"); }
{
bundle.AddFiles("/global-styles.css");
}
); );
}); });
Configure<AbpAuditingOptions>(options => Configure<AbpAuditingOptions>(options =>
{ {
options.IsEnabledForGetRequests = true; options.IsEnabledForGetRequests = true;
options.ApplicationName = "AuthServer"; options.ApplicationName = "AuthServer";
}); });
Configure<AbpBackgroundJobOptions>(options => Configure<AbpBackgroundJobOptions>(options => { options.IsJobExecutionEnabled = false; });
{
options.IsJobExecutionEnabled = false;
});
context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options => context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options =>
{ {
@ -138,4 +133,4 @@ public class KonSoftAuthServerModule : AbpModule
app.UseAbpSerilogEnrichers(); app.UseAbpSerilogEnrichers();
app.UseConfiguredEndpoints(); app.UseConfiguredEndpoints();
} }
} }

4
applications/KonSoft.AuthServer/KonSoftBrandingProvider.cs
View File

@ -8,7 +8,7 @@ namespace KonSoft;
[Dependency(ReplaceServices = true)] [Dependency(ReplaceServices = true)]
public class KonSoftBrandingProvider : DefaultBrandingProvider public class KonSoftBrandingProvider : DefaultBrandingProvider
{ {
private IStringLocalizer<KonSoftResource> _localizer; private readonly IStringLocalizer<KonSoftResource> _localizer;
public KonSoftBrandingProvider(IStringLocalizer<KonSoftResource> localizer) public KonSoftBrandingProvider(IStringLocalizer<KonSoftResource> localizer)
{ {
@ -16,4 +16,4 @@ public class KonSoftBrandingProvider : DefaultBrandingProvider
} }
public override string AppName => _localizer["AppName"]; public override string AppName => _localizer["AppName"];
} }

53
applications/KonSoft.AuthServer/Pages/Index.cshtml
View File

@ -1,12 +1,13 @@
@page @page
@using System.Net
@using KonSoft.Shared.Localization.Localization
@using Microsoft.AspNetCore.Http.Extensions @using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.AspNetCore.Mvc.Localization
@using KonSoft.Pages @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid
@using KonSoft.Shared.Localization.Localization
@using Volo.Abp.Users
@using Volo.Abp.AspNetCore.Mvc.UI.Theming @using Volo.Abp.AspNetCore.Mvc.UI.Theming
@using Volo.Abp.Ui.Branding @using Volo.Abp.Ui.Branding
@model IndexModel @using Volo.Abp.Users
@model KonSoft.Pages.IndexModel
@inject IHtmlLocalizer<KonSoftResource> L @inject IHtmlLocalizer<KonSoftResource> L
@inject ICurrentUser CurrentUser @inject ICurrentUser CurrentUser
@inject IBrandingProvider BrandingProvider @inject IBrandingProvider BrandingProvider
@ -45,32 +46,32 @@
<abp-row> <abp-row>
<abp-column size="_6"> <abp-column size="_6">
<div class="mr-auto p-2 float-start"> <div class="mr-auto p-2 float-start">
<div class=""> <div class="">
@if (CurrentUser.IsAuthenticated) @if (CurrentUser.IsAuthenticated)
{ {
<div class=""> <div class="">
<a abp-button="Outline_Primary" asp-controller="Manage" asp-action="Index" asp-area="Account" class="me-2">@L["MyAccount"]</a> <a abp-button="Outline_Primary" asp-controller="Manage" asp-action="Index" asp-area="Account" class="me-2">@L["MyAccount"]</a>
<a abp-button="Primary" asp-controller="Logout" asp-action="Index" asp-area="Account" asp-route-returnUrl="/" >@L["Logout"]</a> <a abp-button="Primary" asp-controller="Logout" asp-action="Index" asp-area="Account" asp-route-returnUrl="/">@L["Logout"]</a>
</div> </div>
} }
else else
{ {
<a abp-button="Primary" asp-controller="Login" asp-action="Index" asp-area="Account">@L["Login"]</a> <a abp-button="Primary" asp-controller="Login" asp-action="Index" asp-area="Account">@L["Login"]</a>
} }
</div> </div>
</div> </div>
</abp-column> </abp-column>
<abp-column size="_6"> <abp-column size="_6">
<div class="ml-auto p-2 float-end"> <div class="ml-auto p-2 float-end">
<abp-dropdown> <abp-dropdown>
<abp-dropdown-button text="@Model.CurrentLanguage" /> <abp-dropdown-button text="@Model.CurrentLanguage"/>
@if (@Model.Languages != null) @if (Model.Languages != null)
{ {
<abp-dropdown-menu> <abp-dropdown-menu>
@foreach (var language in Model.Languages) @foreach (var language in Model.Languages)
{ {
var languageUrl = Url.Content($"~/Abp/Languages/Switch?culture={language.CultureName}&uiCulture={language.UiCultureName}&returnUrl={System.Net.WebUtility.UrlEncode(Request.GetEncodedPathAndQuery())}"); var languageUrl = Url.Content($"~/Abp/Languages/Switch?culture={language.CultureName}&uiCulture={language.UiCultureName}&returnUrl={WebUtility.UrlEncode(Request.GetEncodedPathAndQuery())}");
<abp-dropdown-item href="@languageUrl">@language.DisplayName</abp-dropdown-item> <abp-dropdown-item href="@languageUrl">@language.DisplayName</abp-dropdown-item>
} }
</abp-dropdown-menu> </abp-dropdown-menu>
@ -82,18 +83,18 @@
@if (Model.Applications != null) @if (Model.Applications != null)
{ {
<hr class="m-2" /> <hr class="m-2"/>
<abp-row class="mt-3"> <abp-row class="mt-3">
@foreach (var application in Model.Applications) @foreach (var application in Model.Applications)
{ {
<abp-column size-md="@Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid.ColumnSize._4" class="mb-2"> <abp-column size-md="@ColumnSize._4" class="mb-2">
<abp-card> <abp-card>
<abp-card-body> <abp-card-body>
@{ @{
var clientUri = application.ClientUri.Contains("Swagger") ? application.ClientUri.EnsureEndsWith('/') + "swagger/index.html" : application.ClientUri; var clientUri = application.ClientUri.Contains("Swagger") ? application.ClientUri.EnsureEndsWith('/') + "swagger/index.html" : application.ClientUri;
} }
@if (!application.LogoUri.IsNullOrEmpty()) @if (!application.LogoUri.IsNullOrEmpty())
{ {
<div class="mx-auto"> <div class="mx-auto">
@ -115,4 +116,4 @@
</div> </div>
</abp-row> </abp-row>
</div> </div>
</div> </div>

14
applications/KonSoft.AuthServer/Pages/Index.cshtml.cs
View File

@ -9,6 +9,12 @@ namespace KonSoft.Pages;
public class IndexModel : AbpPageModel public class IndexModel : AbpPageModel
{ {
public IndexModel(IOpenIddictApplicationRepository openIdApplicationRepository, ILanguageProvider languageProvider)
{
OpenIdApplicationRepository = openIdApplicationRepository;
LanguageProvider = languageProvider;
}
public List<OpenIddictApplication>? Applications { get; protected set; } public List<OpenIddictApplication>? Applications { get; protected set; }
public IReadOnlyList<LanguageInfo>? Languages { get; protected set; } public IReadOnlyList<LanguageInfo>? Languages { get; protected set; }
@ -19,12 +25,6 @@ public class IndexModel : AbpPageModel
protected ILanguageProvider LanguageProvider { get; } protected ILanguageProvider LanguageProvider { get; }
public IndexModel(IOpenIddictApplicationRepository openIdApplicationRepository, ILanguageProvider languageProvider)
{
OpenIdApplicationRepository = openIdApplicationRepository;
LanguageProvider = languageProvider;
}
public async Task OnGetAsync() public async Task OnGetAsync()
{ {
Applications = await OpenIdApplicationRepository.GetListAsync(); Applications = await OpenIdApplicationRepository.GetListAsync();
@ -32,4 +32,4 @@ public class IndexModel : AbpPageModel
Languages = await LanguageProvider.GetLanguagesAsync(); Languages = await LanguageProvider.GetLanguagesAsync();
CurrentLanguage = CultureInfo.CurrentCulture.DisplayName; CurrentLanguage = CultureInfo.CurrentCulture.DisplayName;
} }
} }

4
applications/KonSoft.AuthServer/Program.cs
View File

@ -10,7 +10,7 @@ namespace KonSoft;
public class Program public class Program
{ {
public async static Task<int> Main(string[] args) public static async Task<int> Main(string[] args)
{ {
Log.Logger = new LoggerConfiguration() Log.Logger = new LoggerConfiguration()
#if DEBUG #if DEBUG
@ -53,4 +53,4 @@ public class Program
Log.CloseAndFlush(); Log.CloseAndFlush();
} }
} }
} }

34
applications/KonSoft.AuthServer/web.config
View File

@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<location path="." inheritInChildApplications="false"> <location path="." inheritInChildApplications="false">
<system.webServer> <system.webServer>
<handlers> <handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" /> <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers> </handlers>
<aspNetCore processPath="dotnet" arguments=".\KonSoft.AuthServer.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" /> <aspNetCore processPath="dotnet" arguments=".\KonSoft.AuthServer.dll" stdoutLogEnabled="false"
</system.webServer> stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</location> </system.webServer>
<system.webServer> </location>
<httpProtocol> <system.webServer>
<customHeaders> <httpProtocol>
<remove name="x-powered-by" /> <customHeaders>
</customHeaders> <remove name="x-powered-by" />
</httpProtocol> </customHeaders>
</system.webServer> </httpProtocol>
</configuration> </system.webServer>
</configuration>

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

@ -1,33 +1,32 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace KonSoft.BackgroundJobs.Controllers namespace KonSoft.BackgroundJobs.Controllers;
[ApiController]
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
{ {
[ApiController] private static readonly string[] Summaries =
[Route("[controller]")] [
public class WeatherForecastController : ControllerBase "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
];
private readonly ILogger<WeatherForecastController> _logger;
public WeatherForecastController(ILogger<WeatherForecastController> logger)
{ {
private static readonly string[] Summaries = _logger = logger;
[ }
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
];
private readonly ILogger<WeatherForecastController> _logger; [HttpGet(Name = "GetWeatherForecast")]
public IEnumerable<WeatherForecast> Get()
public WeatherForecastController(ILogger<WeatherForecastController> logger) {
{ return Enumerable.Range(1, 5).Select(index => new WeatherForecast
_logger = logger;
}
[HttpGet(Name = "GetWeatherForecast")]
public IEnumerable<WeatherForecast> Get()
{
return Enumerable.Range(1, 5).Select(index => new WeatherForecast
{ {
Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)), Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
TemperatureC = Random.Shared.Next(-20, 55), TemperatureC = Random.Shared.Next(-20, 55),
Summary = Summaries[Random.Shared.Next(Summaries.Length)] Summary = Summaries[Random.Shared.Next(Summaries.Length)]
}) })
.ToArray(); .ToArray();
}
} }
} }

2
applications/KonSoft.BackgroundJobs/Program.cs
View File

@ -22,4 +22,4 @@ app.UseAuthorization();
app.MapControllers(); app.MapControllers();
app.Run(); app.Run();

17
applications/KonSoft.BackgroundJobs/WeatherForecast.cs
View File

@ -1,13 +1,12 @@
namespace KonSoft.BackgroundJobs namespace KonSoft.BackgroundJobs;
public class WeatherForecast
{ {
public class WeatherForecast public DateOnly Date { get; set; }
{
public DateOnly Date { get; set; }
public int TemperatureC { get; set; } public int TemperatureC { get; set; }
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
public string? Summary { get; set; } public string? Summary { get; set; }
} }
}

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

@ -1,33 +1,32 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace KonSoft.BackgroundWorker.Controllers namespace KonSoft.BackgroundWorker.Controllers;
[ApiController]
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
{ {
[ApiController] private static readonly string[] Summaries =
[Route("[controller]")] [
public class WeatherForecastController : ControllerBase "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
];
private readonly ILogger<WeatherForecastController> _logger;
public WeatherForecastController(ILogger<WeatherForecastController> logger)
{ {
private static readonly string[] Summaries = _logger = logger;
[ }
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
];
private readonly ILogger<WeatherForecastController> _logger; [HttpGet(Name = "GetWeatherForecast")]
public IEnumerable<WeatherForecast> Get()
public WeatherForecastController(ILogger<WeatherForecastController> logger) {
{ return Enumerable.Range(1, 5).Select(index => new WeatherForecast
_logger = logger;
}
[HttpGet(Name = "GetWeatherForecast")]
public IEnumerable<WeatherForecast> Get()
{
return Enumerable.Range(1, 5).Select(index => new WeatherForecast
{ {
Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)), Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
TemperatureC = Random.Shared.Next(-20, 55), TemperatureC = Random.Shared.Next(-20, 55),
Summary = Summaries[Random.Shared.Next(Summaries.Length)] Summary = Summaries[Random.Shared.Next(Summaries.Length)]
}) })
.ToArray(); .ToArray();
}
} }
} }

2
applications/KonSoft.BackgroundWorker/Program.cs
View File

@ -22,4 +22,4 @@ app.UseAuthorization();
app.MapControllers(); app.MapControllers();
app.Run(); app.Run();

17
applications/KonSoft.BackgroundWorker/WeatherForecast.cs
View File

@ -1,13 +1,12 @@
namespace KonSoft.BackgroundWorker namespace KonSoft.BackgroundWorker;
public class WeatherForecast
{ {
public class WeatherForecast public DateOnly Date { get; set; }
{
public DateOnly Date { get; set; }
public int TemperatureC { get; set; } public int TemperatureC { get; set; }
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
public string? Summary { get; set; } public string? Summary { get; set; }
} }
}

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

@ -1,33 +1,32 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace KonSoft.InternalGateway.Controllers namespace KonSoft.InternalGateway.Controllers;
[ApiController]
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
{ {
[ApiController] private static readonly string[] Summaries =
[Route("[controller]")] [
public class WeatherForecastController : ControllerBase "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
];
private readonly ILogger<WeatherForecastController> _logger;
public WeatherForecastController(ILogger<WeatherForecastController> logger)
{ {
private static readonly string[] Summaries = _logger = logger;
[ }
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
];
private readonly ILogger<WeatherForecastController> _logger; [HttpGet(Name = "GetWeatherForecast")]
public IEnumerable<WeatherForecast> Get()
public WeatherForecastController(ILogger<WeatherForecastController> logger) {
{ return Enumerable.Range(1, 5).Select(index => new WeatherForecast
_logger = logger;
}
[HttpGet(Name = "GetWeatherForecast")]
public IEnumerable<WeatherForecast> Get()
{
return Enumerable.Range(1, 5).Select(index => new WeatherForecast
{ {
Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)), Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
TemperatureC = Random.Shared.Next(-20, 55), TemperatureC = Random.Shared.Next(-20, 55),
Summary = Summaries[Random.Shared.Next(Summaries.Length)] Summary = Summaries[Random.Shared.Next(Summaries.Length)]
}) })
.ToArray(); .ToArray();
}
} }
} }

2
gateways/KonSoft.InternalGateway/Program.cs
View File

@ -22,4 +22,4 @@ app.UseAuthorization();
app.MapControllers(); app.MapControllers();
app.Run(); app.Run();

17
gateways/KonSoft.InternalGateway/WeatherForecast.cs
View File

@ -1,13 +1,12 @@
namespace KonSoft.InternalGateway namespace KonSoft.InternalGateway;
public class WeatherForecast
{ {
public class WeatherForecast public DateOnly Date { get; set; }
{
public DateOnly Date { get; set; }
public int TemperatureC { get; set; } public int TemperatureC { get; set; }
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
public string? Summary { get; set; } public string? Summary { get; set; }
} }
}

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

@ -1,33 +1,32 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace KonSoft.PublicGateway.Controllers namespace KonSoft.PublicGateway.Controllers;
[ApiController]
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
{ {
[ApiController] private static readonly string[] Summaries =
[Route("[controller]")] [
public class WeatherForecastController : ControllerBase "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
];
private readonly ILogger<WeatherForecastController> _logger;
public WeatherForecastController(ILogger<WeatherForecastController> logger)
{ {
private static readonly string[] Summaries = _logger = logger;
[ }
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
];
private readonly ILogger<WeatherForecastController> _logger; [HttpGet(Name = "GetWeatherForecast")]
public IEnumerable<WeatherForecast> Get()
public WeatherForecastController(ILogger<WeatherForecastController> logger) {
{ return Enumerable.Range(1, 5).Select(index => new WeatherForecast
_logger = logger;
}
[HttpGet(Name = "GetWeatherForecast")]
public IEnumerable<WeatherForecast> Get()
{
return Enumerable.Range(1, 5).Select(index => new WeatherForecast
{ {
Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)), Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
TemperatureC = Random.Shared.Next(-20, 55), TemperatureC = Random.Shared.Next(-20, 55),
Summary = Summaries[Random.Shared.Next(Summaries.Length)] Summary = Summaries[Random.Shared.Next(Summaries.Length)]
}) })
.ToArray(); .ToArray();
}
} }
} }

2
gateways/KonSoft.PublicGateway/Program.cs
View File

@ -22,4 +22,4 @@ app.UseAuthorization();
app.MapControllers(); app.MapControllers();
app.Run(); app.Run();

17
gateways/KonSoft.PublicGateway/WeatherForecast.cs
View File

@ -1,13 +1,12 @@
namespace KonSoft.PublicGateway namespace KonSoft.PublicGateway;
public class WeatherForecast
{ {
public class WeatherForecast public DateOnly Date { get; set; }
{
public DateOnly Date { get; set; }
public int TemperatureC { get; set; } public int TemperatureC { get; set; }
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
public string? Summary { get; set; } public string? Summary { get; set; }
} }
}

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

@ -23,9 +23,9 @@ public class AdminHttpApiHostModule : AbpModule
var configuration = context.Services.GetConfiguration(); var configuration = context.Services.GetConfiguration();
SwaggerConfigurationHelper.ConfigureWithOidc( SwaggerConfigurationHelper.ConfigureWithOidc(
context: context, context,
authority: configuration["AuthServer:Authority"]!, configuration["AuthServer:Authority"]!,
scopes: ["AdministrationService"], ["AdministrationService"],
discoveryEndpoint: configuration["AuthServer:MetadataAddress"], discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
apiTitle: "Administration Service API" apiTitle: "Administration Service API"
); );
@ -74,4 +74,4 @@ public class AdminHttpApiHostModule : AbpModule
app.UseAbpSerilogEnrichers(); app.UseAbpSerilogEnrichers();
app.UseConfiguredEndpoints(); app.UseConfiguredEndpoints();
} }
} }

2
microservices/KonSoft.Admin.HttpApi.Host/Controllers/HomeController.cs
View File

@ -9,4 +9,4 @@ public class HomeController : AbpController
{ {
return Redirect("~/swagger"); return Redirect("~/swagger");
} }
} }

13
microservices/KonSoft.Admin.HttpApi.Host/DbMigrations/AdminDataSeeder.cs
View File

@ -2,13 +2,12 @@
using Volo.Abp.Data; using Volo.Abp.Data;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
namespace KonSoft.Admin.DbMigrations namespace KonSoft.Admin.DbMigrations;
public class AdminDataSeeder : IDataSeedContributor, ITransientDependency
{ {
public class AdminDataSeeder : IDataSeedContributor, ITransientDependency public Task SeedAsync(DataSeedContext context)
{ {
public Task SeedAsync(DataSeedContext context) return Task.CompletedTask;
{
return Task.CompletedTask;
}
} }
} }

29
microservices/KonSoft.Admin.HttpApi.Host/DbMigrations/AdminPendingEfCoreMigrationsChecker.cs
View File

@ -6,21 +6,20 @@ using Volo.Abp.EventBus.Distributed;
using Volo.Abp.MultiTenancy; using Volo.Abp.MultiTenancy;
using Volo.Abp.Uow; using Volo.Abp.Uow;
namespace KonSoft.Admin.DbMigrations namespace KonSoft.Admin.DbMigrations;
public class AdminPendingEfCoreMigrationsChecker : PendingEfCoreMigrationsChecker<AdminDbContext>
{ {
public class AdminPendingEfCoreMigrationsChecker : PendingEfCoreMigrationsChecker<AdminDbContext> public AdminPendingEfCoreMigrationsChecker(IUnitOfWorkManager unitOfWorkManager,
IServiceProvider serviceProvider,
ICurrentTenant currentTenant,
IDistributedEventBus distributedEventBus,
IAbpDistributedLock abpDistributedLock) : base(unitOfWorkManager,
serviceProvider,
currentTenant,
distributedEventBus,
abpDistributedLock,
"Clean")
{ {
public AdminPendingEfCoreMigrationsChecker(IUnitOfWorkManager unitOfWorkManager,
IServiceProvider serviceProvider,
ICurrentTenant currentTenant,
IDistributedEventBus distributedEventBus,
IAbpDistributedLock abpDistributedLock) : base(unitOfWorkManager,
serviceProvider,
currentTenant,
distributedEventBus,
abpDistributedLock,
"Clean")
{
}
} }
} }

4
microservices/KonSoft.Admin.HttpApi.Host/Program.cs
View File

@ -1,8 +1,8 @@
using KonSoft.Admin; using System;
using KonSoft.Admin;
using KonSoft.Shared.Hosting.AspNetCore; using KonSoft.Shared.Hosting.AspNetCore;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Serilog; using Serilog;
using System;
var assemblyName = typeof(Program).Assembly.GetName().Name!; var assemblyName = typeof(Program).Assembly.GetName().Name!;

34
microservices/KonSoft.Admin.HttpApi.Host/web.config
View File

@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<location path="." inheritInChildApplications="false"> <location path="." inheritInChildApplications="false">
<system.webServer> <system.webServer>
<handlers> <handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" /> <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers> </handlers>
<aspNetCore processPath="dotnet" arguments=".\KonSoft.Admin.HttpApi.Host.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" /> <aspNetCore processPath="dotnet" arguments=".\KonSoft.Admin.HttpApi.Host.dll" stdoutLogEnabled="false"
</system.webServer> stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</location> </system.webServer>
<system.webServer> </location>
<httpProtocol> <system.webServer>
<customHeaders> <httpProtocol>
<remove name="x-powered-by" /> <customHeaders>
</customHeaders> <remove name="x-powered-by" />
</httpProtocol> </customHeaders>
</system.webServer> </httpProtocol>
</configuration> </system.webServer>
</configuration>

2
microservices/KonSoft.Dispatch.HttpApi.Host/Controllers/HomeController.cs
View File

@ -9,4 +9,4 @@ public class HomeController : AbpController
{ {
return Redirect("~/swagger"); return Redirect("~/swagger");
} }
} }

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

@ -2,7 +2,6 @@ using KonSoft.Dispatch.EntityFrameworkCore;
using KonSoft.Shared.Hosting.AspNetCore; using KonSoft.Shared.Hosting.AspNetCore;
using KonSoft.Shared.Hosting.Microservices; using KonSoft.Shared.Hosting.Microservices;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Volo.Abp; using Volo.Abp;
@ -24,9 +23,9 @@ public class DispatchHttpApiHostModule : AbpModule
var configuration = context.Services.GetConfiguration(); var configuration = context.Services.GetConfiguration();
SwaggerConfigurationHelper.ConfigureWithOidc( SwaggerConfigurationHelper.ConfigureWithOidc(
context: context, context,
authority: configuration["AuthServer:Authority"]!, configuration["AuthServer:Authority"]!,
scopes: ["DispatchService"], ["DispatchService"],
discoveryEndpoint: configuration["AuthServer:MetadataAddress"], discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
apiTitle: "Dispatch Service API" apiTitle: "Dispatch Service API"
); );
@ -75,4 +74,4 @@ public class DispatchHttpApiHostModule : AbpModule
app.UseAbpSerilogEnrichers(); app.UseAbpSerilogEnrichers();
app.UseConfiguredEndpoints(); app.UseConfiguredEndpoints();
} }
} }

4
microservices/KonSoft.Dispatch.HttpApi.Host/Program.cs
View File

@ -10,7 +10,7 @@ namespace KonSoft.Dispatch;
public class Program public class Program
{ {
public async static Task<int> Main(string[] args) public static async Task<int> Main(string[] args)
{ {
Log.Logger = new LoggerConfiguration() Log.Logger = new LoggerConfiguration()
#if DEBUG #if DEBUG
@ -53,4 +53,4 @@ public class Program
Log.CloseAndFlush(); Log.CloseAndFlush();
} }
} }
} }

34
microservices/KonSoft.Dispatch.HttpApi.Host/web.config
View File

@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<location path="." inheritInChildApplications="false"> <location path="." inheritInChildApplications="false">
<system.webServer> <system.webServer>
<handlers> <handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" /> <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers> </handlers>
<aspNetCore processPath="dotnet" arguments=".\KonSoft.Dispatch.HttpApi.Host.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" /> <aspNetCore processPath="dotnet" arguments=".\KonSoft.Dispatch.HttpApi.Host.dll" stdoutLogEnabled="false"
</system.webServer> stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</location> </system.webServer>
<system.webServer> </location>
<httpProtocol> <system.webServer>
<customHeaders> <httpProtocol>
<remove name="x-powered-by" /> <customHeaders>
</customHeaders> <remove name="x-powered-by" />
</httpProtocol> </customHeaders>
</system.webServer> </httpProtocol>
</configuration> </system.webServer>
</configuration>

2
microservices/KonSoft.Payment.HttpApi.Host/Controllers/HomeController.cs
View File

@ -9,4 +9,4 @@ public class HomeController : AbpController
{ {
return Redirect("~/swagger"); return Redirect("~/swagger");
} }
} }

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

@ -2,7 +2,6 @@ using KonSoft.Payment.EntityFrameworkCore;
using KonSoft.Shared.Hosting.AspNetCore; using KonSoft.Shared.Hosting.AspNetCore;
using KonSoft.Shared.Hosting.Microservices; using KonSoft.Shared.Hosting.Microservices;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Volo.Abp; using Volo.Abp;
@ -24,9 +23,9 @@ public class PaymentHttpApiHostModule : AbpModule
var configuration = context.Services.GetConfiguration(); var configuration = context.Services.GetConfiguration();
SwaggerConfigurationHelper.ConfigureWithOidc( SwaggerConfigurationHelper.ConfigureWithOidc(
context: context, context,
authority: configuration["AuthServer:Authority"]!, configuration["AuthServer:Authority"]!,
scopes: ["PaymentService"], ["PaymentService"],
discoveryEndpoint: configuration["AuthServer:MetadataAddress"], discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
apiTitle: "Payment Service API" apiTitle: "Payment Service API"
); );
@ -75,4 +74,4 @@ public class PaymentHttpApiHostModule : AbpModule
app.UseAbpSerilogEnrichers(); app.UseAbpSerilogEnrichers();
app.UseConfiguredEndpoints(); app.UseConfiguredEndpoints();
} }
} }

4
microservices/KonSoft.Payment.HttpApi.Host/Program.cs
View File

@ -10,7 +10,7 @@ namespace KonSoft.Payment;
public class Program public class Program
{ {
public async static Task<int> Main(string[] args) public static async Task<int> Main(string[] args)
{ {
Log.Logger = new LoggerConfiguration() Log.Logger = new LoggerConfiguration()
#if DEBUG #if DEBUG
@ -53,4 +53,4 @@ public class Program
Log.CloseAndFlush(); Log.CloseAndFlush();
} }
} }
} }

34
microservices/KonSoft.Payment.HttpApi.Host/web.config
View File

@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<location path="." inheritInChildApplications="false"> <location path="." inheritInChildApplications="false">
<system.webServer> <system.webServer>
<handlers> <handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" /> <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers> </handlers>
<aspNetCore processPath="dotnet" arguments=".\KonSoft.Payment.HttpApi.Host.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" /> <aspNetCore processPath="dotnet" arguments=".\KonSoft.Payment.HttpApi.Host.dll" stdoutLogEnabled="false"
</system.webServer> stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</location> </system.webServer>
<system.webServer> </location>
<httpProtocol> <system.webServer>
<customHeaders> <httpProtocol>
<remove name="x-powered-by" /> <customHeaders>
</customHeaders> <remove name="x-powered-by" />
</httpProtocol> </customHeaders>
</system.webServer> </httpProtocol>
</configuration> </system.webServer>
</configuration>

2
microservices/KonSoft.Report.HttpApi.Host/Controllers/HomeController.cs
View File

@ -9,4 +9,4 @@ public class HomeController : AbpController
{ {
return Redirect("~/swagger"); return Redirect("~/swagger");
} }
} }

4
microservices/KonSoft.Report.HttpApi.Host/Program.cs
View File

@ -10,7 +10,7 @@ namespace KonSoft.Report;
public class Program public class Program
{ {
public async static Task<int> Main(string[] args) public static async Task<int> Main(string[] args)
{ {
Log.Logger = new LoggerConfiguration() Log.Logger = new LoggerConfiguration()
#if DEBUG #if DEBUG
@ -53,4 +53,4 @@ public class Program
Log.CloseAndFlush(); Log.CloseAndFlush();
} }
} }
} }

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

@ -2,7 +2,6 @@ using KonSoft.Report.EntityFrameworkCore;
using KonSoft.Shared.Hosting.AspNetCore; using KonSoft.Shared.Hosting.AspNetCore;
using KonSoft.Shared.Hosting.Microservices; using KonSoft.Shared.Hosting.Microservices;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Volo.Abp; using Volo.Abp;
@ -24,9 +23,9 @@ public class ReportHttpApiHostModule : AbpModule
var configuration = context.Services.GetConfiguration(); var configuration = context.Services.GetConfiguration();
SwaggerConfigurationHelper.ConfigureWithOidc( SwaggerConfigurationHelper.ConfigureWithOidc(
context: context, context,
authority: configuration["AuthServer:Authority"]!, configuration["AuthServer:Authority"]!,
scopes: ["ReportService"], ["ReportService"],
discoveryEndpoint: configuration["AuthServer:MetadataAddress"], discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
apiTitle: "Report Service API" apiTitle: "Report Service API"
); );
@ -75,4 +74,4 @@ public class ReportHttpApiHostModule : AbpModule
app.UseAbpSerilogEnrichers(); app.UseAbpSerilogEnrichers();
app.UseConfiguredEndpoints(); app.UseConfiguredEndpoints();
} }
} }

34
microservices/KonSoft.Report.HttpApi.Host/web.config
View File

@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<location path="." inheritInChildApplications="false"> <location path="." inheritInChildApplications="false">
<system.webServer> <system.webServer>
<handlers> <handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" /> <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers> </handlers>
<aspNetCore processPath="dotnet" arguments=".\KonSoft.Report.HttpApi.Host.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" /> <aspNetCore processPath="dotnet" arguments=".\KonSoft.Report.HttpApi.Host.dll" stdoutLogEnabled="false"
</system.webServer> stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</location> </system.webServer>
<system.webServer> </location>
<httpProtocol> <system.webServer>
<customHeaders> <httpProtocol>
<remove name="x-powered-by" /> <customHeaders>
</customHeaders> <remove name="x-powered-by" />
</httpProtocol> </customHeaders>
</system.webServer> </httpProtocol>
</configuration> </system.webServer>
</configuration>

2
microservices/KonSoft.TenantManagement.HttpApi.Host/Controllers/HomeController.cs
View File

@ -9,4 +9,4 @@ public class HomeController : AbpController
{ {
return Redirect("~/swagger"); return Redirect("~/swagger");
} }
} }

4
microservices/KonSoft.TenantManagement.HttpApi.Host/Program.cs
View File

@ -10,7 +10,7 @@ namespace KonSoft.TenantManagement;
public class Program public class Program
{ {
public async static Task<int> Main(string[] args) public static async Task<int> Main(string[] args)
{ {
Log.Logger = new LoggerConfiguration() Log.Logger = new LoggerConfiguration()
#if DEBUG #if DEBUG
@ -53,4 +53,4 @@ public class Program
Log.CloseAndFlush(); Log.CloseAndFlush();
} }
} }
} }

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

@ -2,7 +2,6 @@ using KonSoft.Shared.Hosting.AspNetCore;
using KonSoft.Shared.Hosting.Microservices; using KonSoft.Shared.Hosting.Microservices;
using KonSoft.TenantManagement.EntityFrameworkCore; using KonSoft.TenantManagement.EntityFrameworkCore;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Volo.Abp; using Volo.Abp;
@ -24,9 +23,9 @@ public class TenantManagementHttpApiHostModule : AbpModule
var configuration = context.Services.GetConfiguration(); var configuration = context.Services.GetConfiguration();
SwaggerConfigurationHelper.ConfigureWithOidc( SwaggerConfigurationHelper.ConfigureWithOidc(
context: context, context,
authority: configuration["AuthServer:Authority"]!, configuration["AuthServer:Authority"]!,
scopes: ["TenantManagementService"], ["TenantManagementService"],
discoveryEndpoint: configuration["AuthServer:MetadataAddress"], discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
apiTitle: "TenantManagement Service API" apiTitle: "TenantManagement Service API"
); );
@ -75,4 +74,4 @@ public class TenantManagementHttpApiHostModule : AbpModule
app.UseAbpSerilogEnrichers(); app.UseAbpSerilogEnrichers();
app.UseConfiguredEndpoints(); app.UseConfiguredEndpoints();
} }
} }

34
microservices/KonSoft.TenantManagement.HttpApi.Host/web.config
View File

@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<location path="." inheritInChildApplications="false"> <location path="." inheritInChildApplications="false">
<system.webServer> <system.webServer>
<handlers> <handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" /> <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers> </handlers>
<aspNetCore processPath="dotnet" arguments=".\KonSoft.TenantManagement.HttpApi.Host.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" /> <aspNetCore processPath="dotnet" arguments=".\KonSoft.TenantManagement.HttpApi.Host.dll" stdoutLogEnabled="false"
</system.webServer> stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</location> </system.webServer>
<system.webServer> </location>
<httpProtocol> <system.webServer>
<customHeaders> <httpProtocol>
<remove name="x-powered-by" /> <customHeaders>
</customHeaders> <remove name="x-powered-by" />
</httpProtocol> </customHeaders>
</system.webServer> </httpProtocol>
</configuration> </system.webServer>
</configuration>

2
modules/admin/src/KonSoft.Admin.Application.Contracts/AdminApplicationContractsModule.cs
View File

@ -25,4 +25,4 @@ public class AdminApplicationContractsModule : AbpModule
{ {
AdminDtoExtensions.Configure(); AdminDtoExtensions.Configure();
} }
} }

30
modules/admin/src/KonSoft.Admin.Application.Contracts/AdminDtoExtensions.cs
View File

@ -1,28 +1,26 @@
using Volo.Abp.Identity; using Volo.Abp.Threading;
using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading;
namespace KonSoft.Admin; namespace KonSoft.Admin;
public static class AdminDtoExtensions public static class AdminDtoExtensions
{ {
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); private static readonly OneTimeRunner OneTimeRunner = new();
public static void Configure() public static void Configure()
{ {
OneTimeRunner.Run(() => OneTimeRunner.Run(() =>
{ {
/* You can add extension properties to DTOs /* You can add extension properties to DTOs
* defined in the depended modules. * defined in the depended modules.
* *
* Example: * Example:
* *
* ObjectExtensionManager.Instance * ObjectExtensionManager.Instance
* .AddOrUpdateProperty<IdentityRoleDto, string>("Title"); * .AddOrUpdateProperty<IdentityRoleDto, string>("Title");
* *
* See the documentation for more: * See the documentation for more:
* https://docs.abp.io/en/abp/latest/Object-Extensions * https://docs.abp.io/en/abp/latest/Object-Extensions
*/ */
}); });
} }
} }

23
modules/admin/src/KonSoft.Admin.Application.Contracts/Dtos/AddressDto.cs
View File

@ -1,17 +1,10 @@
using System; namespace KonSoft.Admin.Dtos;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KonSoft.Admin.Dtos public class AddressDto
{ {
public class AddressDto public string ContactName { get; set; }
{ public string ContactPhone { get; set; }
public string ContactName { get; set; } public string DetailAddress { get; set; }
public string ContactPhone { get; set; } public string City { get; set; }
public string DetailAddress { get; set; } public string District { get; set; }
public string City { get; set; } }
public string District { get; set; }
}
}

34
modules/admin/src/KonSoft.Admin.Application.Contracts/Dtos/CreateOrderDto.cs
View File

@ -1,25 +1,19 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KonSoft.Admin.Dtos namespace KonSoft.Admin.Dtos;
public class CreateOrderDto
{ {
public class CreateOrderDto [Required] public Guid CustomerId { get; set; }
{
[Required]
public Guid CustomerId { get; set; }
[Required]
public Guid ServiceCategoryId { get; set; }
[Required]
public DateTime ServiceTime { get; set; }
[Required]
public decimal Amount { get; set; }
[Required]
public AddressDto Address { get; set; }
public string Remark { get; set; } [Required] public Guid ServiceCategoryId { get; set; }
}
} [Required] public DateTime ServiceTime { get; set; }
[Required] public decimal Amount { get; set; }
[Required] public AddressDto Address { get; set; }
public string Remark { get; set; }
}

17
modules/admin/src/KonSoft.Admin.Application.Contracts/Dtos/CreateServiceCategoryDto.cs
View File

@ -1,14 +1,9 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KonSoft.Admin.Dtos namespace KonSoft.Admin.Dtos;
public class CreateServiceCategoryDto
{ {
public class CreateServiceCategoryDto public string Name { get; set; }
{ public Guid? ParentId { get; set; }
public string Name { get; set; } }
public Guid? ParentId { get; set; }
}
}

42
modules/admin/src/KonSoft.Admin.Application.Contracts/Dtos/OrderDto.cs
View File

@ -1,26 +1,20 @@
using KonSoft.Admin.Enums; using System;
using System; using KonSoft.Admin.Enums;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Dtos;
namespace KonSoft.Admin.Dtos namespace KonSoft.Admin.Dtos;
public class OrderDto
{ {
public class OrderDto public Guid Id { get; set; }
{ public string OrderSN { get; set; }
public Guid Id { get; set; } public Guid CustomerId { get; set; }
public string OrderSN { get; set; } public Guid? WorkerId { get; set; }
public Guid CustomerId { get; set; } public ServiceCategoryDto? ServiceCategory { get; set; }
public Guid? WorkerId { get; set; } public DateTime ServiceTime { get; set; }
public ServiceCategoryDto? ServiceCategory { get; set; } public OrderStatus Status { get; set; }
public DateTime ServiceTime { get; set; } public decimal Amount { get; set; }
public OrderStatus Status { get; set; } public decimal PaidAmount { get; set; }
public decimal Amount { get; set; } public string PaymentMethod { get; set; }
public decimal PaidAmount { get; set; } public AddressDto Address { get; set; }
public string PaymentMethod { get; set; } public string Remark { get; set; }
public AddressDto Address { get; set; } }
public string Remark { get; set; }
}
}

13
modules/admin/src/KonSoft.Admin.Application.Contracts/Dtos/PayOrderDto.cs
View File

@ -1,12 +1,5 @@
using System; namespace KonSoft.Admin.Dtos;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KonSoft.Admin.Dtos public class PayOrderDto
{ {
public class PayOrderDto }
{
}
}

118
modules/admin/src/KonSoft.Admin.Application.Contracts/Dtos/ProductDto.cs
View File

@ -1,66 +1,60 @@
 using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace KonSoft.Admin.Dtos namespace KonSoft.Admin.Dtos;
public class ProductDto : CreateProductDto
{ {
public class ProductDto: CreateProductDto /// <summary>
{ /// 嵌套子类
/// <summary> /// </summary>
/// 嵌套子类 public List<CreateProductDto> Children { get; set; } = new();
/// </summary>
public List<CreateProductDto> Children { get; set; } = new();
}
public class CreateProductDto
{
/// <summary>
/// 分类名称
/// </summary>
public string Name { get; private set; }
/// <summary>
/// 商品编码
/// </summary>
public string Code { get; private set; }
/// <summary>
/// 商品价格
/// </summary>
public decimal Price { get; private set; }
/// <summary>
/// 商品描述
/// </summary>
public string Description { get; private set; }
/// <summary>
/// 分类类型（大类或小类）
/// </summary>
public string Type { get; private set; }
/// <summary>
/// 父分类ID
/// </summary>
public Guid? ParentId { get; private set; }
/// <summary>
/// 商品状态（在售/下架等）
/// </summary>
public string Status { get; private set; }
/// <summary>
/// 排序字段
/// </summary>
public int Order { get; private set; }
}
public class UpdateProductDto: CreateProductDto
{
public Guid Id { get; set; }
}
} }
public class CreateProductDto
{
/// <summary>
/// 分类名称
/// </summary>
public string Name { get; private set; }
/// <summary>
/// 商品编码
/// </summary>
public string Code { get; private set; }
/// <summary>
/// 商品价格
/// </summary>
public decimal Price { get; private set; }
/// <summary>
/// 商品描述
/// </summary>
public string Description { get; private set; }
/// <summary>
/// 分类类型（大类或小类）
/// </summary>
public string Type { get; private set; }
/// <summary>
/// 父分类ID
/// </summary>
public Guid? ParentId { get; private set; }
/// <summary>
/// 商品状态（在售/下架等）
/// </summary>
public string Status { get; private set; }
/// <summary>
/// 排序字段
/// </summary>
public int Order { get; private set; }
}
public class UpdateProductDto : CreateProductDto
{
public Guid Id { get; set; }
}

22
modules/admin/src/KonSoft.Admin.Application.Contracts/Dtos/ServiceCategoryDto.cs
View File

@ -1,17 +1,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KonSoft.Admin.Dtos namespace KonSoft.Admin.Dtos;
public class ServiceCategoryDto
{ {
public class ServiceCategoryDto public Guid Id { get; set; }
{ public string Name { get; set; }
public Guid Id { get; set; } public Guid? ParentId { get; set; }
public string Name { get; set; } public int Level { get; set; }
public Guid? ParentId { get; set; } public List<ServiceCategoryDto> Children { get; set; } = new();
public int Level { get; set; } }
public List<ServiceCategoryDto> Children { get; set; } = new List<ServiceCategoryDto>();
}
}

21
modules/admin/src/KonSoft.Admin.Application.Contracts/Dtos/WorkerDto.cs
View File

@ -1,17 +1,12 @@
using KonSoft.Admin.Enums; using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
namespace KonSoft.Admin.Dtos namespace KonSoft.Admin.Dtos;
public class WorkerDto : EntityDto<Guid>
{ {
public class WorkerDto : EntityDto<Guid> public string Name { get; set; }
{ public string Phone { get; set; }
public string Name { get; set; } public List<Guid> SkillCategoryIds { get; set; } = new(); // 擅长服务类型
public string Phone { get; set; } }
public List<Guid> SkillCategoryIds { get; set; } = new(); // 擅长服务类型
}
}

46
modules/admin/src/KonSoft.Admin.Application.Contracts/IApplicationServices/IOrderAppService.cs
View File

@ -1,28 +1,28 @@
using KonSoft.Admin.Dtos; using System;
using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using KonSoft.Admin.Dtos;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
namespace KonSoft.Admin.IApplicationServices namespace KonSoft.Admin.IApplicationServices;
public interface IOrderAppService : IApplicationService
{ {
public interface IOrderAppService : IApplicationService /// <summary>
{ /// 创建订单
/// <summary> /// </summary>
/// 创建订单 /// <param name="input"></param>
/// </summary> /// <returns></returns>
/// <param name="input"></param> Task<OrderDto> CreateAsync(CreateOrderDto input);
/// <returns></returns>
Task<OrderDto> CreateAsync(CreateOrderDto input); Task<OrderDto> PayAsync(Guid orderId, PayOrderDto input);
Task<OrderDto> PayAsync(Guid orderId, PayOrderDto input); Task AssignAsync(Guid orderId, Guid workerId);
Task AssignAsync(Guid orderId, Guid workerId); Task StartServiceAsync(Guid orderId);
Task StartServiceAsync(Guid orderId); Task CompleteServiceAsync(Guid orderId);
Task CompleteServiceAsync(Guid orderId); Task ConfirmAsync(Guid orderId);
Task ConfirmAsync(Guid orderId); Task CancelAsync(Guid orderId, string reason);
Task CancelAsync(Guid orderId, string reason); Task DeleteAsync(params Guid[] ids);
Task DeleteAsync(params Guid[] ids); Task EditAsync(OrderDto input);
Task EditAsync(OrderDto input); Task<OrderDto> GetAsync(Guid id);
Task<OrderDto> GetAsync(Guid id); Task<PagedResultDto<OrderDto>> GetListAsync(PagedResultRequestDto input);
Task<PagedResultDto<OrderDto>> GetListAsync(PagedResultRequestDto input); }
}
}

16
modules/admin/src/KonSoft.Admin.Application.Contracts/IApplicationServices/IProductAppService.cs Normal file
View File

@ -0,0 +1,16 @@
using System;
using System.Threading.Tasks;
using KonSoft.Admin.Dtos;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services;
namespace KonSoft.Admin.IApplicationServices;
public interface IProductAppService : IApplicationService
{
Task CreateAsync(CreateProductDto input);
Task UpdateAsync(UpdateProductDto input);
Task DeleteAsync(Guid id);
Task<ProductDto> GetAsync(Guid id);
Task<PagedResultDto<ProductDto>> GetListAsync(PagedResultRequestDto input);
}

17
modules/admin/src/KonSoft.Admin.Application.Contracts/IApplicationServices/IProductService.cs
View File

@ -1,17 +0,0 @@
using KonSoft.Admin.Dtos;
using System;
using System.Threading.Tasks;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services;
namespace KonSoft.Admin.IApplicationServices
{
public interface IProductService: IApplicationService
{
Task CreateAsync(CreateProductDto input);
Task UpdateAsync(UpdateProductDto input);
Task DeleteAsync(Guid id);
Task<ProductDto> GetAsync(Guid id);
Task<PagedResultDto<ProductDto>> GetListAsync(PagedResultRequestDto input);
}
}

21
modules/admin/src/KonSoft.Admin.Application.Contracts/IApplicationServices/IServiceCategoryAppService.cs
View File

@ -1,16 +1,13 @@
using KonSoft.Admin.Dtos; using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using KonSoft.Admin.Dtos;
namespace KonSoft.Admin.IApplicationServices namespace KonSoft.Admin.IApplicationServices;
public interface IServiceCategoryAppService
{ {
public interface IServiceCategoryAppService Task<ServiceCategoryDto> CreateAsync(CreateServiceCategoryDto input);
{ Task DeleteAsync(Guid id);
Task<ServiceCategoryDto> CreateAsync(CreateServiceCategoryDto input); Task<List<ServiceCategoryDto>> GetTreeAsync();
Task DeleteAsync(Guid id); }
Task<List<ServiceCategoryDto>> GetTreeAsync();
}
}

16
modules/admin/src/KonSoft.Admin.Application.Contracts/IApplicationServices/IWorkerAppService.cs
View File

@ -1,13 +1,7 @@
using System; using Volo.Abp.Application.Services;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Services;
namespace KonSoft.Admin.IApplicationServices namespace KonSoft.Admin.IApplicationServices;
public interface IWorkerAppService : IApplicationService
{ {
public interface IWorkerAppService : IApplicationService }
{
}
}

16
modules/admin/src/KonSoft.Admin.Application.Contracts/IApplicationServices/IWorkerAssignmentService.cs
View File

@ -1,15 +1,5 @@
using System; namespace KonSoft.Admin.IApplicationServices;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KonSoft.Admin.IApplicationServices public interface IWorkerAssignmentService
{ {
public interface IWorkerAssignmentService }
{
}
}

2
modules/admin/src/KonSoft.Admin.Application.Contracts/Permissions/AdminPermissionDefinitionProvider.cs
View File

@ -17,4 +17,4 @@ public class AdminPermissionDefinitionProvider : PermissionDefinitionProvider
{ {
return LocalizableString.Create<AdminResource>(name); return LocalizableString.Create<AdminResource>(name);
} }
} }

2
modules/admin/src/KonSoft.Admin.Application.Contracts/Permissions/AdminPermissions.cs
View File

@ -6,4 +6,4 @@ public static class AdminPermissions
//Add your own permission names. Example: //Add your own permission names. Example:
//public const string MyPermission1 = GroupName + ".MyPermission1"; //public const string MyPermission1 = GroupName + ".MyPermission1";
} }

7
modules/admin/src/KonSoft.Admin.Application/AdminAppService.cs
View File

@ -1,7 +1,4 @@
using System; using KonSoft.Admin.Localization;
using System.Collections.Generic;
using System.Text;
using KonSoft.Admin.Localization;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
namespace KonSoft.Admin; namespace KonSoft.Admin;
@ -14,4 +11,4 @@ public abstract class AdminAppService : ApplicationService
{ {
LocalizationResource = typeof(AdminResource); LocalizationResource = typeof(AdminResource);
} }
} }

2
modules/admin/src/KonSoft.Admin.Application/AdminApplicationAutoMapperProfile.cs
View File

@ -17,4 +17,4 @@ public class AdminApplicationAutoMapperProfile : Profile
CreateMap<AddressDto, AddressInfo>(); CreateMap<AddressDto, AddressInfo>();
CreateMap<ServiceCategoryDto, ServiceCategory>(); CreateMap<ServiceCategoryDto, ServiceCategory>();
} }
} }

9
modules/admin/src/KonSoft.Admin.Application/AdminApplicationModule.cs
View File

@ -18,14 +18,11 @@ namespace KonSoft.Admin;
typeof(AbpTenantManagementApplicationModule), typeof(AbpTenantManagementApplicationModule),
typeof(AbpFeatureManagementApplicationModule), typeof(AbpFeatureManagementApplicationModule),
typeof(AbpSettingManagementApplicationModule) typeof(AbpSettingManagementApplicationModule)
)] )]
public class AdminApplicationModule : AbpModule public class AdminApplicationModule : AbpModule
{ {
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {
Configure<AbpAutoMapperOptions>(options => Configure<AbpAutoMapperOptions>(options => { options.AddMaps<AdminApplicationModule>(); });
{
options.AddMaps<AdminApplicationModule>();
});
} }
} }

273
modules/admin/src/KonSoft.Admin.Application/ApplicationServices/OrderAppService.cs
View File

@ -1,165 +1,166 @@
using KonSoft.Admin.Dtos; using System;
using KonSoft.Admin.Entities;
using KonSoft.Admin.IApplicationServices;
using KonSoft.Admin.Repositories;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using KonSoft.Admin.Dtos;
using KonSoft.Admin.Entities;
using KonSoft.Admin.IApplicationServices;
using KonSoft.Admin.IRepositories;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
namespace KonSoft.Admin.ApplicationServices namespace KonSoft.Admin.ApplicationServices;
public class OrderAppService(IOrderRepository orderRepository) : ApplicationService, IOrderAppService
{ {
public class OrderAppService(IOrderRepository orderRepository) : ApplicationService, IOrderAppService private readonly IOrderRepository _orderRepository = orderRepository;
/// <summary>
/// 分配师傅
/// </summary>
/// <param name="orderId"></param>
/// <param name="workerId"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public async Task AssignAsync(Guid orderId, Guid workerId)
{ {
private readonly IOrderRepository _orderRepository = orderRepository; var order = await _orderRepository.GetAsync(o => o.Id == orderId);
order.AssignWorker(workerId);
}
/// <summary> /// <summary>
/// 分配师傅 /// 取消订单
/// </summary> /// </summary>
/// <param name="orderId"></param> /// <param name="orderId"></param>
/// <param name="workerId"></param> /// <param name="reason"></param>
/// <returns></returns> /// <returns></returns>
/// <exception cref="NotImplementedException"></exception> /// <exception cref="NotImplementedException"></exception>
public async Task AssignAsync(Guid orderId, Guid workerId) public async Task CancelAsync(Guid orderId, string reason)
{ {
var order = await _orderRepository.GetAsync(o => o.Id == orderId); var order = await _orderRepository.GetAsync(o => o.Id == orderId);
order.AssignWorker(workerId); order.Cancel(reason);
} }
/// <summary> /// <summary>
/// 取消订单 /// 完成订单
/// </summary> /// </summary>
/// <param name="orderId"></param> /// <param name="orderId"></param>
/// <param name="reason"></param> /// <returns></returns>
/// <returns></returns> /// <exception cref="NotImplementedException"></exception>
/// <exception cref="NotImplementedException"></exception> public async Task CompleteServiceAsync(Guid orderId)
public async Task CancelAsync(Guid orderId, string reason) {
{ var order = await _orderRepository.GetAsync(o => o.Id == orderId);
var order = await _orderRepository.GetAsync(o => o.Id == orderId); order.CompleteService();
order.Cancel(reason); }
}
/// <summary> /// <summary>
/// 完成订单 /// 确认订单
/// </summary> /// </summary>
/// <param name="orderId"></param> /// <param name="orderId"></param>
/// <returns></returns> /// <returns></returns>
/// <exception cref="NotImplementedException"></exception> /// <exception cref="NotImplementedException"></exception>
public async Task CompleteServiceAsync(Guid orderId) public async Task ConfirmAsync(Guid orderId)
{ {
var order = await _orderRepository.GetAsync(o => o.Id == orderId); var order = await _orderRepository.GetAsync(o => o.Id == orderId);
order.CompleteService(); order.ConfirmCompletion();
} }
/// <summary> /// <summary>
/// 确认订单 /// 创建订单
/// </summary> /// </summary>
/// <param name="orderId"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
/// <exception cref="NotImplementedException"></exception> /// <exception cref="NotImplementedException"></exception>
public async Task ConfirmAsync(Guid orderId) public async Task<OrderDto> CreateAsync(CreateOrderDto input)
{ {
var order = await _orderRepository.GetAsync(o => o.Id == orderId); // 生成订单号 TODO
order.ConfirmCompletion(); var orderSN = "SN001";
} var address = ObjectMapper.Map<AddressDto, AddressInfo>(input.Address);
var order = new Order(Guid.NewGuid(), orderSN, input.CustomerId, input.ServiceCategoryId, input.ServiceTime,
input.Amount, address, input.Remark);
/// <summary> await _orderRepository.InsertAsync(order);
/// 创建订单 return ObjectMapper.Map<Order, OrderDto>(order);
/// </summary> }
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public async Task<OrderDto> CreateAsync(CreateOrderDto input)
{
// 生成订单号 TODO
var orderSN = "SN001";
var address = ObjectMapper.Map<AddressDto, AddressInfo>(input.Address);
var order = new Order(Guid.NewGuid(), orderSN, input.CustomerId, input.ServiceCategoryId, input.ServiceTime, input.Amount, address, input.Remark);
await _orderRepository.InsertAsync(order); /// <summary>
return ObjectMapper.Map<Order, OrderDto>(order); /// 根据订单ID删除订单
} /// </summary>
/// <param name="id">订单ID</param>
public async Task DeleteAsync(params Guid[] ids)
{
// 根据ID删除订单
await _orderRepository.DeleteAsync(x => ids.Contains(x.Id));
}
/// <summary> /// <summary>
/// 根据订单ID删除订单 /// 修改订单信息
/// </summary> /// </summary>
/// <param name="id">订单ID</param> /// <param name="input">订单DTO对象</param>
public async Task DeleteAsync(params Guid[] ids) /// s
{ public async Task EditAsync(OrderDto input)
// 根据ID删除订单 {
await _orderRepository.DeleteAsync(x => ids.Contains(x.Id)); // 根据ID查询订单，如果不存在则抛出异常【修改前端必然看到了,数据若查不到提示自定义异常信息】
} var order = await _orderRepository.FindAsync(o => o.Id == input.Id) ??
throw new BusinessException("订单找不到").WithData("Id", input.Id);
/// <summary> // 将输入的DTO字段映射到订单实体
/// 修改订单信息 ObjectMapper.Map(input, order);
/// </summary>
/// <param name="input">订单DTO对象</param>s
public async Task EditAsync(OrderDto input)
{
// 根据ID查询订单，如果不存在则抛出异常【修改前端必然看到了,数据若查不到提示自定义异常信息】
var order = await _orderRepository.FindAsync(o => o.Id == input.Id) ??
throw new BusinessException("订单找不到").WithData("Id", input.Id);
// 将输入的DTO字段映射到订单实体 // 更新订单
ObjectMapper.Map(input, order); await _orderRepository.UpdateAsync(order);
}
// 更新订单 /// <summary>
await _orderRepository.UpdateAsync(order); /// 支付
} /// </summary>
/// <param name="orderId"></param>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public Task<OrderDto> PayAsync(Guid orderId, PayOrderDto input)
{
throw new NotImplementedException();
}
/// <summary> /// <summary>
/// 支付 /// 开始订单
/// </summary> /// </summary>
/// <param name="orderId"></param> /// <param name="orderId"></param>
/// <param name="input"></param> /// <returns></returns>
/// <returns></returns> /// <exception cref="NotImplementedException"></exception>
/// <exception cref="NotImplementedException"></exception> public async Task StartServiceAsync(Guid orderId)
public Task<OrderDto> PayAsync(Guid orderId, PayOrderDto input) {
{ var order = await _orderRepository.GetAsync(o => o.Id == orderId);
throw new NotImplementedException(); order.StartService();
} }
/// <summary> /// <summary>
/// 开始订单 /// 根据订单ID获取单个订单
/// </summary> /// </summary>
/// <param name="orderId"></param> public async Task<OrderDto> GetAsync(Guid id)
/// <returns></returns> {
/// <exception cref="NotImplementedException"></exception> // 根据ID从数据库查询订单
public async Task StartServiceAsync(Guid orderId) var order = await _orderRepository.GetAsync(o => o.Id == id);
{
var order = await _orderRepository.GetAsync(o => o.Id == orderId);
order.StartService();
}
/// <summary> // 转换为OrderDto返回
/// 根据订单ID获取单个订单 return ObjectMapper.Map<Order, OrderDto>(order);
/// </summary> }
public async Task<OrderDto> GetAsync(Guid id)
{
// 根据ID从数据库查询订单
var order = await _orderRepository.GetAsync(o => o.Id == id);
// 转换为OrderDto返回 /// <summary>
return ObjectMapper.Map<Order, OrderDto>(order); /// 获取所有订单列表
} /// </summary>
public async Task<PagedResultDto<OrderDto>> GetListAsync(PagedResultRequestDto input)
{
// 查询所有订单
var orders = await _orderRepository.GetPagedListAsync(input.SkipCount, input.MaxResultCount, "Id");
/// <summary> var totalCount = await _orderRepository.CountAsync();
/// 获取所有订单列表
/// </summary>
public async Task<PagedResultDto<OrderDto>> GetListAsync(PagedResultRequestDto input)
{
// 查询所有订单
var orders = await _orderRepository.GetPagedListAsync(input.SkipCount, input.MaxResultCount, "Id");
var totalCount = await _orderRepository.CountAsync(); var orderDtos = ObjectMapper.Map<List<Order>, List<OrderDto>>(orders);
var orderDtos = ObjectMapper.Map<List<Order>, List<OrderDto>>(orders); return new PagedResultDto<OrderDto>(totalCount, orderDtos);
return new PagedResultDto<OrderDto>(totalCount, orderDtos);
}
} }
} }

102
modules/admin/src/KonSoft.Admin.Application/ApplicationServices/ProductAppAppService.cs Normal file
View File

@ -0,0 +1,102 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using KonSoft.Admin.Dtos;
using KonSoft.Admin.Entities;
using KonSoft.Admin.IApplicationServices;
using KonSoft.Admin.IRepositories;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Repositories;
namespace KonSoft.Admin.ApplicationServices;
public class ProductAppAppService(IProductRepository repository) : ApplicationService, IProductAppService
{
private readonly IProductRepository repository = repository;
/// <summary>
/// 创建产品
/// </summary>
public async Task CreateAsync(CreateProductDto input)
{
var id = Guid.NewGuid();
var product = new Product(id, input.Name, input.Code, input.Price, input.Description, input.Type,
input.ParentId, input.Status, input.Order);
await repository.InsertAsync(product);
}
/// <summary>
/// 删除
/// </summary>
public async Task DeleteAsync(Guid id)
{
await repository.DeleteAsync(x => x.Id == id);
}
/// <summary>
/// 查询
/// </summary>
public async Task<ProductDto> GetAsync(Guid id)
{
var product = await repository.GetAsync(x => x.Id == id);
return ObjectMapper.Map<Product, ProductDto>(product);
}
/// <summary>
/// 查询集合
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task<PagedResultDto<ProductDto>> GetListAsync(PagedResultRequestDto input)
{
var query = await repository.GetPageRootListAsync(input.SkipCount, input.MaxResultCount,
x => x.ParentId == null);
var all = await repository.GetListAsync(x => x.ParentId != null);
foreach (var item in query)
{
BuildChildren(item, all);
}
var totalCount = await repository.CountAsync(x => x.ParentId == null);
var productDtos = ObjectMapper.Map<List<Product>, List<ProductDto>>(query);
return new PagedResultDto<ProductDto>(totalCount, productDtos);
}
/// <summary>
/// 修改
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task UpdateAsync(UpdateProductDto input)
{
// 根据ID查询订单，如果不存在则抛出异常【修改前端必然看到了,数据若查不到提示自定义异常信息】
var order = await repository.FindAsync(o => o.Id == input.Id) ??
throw new BusinessException("商品找不到").WithData("Id", input.Id);
// 将输入的DTO字段映射到订单实体
ObjectMapper.Map(input, order);
// 更新订单
await repository.UpdateAsync(order);
}
private static void BuildChildren(Product parent, List<Product> all)
{
var children = all
.Where(x => x.ParentId == parent.Id)
.OrderBy(x => x.Order)
.ToList();
parent.Children = children;
foreach (var child in children)
{
BuildChildren(child, all); // 递归
}
}
}

100
modules/admin/src/KonSoft.Admin.Application/ApplicationServices/ProductAppService.cs
View File

@ -1,100 +0,0 @@
using KonSoft.Admin.Dtos;
using KonSoft.Admin.Entities;
using KonSoft.Admin.IApplicationServices;
using KonSoft.Admin.Repositories;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Repositories;
namespace KonSoft.Admin.ApplicationServices
{
public class ProductAppService(IProductRepository repository) : ApplicationService, IProductService
{
private readonly IProductRepository repository = repository;
/// <summary>
/// 创建产品
/// </summary>
public async Task CreateAsync(CreateProductDto input)
{
var id = Guid.NewGuid();
var product = new Product(id, input.Name, input.Code, input.Price, input.Description, input.Type, input.ParentId, input.Status, input.Order);
await repository.InsertAsync(product);
}
/// <summary>
/// 删除
/// </summary>
public async Task DeleteAsync(Guid id)
{
await repository.DeleteAsync(x => x.Id == id);
}
/// <summary>
/// 查询
/// </summary>
public async Task<ProductDto> GetAsync(Guid id)
{
var product = await repository.GetAsync(x => x.Id == id);
return ObjectMapper.Map<Product, ProductDto>(product);
}
/// <summary>
/// 查询集合
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task<PagedResultDto<ProductDto>> GetListAsync(PagedResultRequestDto input)
{
var query = await repository.GetPageRootListAsync(input.SkipCount, input.MaxResultCount, x => x.ParentId == null);
var all = await repository.GetListAsync(x => x.ParentId != null);
foreach (var item in query)
{
BuildChildren(item, all);
}
var totalCount = await repository.CountAsync(x => x.ParentId == null);
var productDtos = ObjectMapper.Map<List<Product>, List<ProductDto>>(query);
return new PagedResultDto<ProductDto>(totalCount, productDtos);
}
private static void BuildChildren(Product parent, List<Product> all)
{
var children = all
.Where(x => x.ParentId == parent.Id)
.OrderBy(x => x.Order)
.ToList();
parent.Children = children;
foreach (var child in children)
{
BuildChildren(child, all); // 递归
}
}
/// <summary>
/// 修改
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task UpdateAsync(UpdateProductDto input)
{
// 根据ID查询订单，如果不存在则抛出异常【修改前端必然看到了,数据若查不到提示自定义异常信息】
var order = await repository.FindAsync(o => o.Id == input.Id) ??
throw new BusinessException("商品找不到").WithData("Id", input.Id);
// 将输入的DTO字段映射到订单实体
ObjectMapper.Map(input, order);
// 更新订单
await repository.UpdateAsync(order);
}
}
}

134
modules/admin/src/KonSoft.Admin.Application/ApplicationServices/ServiceCategoryAppService.cs
View File

@ -1,75 +1,77 @@
using KonSoft.Admin.Dtos; using System;
using KonSoft.Admin.Entities;
using KonSoft.Admin.IApplicationServices;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using KonSoft.Admin.Dtos;
using KonSoft.Admin.Entities;
using KonSoft.Admin.IApplicationServices;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
namespace KonSoft.Admin.ApplicationServices namespace KonSoft.Admin.ApplicationServices;
public class ServiceCategoryAppService : ApplicationService, IServiceCategoryAppService
{ {
public class ServiceCategoryAppService : ApplicationService, IServiceCategoryAppService private readonly IRepository<ServiceCategory, Guid> _repository;
public ServiceCategoryAppService(IRepository<ServiceCategory, Guid> repository)
{ {
private readonly IRepository<ServiceCategory, Guid> _repository; _repository = repository;
public ServiceCategoryAppService(IRepository<ServiceCategory, Guid> repository)
{
_repository = repository;
}
public async Task<ServiceCategoryDto> CreateAsync(CreateServiceCategoryDto input)
{
ServiceCategory parent = null;
if (input.ParentId.HasValue)
{
parent = await _repository.GetAsync(input.ParentId.Value);
}
var category = new ServiceCategory(Guid.NewGuid(), input.Name);
category.SetParent(parent);
await _repository.InsertAsync(category);
return ObjectMapper.Map<ServiceCategory, ServiceCategoryDto>(category);
}
public async Task DeleteAsync(Guid id)
{
var hasChildren = await _repository.AnyAsync(c => c.ParentId == id);
if (hasChildren) throw new InvalidOperationException("存在子节点无法删除!");
await _repository.DeleteAsync(o => o.Id == id);
}
public async Task<List<ServiceCategoryDto>> GetTreeAsync()
{
var allCategories = await _repository.GetListAsync();
// 构建树
var lookup = allCategories.ToDictionary(c => c.Id, c => ObjectMapper.Map<ServiceCategory, ServiceCategoryDto>(c));
var rootList = new List<ServiceCategoryDto>();
foreach (var dto in lookup.Values)
{
if (dto.ParentId.HasValue && lookup.ContainsKey(dto.ParentId.Value))
{
lookup[dto.ParentId.Value].Children.Add(dto);
}
else
{
rootList.Add(dto);
}
}
return rootList.OrderBy(c => c.Name).ToList();
}
} }
}
public async Task<ServiceCategoryDto> CreateAsync(CreateServiceCategoryDto input)
{
ServiceCategory parent = null;
if (input.ParentId.HasValue)
{
parent = await _repository.GetAsync(input.ParentId.Value);
}
var category = new ServiceCategory(Guid.NewGuid(), input.Name);
category.SetParent(parent);
await _repository.InsertAsync(category);
return ObjectMapper.Map<ServiceCategory, ServiceCategoryDto>(category);
}
public async Task DeleteAsync(Guid id)
{
var hasChildren = await _repository.AnyAsync(c => c.ParentId == id);
if (hasChildren)
{
throw new InvalidOperationException("存在子节点无法删除!");
}
await _repository.DeleteAsync(o => o.Id == id);
}
public async Task<List<ServiceCategoryDto>> GetTreeAsync()
{
var allCategories = await _repository.GetListAsync();
// 构建树
var lookup =
allCategories.ToDictionary(c => c.Id, c => ObjectMapper.Map<ServiceCategory, ServiceCategoryDto>(c));
var rootList = new List<ServiceCategoryDto>();
foreach (var dto in lookup.Values)
{
if (dto.ParentId.HasValue && lookup.ContainsKey(dto.ParentId.Value))
{
lookup[dto.ParentId.Value].Children.Add(dto);
}
else
{
rootList.Add(dto);
}
}
return rootList.OrderBy(c => c.Name).ToList();
}
}

20
modules/admin/src/KonSoft.Admin.Application/ApplicationServices/WorkerAppService.cs
View File

@ -1,20 +0,0 @@
using KonSoft.Admin.Dtos;
using KonSoft.Admin.Entities;
using KonSoft.Admin.IApplicationServices;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Repositories;
namespace KonSoft.Admin.ApplicationServices
{
public class WorkerAppService : CrudAppService<Worker, WorkerDto, Guid>, IWorkerAppService
{
public WorkerAppService(IRepository<Worker, Guid> repository) : base(repository)
{
}
}
}

27
modules/admin/src/KonSoft.Admin.Application/ApplicationServices/WorkerAssignmentService.cs
View File

@ -1,27 +0,0 @@
using KonSoft.Admin.Entities;
using KonSoft.Admin.IApplicationServices;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Repositories;
namespace KonSoft.Admin.ApplicationServices
{
/// <summary>
/// 分配家政人员 TODO
/// </summary>
public class WorkerAssignmentService : ApplicationService, IWorkerAssignmentService
{
private readonly IRepository<Worker, Guid> _workerRepository;
private readonly IRepository<Order, Guid> _orderRepository;
public WorkerAssignmentService(IRepository<Worker, Guid> workerRepository, IRepository<Order, Guid> orderRepository)
{
_workerRepository = workerRepository;
_orderRepository = orderRepository;
}
}
}

3
modules/admin/src/KonSoft.Admin.Application/Properties/AssemblyInfo.cs
View File

@ -1,2 +1,3 @@
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly:InternalsVisibleToAttribute("KonSoft.Admin.Application.Tests")]
[assembly: InternalsVisibleToAttribute("KonSoft.Admin.Application.Tests")]

2
modules/admin/src/KonSoft.Admin.Domain.Shared/AdminDomainErrorCodes.cs
View File

@ -3,4 +3,4 @@
public static class AdminDomainErrorCodes public static class AdminDomainErrorCodes
{ {
/* You can add your business exception error codes here, as constants */ /* You can add your business exception error codes here, as constants */
} }

11
modules/admin/src/KonSoft.Admin.Domain.Shared/AdminDomainSharedModule.cs
View File

@ -23,8 +23,8 @@ namespace KonSoft.Admin;
typeof(AbpOpenIddictDomainSharedModule), typeof(AbpOpenIddictDomainSharedModule),
typeof(AbpPermissionManagementDomainSharedModule), typeof(AbpPermissionManagementDomainSharedModule),
typeof(AbpSettingManagementDomainSharedModule), typeof(AbpSettingManagementDomainSharedModule),
typeof(AbpTenantManagementDomainSharedModule) typeof(AbpTenantManagementDomainSharedModule)
)] )]
public class AdminDomainSharedModule : AbpModule public class AdminDomainSharedModule : AbpModule
{ {
public override void PreConfigureServices(ServiceConfigurationContext context) public override void PreConfigureServices(ServiceConfigurationContext context)
@ -35,10 +35,7 @@ public class AdminDomainSharedModule : AbpModule
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {
Configure<AbpVirtualFileSystemOptions>(options => Configure<AbpVirtualFileSystemOptions>(options => { options.FileSets.AddEmbedded<AdminDomainSharedModule>(); });
{
options.FileSets.AddEmbedded<AdminDomainSharedModule>();
});
Configure<AbpLocalizationOptions>(options => Configure<AbpLocalizationOptions>(options =>
{ {
@ -55,4 +52,4 @@ public class AdminDomainSharedModule : AbpModule
options.MapCodeNamespace("Admin", typeof(AdminResource)); options.MapCodeNamespace("Admin", typeof(AdminResource));
}); });
} }
} }

18
modules/admin/src/KonSoft.Admin.Domain.Shared/AdminGlobalFeatureConfigurator.cs
View File

@ -4,19 +4,19 @@ namespace KonSoft.Admin;
public static class AdminGlobalFeatureConfigurator public static class AdminGlobalFeatureConfigurator
{ {
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); private static readonly OneTimeRunner OneTimeRunner = new();
public static void Configure() public static void Configure()
{ {
OneTimeRunner.Run(() => OneTimeRunner.Run(() =>
{ {
/* You can configure (enable/disable) global features of the used modules here. /* You can configure (enable/disable) global features of the used modules here.
* *
* YOU CAN SAFELY DELETE THIS CLASS AND REMOVE ITS USAGES IF YOU DON'T NEED TO IT! * YOU CAN SAFELY DELETE THIS CLASS AND REMOVE ITS USAGES IF YOU DON'T NEED TO IT!
* *
* Please refer to the documentation to lear more about the Global Features System: * Please refer to the documentation to lear more about the Global Features System:
* https://docs.abp.io/en/abp/latest/Global-Features * https://docs.abp.io/en/abp/latest/Global-Features
*/ */
}); });
} }
} }

11
modules/admin/src/KonSoft.Admin.Domain.Shared/AdminModuleExtensionConfigurator.cs
View File

@ -1,13 +1,10 @@
using System.ComponentModel.DataAnnotations; using Volo.Abp.Threading;
using Volo.Abp.Identity;
using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading;
namespace KonSoft.Admin; namespace KonSoft.Admin;
public static class AdminModuleExtensionConfigurator public static class AdminModuleExtensionConfigurator
{ {
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); private static readonly OneTimeRunner OneTimeRunner = new();
public static void Configure() public static void Configure()
{ {
@ -57,7 +54,7 @@ public static class AdminModuleExtensionConfigurator
//validation rules //validation rules
property.Attributes.Add(new RequiredAttribute()); property.Attributes.Add(new RequiredAttribute());
property.Attributes.Add(new StringLengthAttribute(64) {MinimumLength = 4}); property.Attributes.Add(new StringLengthAttribute(64) {MinimumLength = 4});
property.Configuration[IdentityModuleExtensionConsts.ConfigurationNames.AllowUserToEdit] = true; property.Configuration[IdentityModuleExtensionConsts.ConfigurationNames.AllowUserToEdit] = true;
//...other configurations for this property //...other configurations for this property
@ -70,4 +67,4 @@ public static class AdminModuleExtensionConfigurator
* https://docs.abp.io/en/abp/latest/Module-Entity-Extensions * https://docs.abp.io/en/abp/latest/Module-Entity-Extensions
*/ */
} }
} }

32
modules/admin/src/KonSoft.Admin.Domain.Shared/Enums/OrderStatus.cs
View File

@ -1,22 +1,14 @@
using System; namespace KonSoft.Admin.Enums;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KonSoft.Admin.Enums public enum OrderStatus
{ {
public enum OrderStatus PendingPayment, // 待支付
{ PaidWaitingAssign, // 已支付待派单
PendingPayment, // 待支付 AssignedWaitingService, // 已派单待服务
PaidWaitingAssign, // 已支付待派单 InService, // 服务中
AssignedWaitingService, // 已派单待服务 WaitingConfirm, // 待用户确认
InService, // 服务中 Completed, // 已完成
WaitingConfirm, // 待用户确认 Canceled, // 已取消
Completed, // 已完成 Refunding, // 退款中
Canceled, // 已取消 Refunded // 已退款
Refunding, // 退款中 }
Refunded // 已退款
}
}

3
modules/admin/src/KonSoft.Admin.Domain.Shared/Localization/AdminResource.cs
View File

@ -5,5 +5,4 @@ namespace KonSoft.Admin.Localization;
[LocalizationResourceName("Admin")] [LocalizationResourceName("Admin")]
public class AdminResource public class AdminResource
{ {
}
}

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

@ -5,4 +5,4 @@ public static class AdminConsts
public const string DbTablePrefix = "App"; public const string DbTablePrefix = "App";
public const string DbSchema = null; public const string DbSchema = null;
} }

3
modules/admin/src/KonSoft.Admin.Domain/AdminDomainModule.cs
View File

@ -7,7 +7,6 @@ using Volo.Abp.FeatureManagement;
using Volo.Abp.Identity; using Volo.Abp.Identity;
using Volo.Abp.Localization; using Volo.Abp.Localization;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.MultiTenancy;
using Volo.Abp.OpenIddict; using Volo.Abp.OpenIddict;
using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.PermissionManagement.Identity;
using Volo.Abp.PermissionManagement.OpenIddict; using Volo.Abp.PermissionManagement.OpenIddict;
@ -60,4 +59,4 @@ public class AdminDomainModule : AbpModule
context.Services.Replace(ServiceDescriptor.Singleton<IEmailSender, NullEmailSender>()); context.Services.Replace(ServiceDescriptor.Singleton<IEmailSender, NullEmailSender>());
#endif #endif
} }
} }

27
modules/admin/src/KonSoft.Admin.Domain/Data/AdminDbMigrationService.cs
View File

@ -17,12 +17,11 @@ namespace KonSoft.Admin.Data;
public class AdminDbMigrationService : ITransientDependency public class AdminDbMigrationService : ITransientDependency
{ {
public ILogger<AdminDbMigrationService> Logger { get; set; } private readonly ICurrentTenant _currentTenant;
private readonly IDataSeeder _dataSeeder; private readonly IDataSeeder _dataSeeder;
private readonly IEnumerable<IAdminDbSchemaMigrator> _dbSchemaMigrators; private readonly IEnumerable<IAdminDbSchemaMigrator> _dbSchemaMigrators;
private readonly ITenantRepository _tenantRepository; private readonly ITenantRepository _tenantRepository;
private readonly ICurrentTenant _currentTenant;
public AdminDbMigrationService( public AdminDbMigrationService(
IDataSeeder dataSeeder, IDataSeeder dataSeeder,
@ -38,6 +37,8 @@ public class AdminDbMigrationService : ITransientDependency
Logger = NullLogger<AdminDbMigrationService>.Instance; Logger = NullLogger<AdminDbMigrationService>.Instance;
} }
public ILogger<AdminDbMigrationService> Logger { get; set; }
public async Task MigrateAsync() public async Task MigrateAsync()
{ {
var initialMigrationAdded = AddInitialMigrationIfNotExist(); var initialMigrationAdded = AddInitialMigrationIfNotExist();
@ -52,7 +53,7 @@ public class AdminDbMigrationService : ITransientDependency
await MigrateDatabaseSchemaAsync(); await MigrateDatabaseSchemaAsync();
await SeedDataAsync(); await SeedDataAsync();
Logger.LogInformation($"Successfully completed host database migrations."); Logger.LogInformation("Successfully completed host database migrations.");
var tenants = await _tenantRepository.GetListAsync(includeDetails: true); var tenants = await _tenantRepository.GetListAsync(includeDetails: true);
@ -101,8 +102,10 @@ public class AdminDbMigrationService : ITransientDependency
Logger.LogInformation($"Executing {(tenant == null ? "host" : tenant.Name + " tenant")} database seed..."); Logger.LogInformation($"Executing {(tenant == null ? "host" : tenant.Name + " tenant")} database seed...");
await _dataSeeder.SeedAsync(new DataSeedContext(tenant?.Id) await _dataSeeder.SeedAsync(new DataSeedContext(tenant?.Id)
.WithProperty(IdentityDataSeedContributor.AdminEmailPropertyName, IdentityDataSeedContributor.AdminEmailDefaultValue) .WithProperty(IdentityDataSeedContributor.AdminEmailPropertyName,
.WithProperty(IdentityDataSeedContributor.AdminPasswordPropertyName, IdentityDataSeedContributor.AdminPasswordDefaultValue) IdentityDataSeedContributor.AdminEmailDefaultValue)
.WithProperty(IdentityDataSeedContributor.AdminPasswordPropertyName,
IdentityDataSeedContributor.AdminPasswordDefaultValue)
); );
} }
@ -127,10 +130,8 @@ public class AdminDbMigrationService : ITransientDependency
AddInitialMigration(); AddInitialMigration();
return true; return true;
} }
else
{ return false;
return false;
}
} }
catch (Exception e) catch (Exception e)
{ {
@ -149,7 +150,8 @@ public class AdminDbMigrationService : ITransientDependency
private bool MigrationsFolderExists() private bool MigrationsFolderExists()
{ {
var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath(); var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath();
return dbMigrationsProjectFolder != null && Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations")); return dbMigrationsProjectFolder != null &&
Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations"));
} }
private void AddInitialMigration() private void AddInitialMigration()
@ -207,7 +209,8 @@ public class AdminDbMigrationService : ITransientDependency
{ {
currentDirectory = Directory.GetParent(currentDirectory.FullName); currentDirectory = Directory.GetParent(currentDirectory.FullName);
if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null) if (currentDirectory != null &&
Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
{ {
return currentDirectory.FullName; return currentDirectory.FullName;
} }
@ -215,4 +218,4 @@ public class AdminDbMigrationService : ITransientDependency
return null; return null;
} }
} }

2
modules/admin/src/KonSoft.Admin.Domain/Data/IAdminDbSchemaMigrator.cs
View File

@ -5,4 +5,4 @@ namespace KonSoft.Admin.Data;
public interface IAdminDbSchemaMigrator public interface IAdminDbSchemaMigrator
{ {
Task MigrateAsync(); Task MigrateAsync();
} }

2
modules/admin/src/KonSoft.Admin.Domain/Data/NullAdminDbSchemaMigrator.cs
View File

@ -12,4 +12,4 @@ public class NullAdminDbSchemaMigrator : IAdminDbSchemaMigrator, ITransientDepen
{ {
return Task.CompletedTask; return Task.CompletedTask;
} }
} }

108
modules/admin/src/KonSoft.Admin.Domain/Entities/AddressInfo.cs
View File

@ -1,60 +1,58 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Domain.Values; using Volo.Abp.Domain.Values;
namespace KonSoft.Admin.Entities namespace KonSoft.Admin.Entities;
/// <summary>
/// 地址
/// </summary>
public class AddressInfo : ValueObject
{ {
/// <summary> public AddressInfo()
/// 地址
/// </summary>
public class AddressInfo : ValueObject
{ {
/// <summary>
/// 联系人
/// </summary>
public string ContactName { get; private set; }
/// <summary>
/// 手机号
/// </summary>
public string ContactPhone { get; private set; }
/// <summary>
/// 详细地址
/// </summary>
public string DetailAddress { get; private set; }
/// <summary>
/// 城市
/// </summary>
public string City { get; private set; }
/// <summary>
/// 区域
/// </summary>
public string District { get; private set; }
public AddressInfo() { }
public AddressInfo(string contactName, string contactPhone, string detailAddress, string city, string district)
{
ContactName = contactName;
ContactPhone = contactPhone;
DetailAddress = detailAddress;
City = city;
District = district;
}
protected override IEnumerable<object> GetAtomicValues()
{
yield return ContactName;
yield return ContactPhone;
yield return DetailAddress;
yield return City;
yield return District;
}
} }
}
public AddressInfo(string contactName, string contactPhone, string detailAddress, string city, string district)
{
ContactName = contactName;
ContactPhone = contactPhone;
DetailAddress = detailAddress;
City = city;
District = district;
}
/// <summary>
/// 联系人
/// </summary>
public string ContactName { get; }
/// <summary>
/// 手机号
/// </summary>
public string ContactPhone { get; }
/// <summary>
/// 详细地址
/// </summary>
public string DetailAddress { get; }
/// <summary>
/// 城市
/// </summary>
public string City { get; }
/// <summary>
/// 区域
/// </summary>
public string District { get; }
protected override IEnumerable<object> GetAtomicValues()
{
yield return ContactName;
yield return ContactPhone;
yield return DetailAddress;
yield return City;
yield return District;
}
}

24
modules/admin/src/KonSoft.Admin.Domain/Entities/HouseholdWorker.cs Normal file
View File

@ -0,0 +1,24 @@
using Volo.Abp.Identity;
namespace KonSoft.Admin.Entities;
/// <summary>
/// 家政服务工人实体
/// </summary>
public class HouseholdWorker : IdentityUser
{
/// <summary>
/// 接单数
/// </summary>
public int OrderCount { get; set; }
/// <summary>
/// 职业
/// </summary>
public required string Profession { get; set; }
/// <summary>
/// 能力范围
/// </summary>
public required string ScopeOfCompetence { get; set; }
}

318
modules/admin/src/KonSoft.Admin.Domain/Entities/Order.cs
View File

@ -1,157 +1,171 @@
using KonSoft.Admin.Enums; using System;
using System; using KonSoft.Admin.Enums;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.Identity;
namespace KonSoft.Admin.Entities namespace KonSoft.Admin.Entities;
public class Order : FullAuditedAggregateRoot<Guid>
{ {
public class Order : FullAuditedAggregateRoot<Guid> protected Order()
{ {
/// <summary>
/// 订单编号
/// </summary>
public string OrderSN { get; private set; }
/// <summary>
/// 用户ID
/// </summary>
public Guid CustomerId { get; private set; }
/// <summary>
/// 家政人员ID
/// </summary>
public Guid? WorkerId { get; private set; }
///// <summary>
///// 用户ID
///// </summary>
//public virtual IdentityUser Customer { get; private set; }
///// <summary>
///// 家政人员ID
///// </summary>
//public virtual IdentityUser? Worker { get; private set; }
/// <summary>
/// 服务项目ID
/// </summary>
public Guid ServiceCategoryId { get; private set; }
public virtual ServiceCategory ServiceCategory { get; private set; }
/// <summary>
/// 服务预约时间
/// </summary>
public DateTime ServiceTime { get; private set; }
public OrderStatus Status { get; private set; }
/// <summary>
/// 应付金额
/// </summary>
public decimal Amount { get; private set; }
/// <summary>
/// 实付金额
/// </summary>
public decimal PaidAmount { get; private set; }
/// <summary>
/// 支付方式
/// </summary>
public string PaymentMethod { get; private set; }
/// <summary>
/// 地址
/// </summary>
public AddressInfo Address { get; private set; }
/// <summary>
/// 备注
/// </summary>
public string? Remark { get; private set; }
/// <summary>
/// 取消原因
/// </summary>
public string? CancelReason { get; private set; }
protected Order() { }
public Order(Guid id, string orderSN, Guid customerId, Guid serviceCategoryId, DateTime serviceTime, decimal amount, AddressInfo address, string remark = null)
: base(id)
{
OrderSN = orderSN;
CustomerId = customerId;
ServiceCategoryId = serviceCategoryId;
ServiceTime = serviceTime;
Amount = amount;
Address = address;
Remark = remark;
Status = OrderStatus.PendingPayment;
}
public void MarkPaid(decimal paidAmount, string method)
{
if (Status != OrderStatus.PendingPayment)
throw new InvalidOperationException("订单不在待付款状态");
PaidAmount = paidAmount;
PaymentMethod = method;
Status = OrderStatus.PaidWaitingAssign;
}
public void AssignWorker(Guid workerId)
{
if (Status != OrderStatus.PaidWaitingAssign)
throw new InvalidOperationException("订单无法分配师傅");
WorkerId = workerId;
Status = OrderStatus.AssignedWaitingService;
}
public void StartService()
{
if (Status != OrderStatus.AssignedWaitingService)
throw new InvalidOperationException("订单无法开始");
Status = OrderStatus.InService;
}
public void CompleteService()
{
if (Status != OrderStatus.InService)
throw new InvalidOperationException("订单未开始服务,无法完成");
Status = OrderStatus.WaitingConfirm;
}
public void ConfirmCompletion()
{
if (Status != OrderStatus.WaitingConfirm)
throw new InvalidOperationException("订单无法确认");
Status = OrderStatus.Completed;
}
public void Cancel(string reason)
{
// 若已完成或退款中则不可取消
if (Status == OrderStatus.Completed || Status == OrderStatus.Refunding || Status == OrderStatus.Refunded)
throw new InvalidOperationException("订单无法被取消");
CancelReason = reason;
Status = OrderStatus.Canceled;
}
} }
}
public Order(Guid id, string orderSN, Guid customerId, Guid serviceCategoryId, DateTime serviceTime, decimal amount,
AddressInfo address, string remark = null)
: base(id)
{
OrderSN = orderSN;
CustomerId = customerId;
ServiceCategoryId = serviceCategoryId;
ServiceTime = serviceTime;
Amount = amount;
Address = address;
Remark = remark;
Status = OrderStatus.PendingPayment;
}
/// <summary>
/// 订单编号
/// </summary>
public string OrderSN { get; private set; }
/// <summary>
/// 用户ID
/// </summary>
public Guid CustomerId { get; private set; }
/// <summary>
/// 家政人员ID
/// </summary>
public Guid? WorkerId { get; private set; }
///// <summary>
///// 用户ID
///// </summary>
//public virtual IdentityUser Customer { get; private set; }
///// <summary>
///// 家政人员ID
///// </summary>
//public virtual IdentityUser? Worker { get; private set; }
/// <summary>
/// 服务项目ID
/// </summary>
public Guid ServiceCategoryId { get; private set; }
public virtual ServiceCategory ServiceCategory { get; private set; }
/// <summary>
/// 服务预约时间
/// </summary>
public DateTime ServiceTime { get; private set; }
public OrderStatus Status { get; private set; }
/// <summary>
/// 应付金额
/// </summary>
public decimal Amount { get; private set; }
/// <summary>
/// 实付金额
/// </summary>
public decimal PaidAmount { get; private set; }
/// <summary>
/// 支付方式
/// </summary>
public string PaymentMethod { get; private set; }
/// <summary>
/// 地址
/// </summary>
public AddressInfo Address { get; private set; }
/// <summary>
/// 备注
/// </summary>
public string? Remark { get; private set; }
/// <summary>
/// 取消原因
/// </summary>
public string? CancelReason { get; private set; }
public void MarkPaid(decimal paidAmount, string method)
{
if (Status != OrderStatus.PendingPayment)
{
throw new InvalidOperationException("订单不在待付款状态");
}
PaidAmount = paidAmount;
PaymentMethod = method;
Status = OrderStatus.PaidWaitingAssign;
}
public void AssignWorker(Guid workerId)
{
if (Status != OrderStatus.PaidWaitingAssign)
{
throw new InvalidOperationException("订单无法分配师傅");
}
WorkerId = workerId;
Status = OrderStatus.AssignedWaitingService;
}
public void StartService()
{
if (Status != OrderStatus.AssignedWaitingService)
{
throw new InvalidOperationException("订单无法开始");
}
Status = OrderStatus.InService;
}
public void CompleteService()
{
if (Status != OrderStatus.InService)
{
throw new InvalidOperationException("订单未开始服务,无法完成");
}
Status = OrderStatus.WaitingConfirm;
}
public void ConfirmCompletion()
{
if (Status != OrderStatus.WaitingConfirm)
{
throw new InvalidOperationException("订单无法确认");
}
Status = OrderStatus.Completed;
}
public void Cancel(string reason)
{
// 若已完成或退款中则不可取消
if (Status == OrderStatus.Completed || Status == OrderStatus.Refunding || Status == OrderStatus.Refunded)
{
throw new InvalidOperationException("订单无法被取消");
}
CancelReason = reason;
Status = OrderStatus.Canceled;
}
}

178
modules/admin/src/KonSoft.Admin.Domain/Entities/Product.cs
View File

@ -1,99 +1,105 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.Domain.Entities.Auditing;
namespace KonSoft.Admin.Entities namespace KonSoft.Admin.Entities;
public class Product(
Guid id,
string name,
string code,
decimal price,
string description,
string type,
Guid? parentId,
string status = "在售",
int order = 0) : FullAuditedAggregateRoot<Guid>(id)
{ {
public class Product(Guid id, string name, string code, decimal price, string description, string type, Guid? parentId, string status = "在售", int order = 0) : FullAuditedAggregateRoot<Guid>(id) /// <summary>
/// 分类名称
/// </summary>
public string Name { get; private set; } = name;
/// <summary>
/// 商品编码
/// </summary>
public string Code { get; private set; } = code;
/// <summary>
/// 商品价格
/// </summary>
public decimal Price { get; private set; } = price;
/// <summary>
/// 商品描述
/// </summary>
public string Description { get; private set; } = description;
/// <summary>
/// 分类类型（大类或小类）
/// </summary>
public string Type { get; private set; } = type;
/// <summary>
/// 父分类ID
/// </summary>
public Guid? ParentId { get; private set; } = parentId;
/// <summary>
/// 商品状态（在售/下架等）
/// </summary>
public string Status { get; private set; } = status;
/// <summary>
/// 排序字段
/// </summary>
public int Order { get; private set; } = order;
[NotMapped] public List<Product> Children { get; set; } = new();
/// <summary>
/// 修改商品信息
/// </summary>
public void Update(string name, string code, decimal price, string description, int order)
{ {
/// <summary> Name = name;
/// 分类名称 Code = code;
/// </summary> Price = price;
public string Name { get; private set; } = name; Description = description;
Order = order;
}
/// <summary> /// <summary>
/// 商品编码 /// 修改商品分类
/// </summary> /// </summary>
public string Code { get; private set; } = code; public void ChangeCategory(string type, Guid? parentId)
{
Type = type;
ParentId = parentId;
}
/// <summary> /// <summary>
/// 商品价格 /// 上架商品
/// </summary> /// </summary>
public decimal Price { get; private set; } = price; public void PutOnSale()
{
Status = "在售";
}
/// <summary> /// <summary>
/// 商品描述 /// 下架商品
/// </summary> /// </summary>
public string Description { get; private set; } = description; public void TakeOffSale()
{
Status = "下架";
}
/// <summary> /// <summary>
/// 分类类型（大类或小类） /// 修改价格
/// </summary> /// </summary>
public string Type { get; private set; } = type; public void ChangePrice(decimal newPrice)
{
/// <summary> Price = newPrice;
/// 父分类ID
/// </summary>
public Guid? ParentId { get; private set; } = parentId;
/// <summary>
/// 商品状态（在售/下架等）
/// </summary>
public string Status { get; private set; } = status;
/// <summary>
/// 排序字段
/// </summary>
public int Order { get; private set; } = order;
[NotMapped]
public List<Product> Children { get; set; } = new();
/// <summary>
/// 修改商品信息
/// </summary>
public void Update(string name, string code, decimal price, string description, int order)
{
Name = name;
Code = code;
Price = price;
Description = description;
Order = order;
}
/// <summary>
/// 修改商品分类
/// </summary>
public void ChangeCategory(string type, Guid? parentId)
{
Type = type;
ParentId = parentId;
}
/// <summary>
/// 上架商品
/// </summary>
public void PutOnSale()
{
Status = "在售";
}
/// <summary>
/// 下架商品
/// </summary>
public void TakeOffSale()
{
Status = "下架";
}
/// <summary>
/// 修改价格
/// </summary>
public void ChangePrice(decimal newPrice)
{
Price = newPrice;
}
} }
} }

78
modules/admin/src/KonSoft.Admin.Domain/Entities/ServiceCategory.cs
View File

@ -1,46 +1,44 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.Domain.Entities.Auditing;
namespace KonSoft.Admin.Entities namespace KonSoft.Admin.Entities;
public class ServiceCategory : FullAuditedAggregateRoot<Guid>
{ {
public class ServiceCategory : FullAuditedAggregateRoot<Guid> protected ServiceCategory()
{ {
public string Name { get; private set; }
public Guid? ParentId { get; private set; }
public string Path { get; private set; }
public int Level { get; private set; }
protected ServiceCategory() { }
public ServiceCategory(Guid id, string name)
: base(id)
{
Name = name;
}
public ServiceCategory(Guid id, string name, Guid? parentId = null, string path = null, int level = 0) : base(id)
{
Name = name;
ParentId = parentId;
Path = path ?? id.ToString();
Level = level;
}
public void UpdateName(string name) => Name = name;
public void SetParent(ServiceCategory parent)
{
ParentId = parent?.Id;
Level = (parent?.Level ?? 0) + 1;
Path = parent != null ? $"{parent.Path}/{Id}" : Id.ToString();
}
} }
}
public ServiceCategory(Guid id, string name)
: base(id)
{
Name = name;
}
public ServiceCategory(Guid id, string name, Guid? parentId = null, string path = null, int level = 0) : base(id)
{
Name = name;
ParentId = parentId;
Path = path ?? id.ToString();
Level = level;
}
public string Name { get; private set; }
public Guid? ParentId { get; private set; }
public string Path { get; private set; }
public int Level { get; private set; }
public void UpdateName(string name)
{
Name = name;
}
public void SetParent(ServiceCategory parent)
{
ParentId = parent?.Id;
Level = (parent?.Level ?? 0) + 1;
Path = parent != null ? $"{parent.Path}/{Id}" : Id.ToString();
}
}

34
modules/admin/src/KonSoft.Admin.Domain/Entities/Worker.cs
View File

@ -1,34 +0,0 @@
using KonSoft.Admin.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Domain.Entities.Auditing;
namespace KonSoft.Admin.Entities
{
/// <summary>
/// 家政人员
/// </summary>
public class Worker : FullAuditedAggregateRoot<Guid>
{
public string Name { get; private set; }
public string Phone { get; private set; }
public decimal Rating { get; private set; } // 评分
public List<Guid> SkillCategoryIds { get; private set; } = new List<Guid>();
public Worker() { }
public void UpdateRating(decimal newRating)
{
Rating = newRating;
}
public bool CanPerform(Guid serviceCategoryId)
{
return SkillCategoryIds.Contains(serviceCategoryId);
}
}
}

8
modules/admin/src/KonSoft.Admin.Domain/IRepositories/IHouseholdWorkerRepository.cs Normal file
View File

@ -0,0 +1,8 @@
using KonSoft.Admin.Entities;
using Volo.Abp.Domain.Repositories;
namespace KonSoft.Admin.IRepositories;
public interface IHouseholdWorkerRepository : IRepository<HouseholdWorker>
{
}

14
modules/admin/src/KonSoft.Admin.Domain/IRepositories/IOrderRepository.cs
View File

@ -1,14 +1,8 @@
using KonSoft.Admin.Entities; using KonSoft.Admin.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
namespace KonSoft.Admin.Repositories namespace KonSoft.Admin.IRepositories;
public interface IOrderRepository : IRepository<Order>
{ {
public interface IOrderRepository : IRepository<Order> }
{
}
}

15
modules/admin/src/KonSoft.Admin.Domain/IRepositories/IProductRepository.cs
View File

@ -1,14 +1,13 @@
using KonSoft.Admin.Entities; using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using KonSoft.Admin.Entities;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
namespace KonSoft.Admin.Repositories namespace KonSoft.Admin.IRepositories;
public interface IProductRepository : IRepository<Product>
{ {
public interface IProductRepository : IRepository<Product> Task<List<Product>> GetPageRootListAsync(int skipCount, int maxResult, Expression<Func<Product, bool>> where);
{ }
Task<List<Product>> GetPageRootListAsync(int skipCount, int maxResult, Expression<Func<Product, bool>> where);
}
}

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

@ -23,12 +23,12 @@ namespace KonSoft.Admin.OpenIddict;
*/ */
public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDependency public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDependency
{ {
private readonly IAbpApplicationManager _applicationManager;
private readonly IConfiguration _configuration; private readonly IConfiguration _configuration;
private readonly IOpenIddictApplicationRepository _openIddictApplicationRepository; private readonly IOpenIddictApplicationRepository _openIddictApplicationRepository;
private readonly IAbpApplicationManager _applicationManager;
private readonly IOpenIddictScopeRepository _openIddictScopeRepository; private readonly IOpenIddictScopeRepository _openIddictScopeRepository;
private readonly IOpenIddictScopeManager _scopeManager;
private readonly IPermissionDataSeeder _permissionDataSeeder; private readonly IPermissionDataSeeder _permissionDataSeeder;
private readonly IOpenIddictScopeManager _scopeManager;
private readonly IStringLocalizer<OpenIddictResponse> L; private readonly IStringLocalizer<OpenIddictResponse> L;
public OpenIddictDataSeedContributor( public OpenIddictDataSeedContributor(
@ -38,7 +38,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
IOpenIddictScopeRepository openIddictScopeRepository, IOpenIddictScopeRepository openIddictScopeRepository,
IOpenIddictScopeManager scopeManager, IOpenIddictScopeManager scopeManager,
IPermissionDataSeeder permissionDataSeeder, IPermissionDataSeeder permissionDataSeeder,
IStringLocalizer<OpenIddictResponse> l ) IStringLocalizer<OpenIddictResponse> l)
{ {
_configuration = configuration; _configuration = configuration;
_openIddictApplicationRepository = openIddictApplicationRepository; _openIddictApplicationRepository = openIddictApplicationRepository;
@ -60,7 +60,8 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
{ {
if (await _openIddictScopeRepository.FindByNameAsync("Admin") == null) if (await _openIddictScopeRepository.FindByNameAsync("Admin") == null)
{ {
await _scopeManager.CreateAsync(new OpenIddictScopeDescriptor { await _scopeManager.CreateAsync(new OpenIddictScopeDescriptor
{
Name = "Admin", DisplayName = "Admin API", Resources = { "Admin" } Name = "Admin", DisplayName = "Admin API", Resources = { "Admin" }
}); });
} }
@ -68,7 +69,8 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
private async Task CreateApplicationsAsync() private async Task CreateApplicationsAsync()
{ {
var commonScopes = new List<string> { var commonScopes = new List<string>
{
OpenIddictConstants.Permissions.Scopes.Address, OpenIddictConstants.Permissions.Scopes.Address,
OpenIddictConstants.Permissions.Scopes.Email, OpenIddictConstants.Permissions.Scopes.Email,
OpenIddictConstants.Permissions.Scopes.Phone, OpenIddictConstants.Permissions.Scopes.Phone,
@ -80,10 +82,6 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
var configurationSection = _configuration.GetSection("OpenIddict:Applications"); var configurationSection = _configuration.GetSection("OpenIddict:Applications");
// Swagger Client // Swagger Client
var swaggerClientId = configurationSection["Admin_Swagger:ClientId"]; var swaggerClientId = configurationSection["Admin_Swagger:ClientId"];
if (!swaggerClientId.IsNullOrWhiteSpace()) if (!swaggerClientId.IsNullOrWhiteSpace())
@ -91,13 +89,13 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
var swaggerRootUrl = configurationSection["Admin_Swagger:RootUrl"]?.TrimEnd('/'); var swaggerRootUrl = configurationSection["Admin_Swagger:RootUrl"]?.TrimEnd('/');
await CreateApplicationAsync( await CreateApplicationAsync(
name: swaggerClientId!, swaggerClientId!,
type: OpenIddictConstants.ClientTypes.Public, OpenIddictConstants.ClientTypes.Public,
consentType: OpenIddictConstants.ConsentTypes.Implicit, OpenIddictConstants.ConsentTypes.Implicit,
displayName: "Swagger Application", "Swagger Application",
secret: null, null,
grantTypes: [OpenIddictConstants.GrantTypes.AuthorizationCode], [OpenIddictConstants.GrantTypes.AuthorizationCode],
scopes: commonScopes, commonScopes,
redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html", redirectUri: $"{swaggerRootUrl}/swagger/oauth2-redirect.html",
clientUri: swaggerRootUrl clientUri: swaggerRootUrl
); );
@ -131,13 +129,14 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
var client = await _openIddictApplicationRepository.FindByClientIdAsync(name); var client = await _openIddictApplicationRepository.FindByClientIdAsync(name);
var application = new AbpApplicationDescriptor { var application = new AbpApplicationDescriptor
{
ClientId = name, ClientId = name,
ClientType = type, ClientType = type,
ClientSecret = secret, ClientSecret = secret,
ConsentType = consentType, ConsentType = consentType,
DisplayName = displayName, DisplayName = displayName,
ClientUri = clientUri, ClientUri = clientUri
}; };
Check.NotNullOrEmpty(grantTypes, nameof(grantTypes)); Check.NotNullOrEmpty(grantTypes, nameof(grantTypes));
@ -160,7 +159,8 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Logout); application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Logout);
} }
var buildInGrantTypes = new[] { var buildInGrantTypes = new[]
{
OpenIddictConstants.GrantTypes.Implicit, OpenIddictConstants.GrantTypes.Password, OpenIddictConstants.GrantTypes.Implicit, OpenIddictConstants.GrantTypes.Password,
OpenIddictConstants.GrantTypes.AuthorizationCode, OpenIddictConstants.GrantTypes.ClientCredentials, OpenIddictConstants.GrantTypes.AuthorizationCode, OpenIddictConstants.GrantTypes.ClientCredentials,
OpenIddictConstants.GrantTypes.DeviceCode, OpenIddictConstants.GrantTypes.RefreshToken OpenIddictConstants.GrantTypes.DeviceCode, OpenIddictConstants.GrantTypes.RefreshToken
@ -233,7 +233,8 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
} }
} }
var buildInScopes = new[] { var buildInScopes = new[]
{
OpenIddictConstants.Permissions.Scopes.Address, OpenIddictConstants.Permissions.Scopes.Email, OpenIddictConstants.Permissions.Scopes.Address, OpenIddictConstants.Permissions.Scopes.Email,
OpenIddictConstants.Permissions.Scopes.Phone, OpenIddictConstants.Permissions.Scopes.Profile, OpenIddictConstants.Permissions.Scopes.Phone, OpenIddictConstants.Permissions.Scopes.Profile,
OpenIddictConstants.Permissions.Scopes.Roles OpenIddictConstants.Permissions.Scopes.Roles
@ -289,8 +290,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
await _permissionDataSeeder.SeedAsync( await _permissionDataSeeder.SeedAsync(
ClientPermissionValueProvider.ProviderName, ClientPermissionValueProvider.ProviderName,
name, name,
permissions, permissions
null
); );
} }
@ -302,8 +302,10 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
if (!HasSameRedirectUris(client, application)) if (!HasSameRedirectUris(client, application))
{ {
client.RedirectUris = JsonSerializer.Serialize(application.RedirectUris.Select(q => q.ToString().TrimEnd('/'))); client.RedirectUris =
client.PostLogoutRedirectUris = JsonSerializer.Serialize(application.PostLogoutRedirectUris.Select(q => q.ToString().TrimEnd('/'))); JsonSerializer.Serialize(application.RedirectUris.Select(q => q.ToString().TrimEnd('/')));
client.PostLogoutRedirectUris =
JsonSerializer.Serialize(application.PostLogoutRedirectUris.Select(q => q.ToString().TrimEnd('/')));
await _applicationManager.UpdateAsync(client.ToModel()); await _applicationManager.UpdateAsync(client.ToModel());
} }
@ -317,11 +319,13 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
private bool HasSameRedirectUris(OpenIddictApplication existingClient, AbpApplicationDescriptor application) private bool HasSameRedirectUris(OpenIddictApplication existingClient, AbpApplicationDescriptor application)
{ {
return existingClient.RedirectUris == JsonSerializer.Serialize(application.RedirectUris.Select(q => q.ToString().TrimEnd('/'))); return existingClient.RedirectUris ==
JsonSerializer.Serialize(application.RedirectUris.Select(q => q.ToString().TrimEnd('/')));
} }
private bool HasSameScopes(OpenIddictApplication existingClient, AbpApplicationDescriptor application) private bool HasSameScopes(OpenIddictApplication existingClient, AbpApplicationDescriptor application)
{ {
return existingClient.Permissions == JsonSerializer.Serialize(application.Permissions.Select(q => q.ToString().TrimEnd('/'))); return existingClient.Permissions ==
JsonSerializer.Serialize(application.Permissions.Select(q => q.ToString().TrimEnd('/')));
} }
} }

5
modules/admin/src/KonSoft.Admin.Domain/Properties/AssemblyInfo.cs
View File

@ -1,3 +1,4 @@
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly:InternalsVisibleToAttribute("KonSoft.Admin.Domain.Tests")]
[assembly:InternalsVisibleToAttribute("KonSoft.Admin.TestBase")] [assembly: InternalsVisibleToAttribute("KonSoft.Admin.Domain.Tests")]
[assembly: InternalsVisibleToAttribute("KonSoft.Admin.TestBase")]

2
modules/admin/src/KonSoft.Admin.Domain/Settings/AdminSettingDefinitionProvider.cs
View File

@ -9,4 +9,4 @@ public class AdminSettingDefinitionProvider : SettingDefinitionProvider
//Define your own settings here. Example: //Define your own settings here. Example:
//context.Add(new SettingDefinition(AdminSettings.MySetting1)); //context.Add(new SettingDefinition(AdminSettings.MySetting1));
} }
} }

2
modules/admin/src/KonSoft.Admin.Domain/Settings/AdminSettings.cs
View File

@ -6,4 +6,4 @@ public static class AdminSettings
//Add your own setting names here. Example: //Add your own setting names here. Example:
//public const string MySetting1 = Prefix + ".MySetting1"; //public const string MySetting1 = Prefix + ".MySetting1";
} }

69
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs
View File

@ -24,54 +24,15 @@ public class AdminDbContext :
IIdentityDbContext, IIdentityDbContext,
ITenantManagementDbContext ITenantManagementDbContext
{ {
/* Add DbSet properties for your Aggregate Roots / Entities here. */
#region Entities from the modules
/* Notice: We only implemented IIdentityDbContext and ITenantManagementDbContext
* and replaced them for this DbContext. This allows you to perform JOIN
* queries for the entities of these modules over the repositories easily. You
* typically don't need that for other modules. But, if you need, you can
* implement the DbContext interface of the needed module and use ReplaceDbContext
* attribute just like IIdentityDbContext and ITenantManagementDbContext.
*
* More info: Replacing a DbContext of a module ensures that the related module
* uses this DbContext on runtime. Otherwise, it will use its own DbContext class.
*/
//Identity
public DbSet<IdentityUser> Users { get; set; }
public DbSet<IdentityRole> Roles { get; set; }
public DbSet<IdentityClaimType> ClaimTypes { get; set; }
public DbSet<OrganizationUnit> OrganizationUnits { get; set; }
public DbSet<IdentitySecurityLog> SecurityLogs { get; set; }
public DbSet<IdentityLinkUser> LinkUsers { get; set; }
public DbSet<IdentityUserDelegation> UserDelegations { get; set; }
public DbSet<IdentitySession> Sessions { get; set; }
// Tenant Management
public DbSet<Tenant> Tenants { get; set; }
public DbSet<TenantConnectionString> TenantConnectionStrings { get; set; }
#endregion
#region 订单
public DbSet<Order> Orders { get; set; }
public DbSet<Worker> Workers { get; set; }
public DbSet<ServiceCategory> ServiceCategorys { get; set; }
#endregion
public AdminDbContext(DbContextOptions<AdminDbContext> options) public AdminDbContext(DbContextOptions<AdminDbContext> options)
: base(options) : base(options)
{ {
} }
protected override void OnModelCreating(ModelBuilder builder) protected override void OnModelCreating(ModelBuilder builder)
{ {
base.OnModelCreating(builder); base.OnModelCreating(builder);
/* Include modules to your migration db context */
builder.ConfigurePermissionManagement(); builder.ConfigurePermissionManagement();
builder.ConfigureSettingManagement(); builder.ConfigureSettingManagement();
builder.ConfigureBackgroundJobs(); builder.ConfigureBackgroundJobs();
@ -80,14 +41,24 @@ public class AdminDbContext :
builder.ConfigureOpenIddict(); builder.ConfigureOpenIddict();
builder.ConfigureFeatureManagement(); builder.ConfigureFeatureManagement();
builder.ConfigureTenantManagement(); builder.ConfigureTenantManagement();
/* Configure your own tables/entities inside here */
//builder.Entity<YourEntity>(b =>
//{
// b.ToTable(AdminConsts.DbTablePrefix + "YourEntities", AdminConsts.DbSchema);
// b.ConfigureByConvention(); //auto configure for the base class props
// //...
//});
} }
}
public DbSet<IdentityUser> Users { get; set; }
public DbSet<IdentityRole> Roles { get; set; }
public DbSet<IdentityClaimType> ClaimTypes { get; set; }
public DbSet<OrganizationUnit> OrganizationUnits { get; set; }
public DbSet<IdentitySecurityLog> SecurityLogs { get; set; }
public DbSet<IdentityLinkUser> LinkUsers { get; set; }
public DbSet<IdentityUserDelegation> UserDelegations { get; set; }
public DbSet<IdentitySession> Sessions { get; set; }
public DbSet<Tenant> Tenants { get; set; }
public DbSet<TenantConnectionString> TenantConnectionStrings { get; set; }
public DbSet<Order> Orders { get; set; }
public DbSet<ServiceCategory> ServiceCategories { get; set; }
public DbSet<HouseholdWorker> HouseholdWorkers { get; set; }
}

4
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContextFactory.cs
View File

@ -29,8 +29,8 @@ public class AdminDbContextFactory : IDesignTimeDbContextFactory<AdminDbContext>
{ {
var builder = new ConfigurationBuilder() var builder = new ConfigurationBuilder()
.SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../KonSoft.Admin.DbMigrator/")) .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../KonSoft.Admin.DbMigrator/"))
.AddJsonFile("appsettings.json", optional: false); .AddJsonFile("appsettings.json", false);
return builder.Build(); return builder.Build();
} }
} }

51
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminEfCoreEntityExtensionMappings.cs
View File

@ -1,13 +1,10 @@
using Microsoft.EntityFrameworkCore; using Volo.Abp.Threading;
using Volo.Abp.Identity;
using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading;
namespace KonSoft.Admin.EntityFrameworkCore; namespace KonSoft.Admin.EntityFrameworkCore;
public static class AdminEfCoreEntityExtensionMappings public static class AdminEfCoreEntityExtensionMappings
{ {
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); private static readonly OneTimeRunner OneTimeRunner = new();
public static void Configure() public static void Configure()
{ {
@ -16,29 +13,29 @@ public static class AdminEfCoreEntityExtensionMappings
OneTimeRunner.Run(() => OneTimeRunner.Run(() =>
{ {
/* You can configure extra properties for the /* You can configure extra properties for the
* entities defined in the modules used by your application. * entities defined in the modules used by your application.
* *
* This class can be used to map these extra properties to table fields in the database. * This class can be used to map these extra properties to table fields in the database.
* *
* USE THIS CLASS ONLY TO CONFIGURE EF CORE RELATED MAPPING. * USE THIS CLASS ONLY TO CONFIGURE EF CORE RELATED MAPPING.
* USE AdminModuleExtensionConfigurator CLASS (in the Domain.Shared project) * USE AdminModuleExtensionConfigurator CLASS (in the Domain.Shared project)
* FOR A HIGH LEVEL API TO DEFINE EXTRA PROPERTIES TO ENTITIES OF THE USED MODULES * FOR A HIGH LEVEL API TO DEFINE EXTRA PROPERTIES TO ENTITIES OF THE USED MODULES
* *
* Example: Map a property to a table field: * Example: Map a property to a table field:
ObjectExtensionManager.Instance ObjectExtensionManager.Instance
.MapEfCoreProperty<IdentityUser, string>( .MapEfCoreProperty<IdentityUser, string>(
"MyProperty", "MyProperty",
(entityBuilder, propertyBuilder) => (entityBuilder, propertyBuilder) =>
{ {
propertyBuilder.HasMaxLength(128); propertyBuilder.HasMaxLength(128);
} }
); );
* See the documentation for more: * See the documentation for more:
* https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities
*/ */
}); });
} }
} }

16
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminEntityFrameworkCoreModule.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.Uow;
using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.AuditLogging.EntityFrameworkCore;
using Volo.Abp.BackgroundJobs.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
@ -26,7 +25,7 @@ namespace KonSoft.Admin.EntityFrameworkCore;
typeof(AbpAuditLoggingEntityFrameworkCoreModule), typeof(AbpAuditLoggingEntityFrameworkCoreModule),
typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpTenantManagementEntityFrameworkCoreModule),
typeof(AbpFeatureManagementEntityFrameworkCoreModule) typeof(AbpFeatureManagementEntityFrameworkCoreModule)
)] )]
public class AdminEntityFrameworkCoreModule : AbpModule public class AdminEntityFrameworkCoreModule : AbpModule
{ {
public override void PreConfigureServices(ServiceConfigurationContext context) public override void PreConfigureServices(ServiceConfigurationContext context)
@ -41,17 +40,16 @@ public class AdminEntityFrameworkCoreModule : AbpModule
{ {
context.Services.AddAbpDbContext<AdminDbContext>(options => context.Services.AddAbpDbContext<AdminDbContext>(options =>
{ {
/* Remove "includeAllEntities: true" to create /* Remove "includeAllEntities: true" to create
* default repositories only for aggregate roots */ * default repositories only for aggregate roots */
options.AddDefaultRepositories(includeAllEntities: true); options.AddDefaultRepositories(true);
}); });
Configure<AbpDbContextOptions>(options => Configure<AbpDbContextOptions>(options =>
{ {
/* The main point to change your DBMS. /* The main point to change your DBMS.
* See also AdminMigrationsDbContextFactory for EF Core tooling. */ * See also AdminMigrationsDbContextFactory for EF Core tooling. */
options.UseNpgsql(); options.UseNpgsql();
}); });
} }
} }

62
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/Configures/ApplicationDbContextModelBuilderExtensions.cs
View File

@ -1,52 +1,34 @@
using KonSoft.Admin.Entities; using System.Diagnostics.CodeAnalysis;
using KonSoft.Admin.Entities;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp; using Volo.Abp;
namespace KonSoft.Admin.EntityFrameworkCore.Configures namespace KonSoft.Admin.EntityFrameworkCore.Configures;
public static class ApplicationDbContextModelBuilderExtensions
{ {
public static class ApplicationDbContextModelBuilderExtensions public static void ConfigureApplication([NotNull] this ModelBuilder builder)
{ {
public static void ConfigureApplication([NotNull] this ModelBuilder builder) Check.NotNull(builder, nameof(builder));
builder.Entity<Order>(b =>
{ {
Check.NotNull(builder, nameof(builder)); b.ToTable(AdminConsts.DbTablePrefix + nameof(Order) + AdminConsts.DbSchema);
builder.Entity<Order>(b => b.OwnsOne(o => o.Address, a =>
{ {
b.ToTable(AdminConsts.DbTablePrefix + nameof(Order) + AdminConsts.DbSchema); a.Property(p => p.ContactName).HasColumnName("ContactName").HasMaxLength(50);
a.Property(p => p.ContactPhone).HasColumnName("ContactPhone").HasMaxLength(20);
b.OwnsOne(o => o.Address, a => a.Property(p => p.DetailAddress).HasColumnName("DetailAddress").HasMaxLength(200);
{ a.Property(p => p.City).HasColumnName("City").HasMaxLength(50);
a.Property(p => p.ContactName).HasColumnName("ContactName").HasMaxLength(50); a.Property(p => p.District).HasColumnName("District").HasMaxLength(50);
a.Property(p => p.ContactPhone).HasColumnName("ContactPhone").HasMaxLength(20);
a.Property(p => p.DetailAddress).HasColumnName("DetailAddress").HasMaxLength(200);
a.Property(p => p.City).HasColumnName("City").HasMaxLength(50);
a.Property(p => p.District).HasColumnName("District").HasMaxLength(50);
});
}); });
});
builder.Entity<Worker>(b =>
{
b.ToTable(AdminConsts.DbTablePrefix + nameof(Worker) + AdminConsts.DbSchema);
});
builder.Entity<ServiceCategory>(b =>
{
b.ToTable(AdminConsts.DbTablePrefix + nameof(ServiceCategory) + AdminConsts.DbSchema);
});
}
builder.Entity<ServiceCategory>(b =>
{
b.ToTable(AdminConsts.DbTablePrefix + nameof(ServiceCategory) + AdminConsts.DbSchema);
});
} }
} }

4
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreAdminDbSchemaMigrator.cs
View File

@ -1,8 +1,8 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using KonSoft.Admin.Data;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using KonSoft.Admin.Data;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
namespace KonSoft.Admin.EntityFrameworkCore; namespace KonSoft.Admin.EntityFrameworkCore;
@ -31,4 +31,4 @@ public class EntityFrameworkCoreAdminDbSchemaMigrator
.Database .Database
.MigrateAsync(); .MigrateAsync();
} }
} }

16
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/Repositories/HouseholdWorkerRepository.cs Normal file
View File

@ -0,0 +1,16 @@
using KonSoft.Admin.Entities;
using KonSoft.Admin.IRepositories;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.TenantManagement.EntityFrameworkCore;
namespace KonSoft.Admin.EntityFrameworkCore.Repositories;
public class HouseholdWorkerRepository : EfCoreRepository<TenantManagementDbContext, HouseholdWorker>,
IHouseholdWorkerRepository
{
public HouseholdWorkerRepository(IDbContextProvider<TenantManagementDbContext> dbContextProvider) : base(
dbContextProvider)
{
}
}

20
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/Repositories/OrderRepository.cs
View File

@ -1,21 +1,13 @@
using KonSoft.Admin.Entities; using KonSoft.Admin.Entities;
using KonSoft.Admin.Repositories; using KonSoft.Admin.IRepositories;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
namespace KonSoft.Admin.EntityFrameworkCore.Repositories namespace KonSoft.Admin.EntityFrameworkCore.Repositories;
public class OrderRepository : EfCoreRepository<AdminDbContext, Order>, IOrderRepository
{ {
public class OrderRepository : EfCoreRepository<AdminDbContext, Order>, IOrderRepository public OrderRepository(IDbContextProvider<AdminDbContext> dbContextProvider) : base(dbContextProvider)
{ {
public OrderRepository(IDbContextProvider<AdminDbContext> dbContextProvider) : base(dbContextProvider)
{
}
} }
} }

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