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

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

@ -53,7 +53,8 @@ public class KonSoftAuthServerModule : AbpModule
PreConfigure<OpenIddictServerBuilder>(serverBuilder =>
{
serverBuilder.AddProductionEncryptionAndSigningCertificate("openiddict.pfx", "59464dba-b66e-48cd-8b81-2e4a9c08c977");
serverBuilder.AddProductionEncryptionAndSigningCertificate("openiddict.pfx",
"59464dba-b66e-48cd-8b81-2e4a9c08c977");
});
}
}
@ -77,10 +78,7 @@ public class KonSoftAuthServerModule : AbpModule
{
options.StyleBundles.Configure(
BasicThemeBundles.Styles.Global,
bundle =>
{
bundle.AddFiles("/global-styles.css");
}
bundle => { bundle.AddFiles("/global-styles.css"); }
);
});
@ -90,10 +88,7 @@ public class KonSoftAuthServerModule : AbpModule
options.ApplicationName = "AuthServer";
});
Configure<AbpBackgroundJobOptions>(options =>
{
options.IsJobExecutionEnabled = false;
});
Configure<AbpBackgroundJobOptions>(options => { options.IsJobExecutionEnabled = false; });
context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options =>
{

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

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

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

@ -1,12 +1,13 @@
@page
@using System.Net
@using KonSoft.Shared.Localization.Localization
@using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.AspNetCore.Mvc.Localization
@using KonSoft.Pages
@using KonSoft.Shared.Localization.Localization
@using Volo.Abp.Users
@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid
@using Volo.Abp.AspNetCore.Mvc.UI.Theming
@using Volo.Abp.Ui.Branding
@model IndexModel
@using Volo.Abp.Users
@model KonSoft.Pages.IndexModel
@inject IHtmlLocalizer<KonSoftResource> L
@inject ICurrentUser CurrentUser
@inject IBrandingProvider BrandingProvider
@ -65,12 +66,12 @@
<div class="ml-auto p-2 float-end">
<abp-dropdown>
<abp-dropdown-button text="@Model.CurrentLanguage"/>
@if (@Model.Languages != null)
@if (Model.Languages != null)
{
<abp-dropdown-menu>
@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-menu>
@ -87,7 +88,7 @@
<abp-row class="mt-3">
@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-body>
@{

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

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

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

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

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

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

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

@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
namespace KonSoft.BackgroundJobs.Controllers
{
namespace KonSoft.BackgroundJobs.Controllers;
[ApiController]
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
@ -30,4 +30,3 @@ namespace KonSoft.BackgroundJobs.Controllers
.ToArray();
}
}
}

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

@ -1,5 +1,5 @@
namespace KonSoft.BackgroundJobs
{
namespace KonSoft.BackgroundJobs;
public class WeatherForecast
{
public DateOnly Date { get; set; }
@ -10,4 +10,3 @@ namespace KonSoft.BackgroundJobs
public string? Summary { get; set; }
}
}

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

@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
namespace KonSoft.BackgroundWorker.Controllers
{
namespace KonSoft.BackgroundWorker.Controllers;
[ApiController]
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
@ -30,4 +30,3 @@ namespace KonSoft.BackgroundWorker.Controllers
.ToArray();
}
}
}

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

@ -1,5 +1,5 @@
namespace KonSoft.BackgroundWorker
{
namespace KonSoft.BackgroundWorker;
public class WeatherForecast
{
public DateOnly Date { get; set; }
@ -10,4 +10,3 @@ namespace KonSoft.BackgroundWorker
public string? Summary { get; set; }
}
}

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

@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
namespace KonSoft.InternalGateway.Controllers
{
namespace KonSoft.InternalGateway.Controllers;
[ApiController]
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
@ -30,4 +30,3 @@ namespace KonSoft.InternalGateway.Controllers
.ToArray();
}
}
}

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

@ -1,5 +1,5 @@
namespace KonSoft.InternalGateway
{
namespace KonSoft.InternalGateway;
public class WeatherForecast
{
public DateOnly Date { get; set; }
@ -10,4 +10,3 @@ namespace KonSoft.InternalGateway
public string? Summary { get; set; }
}
}

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

@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
namespace KonSoft.PublicGateway.Controllers
{
namespace KonSoft.PublicGateway.Controllers;
[ApiController]
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
@ -30,4 +30,3 @@ namespace KonSoft.PublicGateway.Controllers
.ToArray();
}
}
}

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

@ -1,5 +1,5 @@
namespace KonSoft.PublicGateway
{
namespace KonSoft.PublicGateway;
public class WeatherForecast
{
public DateOnly Date { get; set; }
@ -10,4 +10,3 @@ namespace KonSoft.PublicGateway
public string? Summary { get; set; }
}
}

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

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

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

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

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

@ -6,8 +6,8 @@ using Volo.Abp.EventBus.Distributed;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Uow;
namespace KonSoft.Admin.DbMigrations
{
namespace KonSoft.Admin.DbMigrations;
public class AdminPendingEfCoreMigrationsChecker : PendingEfCoreMigrationsChecker<AdminDbContext>
{
public AdminPendingEfCoreMigrationsChecker(IUnitOfWorkManager unitOfWorkManager,
@ -23,4 +23,3 @@ namespace KonSoft.Admin.DbMigrations
{
}
}
}

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 Microsoft.AspNetCore.Builder;
using Serilog;
using System;
var assemblyName = typeof(Program).Assembly.GetName().Name!;

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

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<location path="." inheritInChildApplications="false">
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</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"
stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
<system.webServer>

7
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.Microservices;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Volo.Abp;
@ -24,9 +23,9 @@ public class DispatchHttpApiHostModule : AbpModule
var configuration = context.Services.GetConfiguration();
SwaggerConfigurationHelper.ConfigureWithOidc(
context: context,
authority: configuration["AuthServer:Authority"]!,
scopes: ["DispatchService"],
context,
configuration["AuthServer:Authority"]!,
["DispatchService"],
discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
apiTitle: "Dispatch Service API"
);

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

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

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

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<location path="." inheritInChildApplications="false">
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</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"
stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
<system.webServer>

7
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.Microservices;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Volo.Abp;
@ -24,9 +23,9 @@ public class PaymentHttpApiHostModule : AbpModule
var configuration = context.Services.GetConfiguration();
SwaggerConfigurationHelper.ConfigureWithOidc(
context: context,
authority: configuration["AuthServer:Authority"]!,
scopes: ["PaymentService"],
context,
configuration["AuthServer:Authority"]!,
["PaymentService"],
discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
apiTitle: "Payment Service API"
);

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

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

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

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<location path="." inheritInChildApplications="false">
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</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"
stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
<system.webServer>

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

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

7
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.Microservices;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Volo.Abp;
@ -24,9 +23,9 @@ public class ReportHttpApiHostModule : AbpModule
var configuration = context.Services.GetConfiguration();
SwaggerConfigurationHelper.ConfigureWithOidc(
context: context,
authority: configuration["AuthServer:Authority"]!,
scopes: ["ReportService"],
context,
configuration["AuthServer:Authority"]!,
["ReportService"],
discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
apiTitle: "Report Service API"
);

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

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<location path="." inheritInChildApplications="false">
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</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"
stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
<system.webServer>

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

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

7
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.TenantManagement.EntityFrameworkCore;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Volo.Abp;
@ -24,9 +23,9 @@ public class TenantManagementHttpApiHostModule : AbpModule
var configuration = context.Services.GetConfiguration();
SwaggerConfigurationHelper.ConfigureWithOidc(
context: context,
authority: configuration["AuthServer:Authority"]!,
scopes: ["TenantManagementService"],
context,
configuration["AuthServer:Authority"]!,
["TenantManagementService"],
discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
apiTitle: "TenantManagement Service API"
);

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

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<location path="." inheritInChildApplications="false">
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</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"
stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
<system.webServer>

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

@ -1,12 +1,10 @@
using Volo.Abp.Identity;
using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading;
using Volo.Abp.Threading;
namespace KonSoft.Admin;
public static class AdminDtoExtensions
{
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
private static readonly OneTimeRunner OneTimeRunner = new();
public static void Configure()
{

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

@ -1,11 +1,5 @@
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 AddressDto
{
public string ContactName { get; set; }
@ -14,4 +8,3 @@ namespace KonSoft.Admin.Dtos
public string City { get; set; }
public string District { get; set; }
}
}

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

@ -1,25 +1,19 @@
using System;
using System.Collections.Generic;
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
{
[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; }
[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; }
}
}

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

@ -1,14 +1,9 @@
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 string Name { get; set; }
public Guid? ParentId { get; set; }
}
}

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

@ -1,13 +1,8 @@
using KonSoft.Admin.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Dtos;
using System;
using KonSoft.Admin.Enums;
namespace KonSoft.Admin.Dtos;
namespace KonSoft.Admin.Dtos
{
public class OrderDto
{
public Guid Id { get; set; }
@ -23,4 +18,3 @@ namespace KonSoft.Admin.Dtos
public AddressDto Address { get; set; }
public string Remark { get; set; }
}
}

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

@ -1,12 +1,5 @@
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 PayOrderDto
{
}
}

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

@ -1,14 +1,8 @@

using System;
using System;
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
{
/// <summary>
@ -28,6 +22,7 @@ namespace KonSoft.Admin.Dtos
/// 商品编码
/// </summary>
public string Code { get; private set; }
/// <summary>
/// 商品价格
/// </summary>
@ -63,4 +58,3 @@ namespace KonSoft.Admin.Dtos
{
public Guid Id { get; set; }
}
}

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

@ -1,17 +1,13 @@
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 ServiceCategoryDto
{
public Guid Id { get; set; }
public string Name { get; set; }
public Guid? ParentId { get; set; }
public int Level { get; set; }
public List<ServiceCategoryDto> Children { get; set; } = new List<ServiceCategoryDto>();
}
public List<ServiceCategoryDto> Children { get; set; } = new();
}

11
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.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Application.Dtos;
namespace KonSoft.Admin.Dtos
{
namespace KonSoft.Admin.Dtos;
public class WorkerDto : EntityDto<Guid>
{
public string Name { get; set; }
public string Phone { get; set; }
public List<Guid> SkillCategoryIds { get; set; } = new(); // 擅长服务类型
}
}

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

@ -1,11 +1,11 @@
using KonSoft.Admin.Dtos;
using System;
using System;
using System.Threading.Tasks;
using KonSoft.Admin.Dtos;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services;
namespace KonSoft.Admin.IApplicationServices
{
namespace KonSoft.Admin.IApplicationServices;
public interface IOrderAppService : IApplicationService
{
/// <summary>
@ -14,6 +14,7 @@ namespace KonSoft.Admin.IApplicationServices
/// <param name="input"></param>
/// <returns></returns>
Task<OrderDto> CreateAsync(CreateOrderDto input);
Task<OrderDto> PayAsync(Guid orderId, PayOrderDto input);
Task AssignAsync(Guid orderId, Guid workerId);
Task StartServiceAsync(Guid orderId);
@ -25,4 +26,3 @@ namespace KonSoft.Admin.IApplicationServices
Task<OrderDto> GetAsync(Guid id);
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);
}
}

11
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.Linq;
using System.Text;
using System.Threading.Tasks;
using KonSoft.Admin.Dtos;
namespace KonSoft.Admin.IApplicationServices;
namespace KonSoft.Admin.IApplicationServices
{
public interface IServiceCategoryAppService
{
Task<ServiceCategoryDto> CreateAsync(CreateServiceCategoryDto input);
Task DeleteAsync(Guid id);
Task<List<ServiceCategoryDto>> GetTreeAsync();
}
}

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

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

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

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

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

@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using KonSoft.Admin.Localization;
using KonSoft.Admin.Localization;
using Volo.Abp.Application.Services;
namespace KonSoft.Admin;

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

@ -23,9 +23,6 @@ public class AdminApplicationModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Configure<AbpAutoMapperOptions>(options =>
{
options.AddMaps<AdminApplicationModule>();
});
Configure<AbpAutoMapperOptions>(options => { options.AddMaps<AdminApplicationModule>(); });
}
}

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

@ -1,18 +1,18 @@
using KonSoft.Admin.Dtos;
using KonSoft.Admin.Entities;
using KonSoft.Admin.IApplicationServices;
using KonSoft.Admin.Repositories;
using System;
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
{
namespace KonSoft.Admin.ApplicationServices;
public class OrderAppService(IOrderRepository orderRepository) : ApplicationService, IOrderAppService
{
private readonly IOrderRepository _orderRepository = orderRepository;
@ -78,7 +78,8 @@ namespace KonSoft.Admin.ApplicationServices
// 生成订单号 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);
var order = new Order(Guid.NewGuid(), orderSN, input.CustomerId, input.ServiceCategoryId, input.ServiceTime,
input.Amount, address, input.Remark);
await _orderRepository.InsertAsync(order);
return ObjectMapper.Map<Order, OrderDto>(order);
@ -97,7 +98,8 @@ namespace KonSoft.Admin.ApplicationServices
/// <summary>
/// 修改订单信息
/// </summary>
/// <param name="input">订单DTO对象</param>s
/// <param name="input">订单DTO对象</param>
/// s
public async Task EditAsync(OrderDto input)
{
// 根据ID查询订单，如果不存在则抛出异常【修改前端必然看到了,数据若查不到提示自定义异常信息】
@ -162,4 +164,3 @@ namespace KonSoft.Admin.ApplicationServices
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);
}
}
}

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

@ -1,16 +1,15 @@
using KonSoft.Admin.Dtos;
using KonSoft.Admin.Entities;
using KonSoft.Admin.IApplicationServices;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using KonSoft.Admin.Dtos;
using KonSoft.Admin.Entities;
using KonSoft.Admin.IApplicationServices;
using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Repositories;
namespace KonSoft.Admin.ApplicationServices
{
namespace KonSoft.Admin.ApplicationServices;
public class ServiceCategoryAppService : ApplicationService, IServiceCategoryAppService
{
private readonly IRepository<ServiceCategory, Guid> _repository;
@ -42,7 +41,10 @@ namespace KonSoft.Admin.ApplicationServices
public async Task DeleteAsync(Guid id)
{
var hasChildren = await _repository.AnyAsync(c => c.ParentId == id);
if (hasChildren) throw new InvalidOperationException("存在子节点无法删除!");
if (hasChildren)
{
throw new InvalidOperationException("存在子节点无法删除!");
}
await _repository.DeleteAsync(o => o.Id == id);
@ -53,7 +55,8 @@ namespace KonSoft.Admin.ApplicationServices
var allCategories = await _repository.GetListAsync();
// 构建树
var lookup = allCategories.ToDictionary(c => c.Id, c => ObjectMapper.Map<ServiceCategory, ServiceCategoryDto>(c));
var lookup =
allCategories.ToDictionary(c => c.Id, c => ObjectMapper.Map<ServiceCategory, ServiceCategoryDto>(c));
var rootList = new List<ServiceCategoryDto>();
@ -72,4 +75,3 @@ namespace KonSoft.Admin.ApplicationServices
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;
}
}
}

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

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

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

@ -35,10 +35,7 @@ public class AdminDomainSharedModule : AbpModule
public override void ConfigureServices(ServiceConfigurationContext context)
{
Configure<AbpVirtualFileSystemOptions>(options =>
{
options.FileSets.AddEmbedded<AdminDomainSharedModule>();
});
Configure<AbpVirtualFileSystemOptions>(options => { options.FileSets.AddEmbedded<AdminDomainSharedModule>(); });
Configure<AbpLocalizationOptions>(options =>
{

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

@ -4,7 +4,7 @@ namespace KonSoft.Admin;
public static class AdminGlobalFeatureConfigurator
{
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
private static readonly OneTimeRunner OneTimeRunner = new();
public static void Configure()
{

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

@ -1,13 +1,10 @@
using System.ComponentModel.DataAnnotations;
using Volo.Abp.Identity;
using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading;
using Volo.Abp.Threading;
namespace KonSoft.Admin;
public static class AdminModuleExtensionConfigurator
{
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
private static readonly OneTimeRunner OneTimeRunner = new();
public static void Configure()
{

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

@ -1,11 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KonSoft.Admin.Enums;
namespace KonSoft.Admin.Enums
{
public enum OrderStatus
{
PendingPayment, // 待支付
@ -17,6 +11,4 @@ namespace KonSoft.Admin.Enums
Canceled, // 已取消
Refunding, // 退款中
Refunded // 已退款
}
}

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

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

1
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.Localization;
using Volo.Abp.Modularity;
using Volo.Abp.MultiTenancy;
using Volo.Abp.OpenIddict;
using Volo.Abp.PermissionManagement.Identity;
using Volo.Abp.PermissionManagement.OpenIddict;

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

@ -17,12 +17,11 @@ namespace KonSoft.Admin.Data;
public class AdminDbMigrationService : ITransientDependency
{
public ILogger<AdminDbMigrationService> Logger { get; set; }
private readonly ICurrentTenant _currentTenant;
private readonly IDataSeeder _dataSeeder;
private readonly IEnumerable<IAdminDbSchemaMigrator> _dbSchemaMigrators;
private readonly ITenantRepository _tenantRepository;
private readonly ICurrentTenant _currentTenant;
public AdminDbMigrationService(
IDataSeeder dataSeeder,
@ -38,6 +37,8 @@ public class AdminDbMigrationService : ITransientDependency
Logger = NullLogger<AdminDbMigrationService>.Instance;
}
public ILogger<AdminDbMigrationService> Logger { get; set; }
public async Task MigrateAsync()
{
var initialMigrationAdded = AddInitialMigrationIfNotExist();
@ -52,7 +53,7 @@ public class AdminDbMigrationService : ITransientDependency
await MigrateDatabaseSchemaAsync();
await SeedDataAsync();
Logger.LogInformation($"Successfully completed host database migrations.");
Logger.LogInformation("Successfully completed host database migrations.");
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...");
await _dataSeeder.SeedAsync(new DataSeedContext(tenant?.Id)
.WithProperty(IdentityDataSeedContributor.AdminEmailPropertyName, IdentityDataSeedContributor.AdminEmailDefaultValue)
.WithProperty(IdentityDataSeedContributor.AdminPasswordPropertyName, IdentityDataSeedContributor.AdminPasswordDefaultValue)
.WithProperty(IdentityDataSeedContributor.AdminEmailPropertyName,
IdentityDataSeedContributor.AdminEmailDefaultValue)
.WithProperty(IdentityDataSeedContributor.AdminPasswordPropertyName,
IdentityDataSeedContributor.AdminPasswordDefaultValue)
);
}
@ -127,11 +130,9 @@ public class AdminDbMigrationService : ITransientDependency
AddInitialMigration();
return true;
}
else
{
return false;
}
}
catch (Exception e)
{
Logger.LogWarning("Couldn't determinate if any migrations exist : " + e.Message);
@ -149,7 +150,8 @@ public class AdminDbMigrationService : ITransientDependency
private bool MigrationsFolderExists()
{
var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath();
return dbMigrationsProjectFolder != null && Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations"));
return dbMigrationsProjectFolder != null &&
Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations"));
}
private void AddInitialMigration()
@ -207,7 +209,8 @@ public class AdminDbMigrationService : ITransientDependency
{
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;
}

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

@ -1,41 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Domain.Entities;
using System.Collections.Generic;
using Volo.Abp.Domain.Values;
namespace KonSoft.Admin.Entities
{
namespace KonSoft.Admin.Entities;
/// <summary>
/// 地址
/// </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()
{
}
public AddressInfo(string contactName, string contactPhone, string detailAddress, string city, string district)
{
@ -46,6 +21,31 @@ namespace KonSoft.Admin.Entities
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()
{
@ -55,6 +55,4 @@ namespace KonSoft.Admin.Entities
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; }
}

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

@ -1,16 +1,30 @@
using KonSoft.Admin.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System;
using KonSoft.Admin.Enums;
using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.Identity;
namespace KonSoft.Admin.Entities
{
namespace KonSoft.Admin.Entities;
public class Order : FullAuditedAggregateRoot<Guid>
{
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;
}
/// <summary>
/// 订单编号
/// </summary>
@ -20,6 +34,7 @@ namespace KonSoft.Admin.Entities
/// 用户ID
/// </summary>
public Guid CustomerId { get; private set; }
/// <summary>
/// 家政人员ID
/// </summary>
@ -51,14 +66,17 @@ namespace KonSoft.Admin.Entities
/// 应付金额
/// </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>
@ -68,32 +86,19 @@ namespace KonSoft.Admin.Entities
/// 备注
/// </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;
@ -105,7 +110,9 @@ namespace KonSoft.Admin.Entities
public void AssignWorker(Guid workerId)
{
if (Status != OrderStatus.PaidWaitingAssign)
{
throw new InvalidOperationException("订单无法分配师傅");
}
WorkerId = workerId;
@ -116,7 +123,9 @@ namespace KonSoft.Admin.Entities
public void StartService()
{
if (Status != OrderStatus.AssignedWaitingService)
{
throw new InvalidOperationException("订单无法开始");
}
Status = OrderStatus.InService;
@ -126,7 +135,9 @@ namespace KonSoft.Admin.Entities
public void CompleteService()
{
if (Status != OrderStatus.InService)
{
throw new InvalidOperationException("订单未开始服务,无法完成");
}
Status = OrderStatus.WaitingConfirm;
@ -136,7 +147,9 @@ namespace KonSoft.Admin.Entities
public void ConfirmCompletion()
{
if (Status != OrderStatus.WaitingConfirm)
{
throw new InvalidOperationException("订单无法确认");
}
Status = OrderStatus.Completed;
@ -147,11 +160,12 @@ namespace KonSoft.Admin.Entities
{
// 若已完成或退款中则不可取消
if (Status == OrderStatus.Completed || Status == OrderStatus.Refunding || Status == OrderStatus.Refunded)
{
throw new InvalidOperationException("订单无法被取消");
}
CancelReason = reason;
Status = OrderStatus.Canceled;
}
}
}

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

@ -1,12 +1,20 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using Volo.Abp.Domain.Entities.Auditing;
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)
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)
{
/// <summary>
/// 分类名称
@ -48,8 +56,7 @@ namespace KonSoft.Admin.Entities
/// </summary>
public int Order { get; private set; } = order;
[NotMapped]
public List<Product> Children { get; set; } = new();
[NotMapped] public List<Product> Children { get; set; } = new();
/// <summary>
/// 修改商品信息
@ -96,4 +103,3 @@ namespace KonSoft.Admin.Entities
Price = newPrice;
}
}
}

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

@ -1,20 +1,13 @@
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
{
namespace KonSoft.Admin.Entities;
public class ServiceCategory : FullAuditedAggregateRoot<Guid>
{
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() { }
protected ServiceCategory()
{
}
public ServiceCategory(Guid id, string name)
: base(id)
@ -30,8 +23,16 @@ namespace KonSoft.Admin.Entities
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 UpdateName(string name)
{
Name = name;
}
public void SetParent(ServiceCategory parent)
@ -40,7 +41,4 @@ namespace KonSoft.Admin.Entities
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>
{
}

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

@ -1,14 +1,8 @@
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;
namespace KonSoft.Admin.Repositories
{
namespace KonSoft.Admin.IRepositories;
public interface IOrderRepository : IRepository<Order>
{
}
}

9
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.Linq.Expressions;
using System.Threading.Tasks;
using KonSoft.Admin.Entities;
using Volo.Abp.Domain.Repositories;
namespace KonSoft.Admin.Repositories
{
namespace KonSoft.Admin.IRepositories;
public interface IProductRepository : IRepository<Product>
{
Task<List<Product>> GetPageRootListAsync(int skipCount, int maxResult, Expression<Func<Product, bool>> where);
}
}

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

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

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

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

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

@ -24,54 +24,15 @@ public class AdminDbContext :
IIdentityDbContext,
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)
: base(options)
{
}
protected override void OnModelCreating(ModelBuilder builder)
{
base.OnModelCreating(builder);
/* Include modules to your migration db context */
builder.ConfigurePermissionManagement();
builder.ConfigureSettingManagement();
builder.ConfigureBackgroundJobs();
@ -80,14 +41,24 @@ public class AdminDbContext :
builder.ConfigureOpenIddict();
builder.ConfigureFeatureManagement();
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; }
}

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

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

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

@ -1,13 +1,10 @@
using Microsoft.EntityFrameworkCore;
using Volo.Abp.Identity;
using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading;
using Volo.Abp.Threading;
namespace KonSoft.Admin.EntityFrameworkCore;
public static class AdminEfCoreEntityExtensionMappings
{
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
private static readonly OneTimeRunner OneTimeRunner = new();
public static void Configure()
{

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

@ -1,6 +1,5 @@
using System;
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.Uow;
using Volo.Abp.AuditLogging.EntityFrameworkCore;
using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
@ -43,7 +42,7 @@ public class AdminEntityFrameworkCoreModule : AbpModule
{
/* Remove "includeAllEntities: true" to create
* default repositories only for aggregate roots */
options.AddDefaultRepositories(includeAllEntities: true);
options.AddDefaultRepositories(true);
});
Configure<AbpDbContextOptions>(options =>
@ -52,6 +51,5 @@ public class AdminEntityFrameworkCoreModule : AbpModule
* See also AdminMigrationsDbContextFactory for EF Core tooling. */
options.UseNpgsql();
});
}
}

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

@ -1,15 +1,10 @@
using KonSoft.Admin.Entities;
using System.Diagnostics.CodeAnalysis;
using KonSoft.Admin.Entities;
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;
namespace KonSoft.Admin.EntityFrameworkCore.Configures
{
namespace KonSoft.Admin.EntityFrameworkCore.Configures;
public static class ApplicationDbContextModelBuilderExtensions
{
public static void ConfigureApplication([NotNull] this ModelBuilder builder)
@ -30,23 +25,10 @@ namespace KonSoft.Admin.EntityFrameworkCore.Configures
});
});
builder.Entity<Worker>(b =>
{
b.ToTable(AdminConsts.DbTablePrefix + nameof(Worker) + AdminConsts.DbSchema);
});
builder.Entity<ServiceCategory>(b =>
{
b.ToTable(AdminConsts.DbTablePrefix + nameof(ServiceCategory) + AdminConsts.DbSchema);
});
}
}
}

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

@ -1,8 +1,8 @@
using System;
using System.Threading.Tasks;
using KonSoft.Admin.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using KonSoft.Admin.Data;
using Volo.Abp.DependencyInjection;
namespace KonSoft.Admin.EntityFrameworkCore;

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)
{
}
}

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

@ -1,21 +1,13 @@
using KonSoft.Admin.Entities;
using KonSoft.Admin.Repositories;
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 KonSoft.Admin.IRepositories;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
namespace KonSoft.Admin.EntityFrameworkCore.Repositories
{
namespace KonSoft.Admin.EntityFrameworkCore.Repositories;
public class OrderRepository : EfCoreRepository<AdminDbContext, Order>, IOrderRepository
{
public OrderRepository(IDbContextProvider<AdminDbContext> dbContextProvider) : base(dbContextProvider)
{
}
}
}

14
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/Repositories/ProductRepository.cs
View File

@ -1,25 +1,25 @@
using KonSoft.Admin.Entities;
using KonSoft.Admin.Repositories;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
using KonSoft.Admin.Entities;
using KonSoft.Admin.IRepositories;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
namespace KonSoft.Admin.EntityFrameworkCore.Repositories
{
namespace KonSoft.Admin.EntityFrameworkCore.Repositories;
public class ProductRepository : EfCoreRepository<AdminDbContext, Product>, IProductRepository
{
public ProductRepository(IDbContextProvider<AdminDbContext> dbContextProvider) : base(dbContextProvider)
{
}
public async Task<List<Product>> GetPageRootListAsync(int skipCount, int maxResultCount, Expression<Func<Product, bool>> where)
public async Task<List<Product>> GetPageRootListAsync(int skipCount, int maxResultCount,
Expression<Func<Product, bool>> where)
{
var queryable = await GetQueryableAsync();
return queryable.PageBy(skipCount, maxResultCount).Where(where).OrderBy(x => x.Order).ToList();
}
}
}

1
modules/admin/src/KonSoft.Admin.EntityFrameworkCore/Properties/AssemblyInfo.cs
View File

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

5
modules/admin/src/KonSoft.Admin.HttpApi.Client/AdminHttpApiClientModule.cs
View File

@ -4,8 +4,8 @@ using Volo.Abp.FeatureManagement;
using Volo.Abp.Identity;
using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement;
using Volo.Abp.TenantManagement;
using Volo.Abp.SettingManagement;
using Volo.Abp.TenantManagement;
using Volo.Abp.VirtualFileSystem;
namespace KonSoft.Admin;
@ -26,8 +26,7 @@ public class AdminHttpApiClientModule : AbpModule
public override void ConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddHttpClientProxies(
typeof(AdminApplicationContractsModule).Assembly,
RemoteServiceName
typeof(AdminApplicationContractsModule).Assembly
);
Configure<AbpVirtualFileSystemOptions>(options =>

4
modules/admin/src/KonSoft.Admin.HttpApi/AdminHttpApiModule.cs
View File

@ -1,5 +1,5 @@
using Localization.Resources.AbpUi;
using KonSoft.Admin.Localization;
using KonSoft.Admin.Localization;
using Localization.Resources.AbpUi;
using Volo.Abp.Account;
using Volo.Abp.FeatureManagement;
using Volo.Abp.Identity;

1
modules/admin/test/KonSoft.Admin.Application.Tests/AdminApplicationTestBase.cs
View File

@ -5,5 +5,4 @@ namespace KonSoft.Admin;
public abstract class AdminApplicationTestBase<TStartupModule> : AdminTestBase<TStartupModule>
where TStartupModule : IAbpModule
{
}

1
modules/admin/test/KonSoft.Admin.Application.Tests/AdminApplicationTestModule.cs
View File

@ -8,5 +8,4 @@ namespace KonSoft.Admin;
)]
public class AdminApplicationTestModule : AbpModule
{
}

4
modules/admin/test/KonSoft.Admin.Application.Tests/Samples/SampleAppServiceTests.cs
View File

@ -1,5 +1,5 @@
using Shouldly;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Shouldly;
using Volo.Abp.Identity;
using Volo.Abp.Modularity;
using Xunit;

1
modules/admin/test/KonSoft.Admin.Domain.Tests/AdminDomainTestBase.cs
View File

@ -6,5 +6,4 @@ namespace KonSoft.Admin;
public abstract class AdminDomainTestBase<TStartupModule> : AdminTestBase<TStartupModule>
where TStartupModule : IAbpModule
{
}

1
modules/admin/test/KonSoft.Admin.Domain.Tests/AdminDomainTestModule.cs
View File

@ -8,5 +8,4 @@ namespace KonSoft.Admin;
)]
public class AdminDomainTestModule : AbpModule
{
}

2
modules/admin/test/KonSoft.Admin.Domain.Tests/Samples/SampleDomainTests.cs
View File

@ -14,8 +14,8 @@ namespace KonSoft.Admin.Samples;
public abstract class SampleDomainTests<TStartupModule> : AdminDomainTestBase<TStartupModule>
where TStartupModule : IAbpModule
{
private readonly IIdentityUserRepository _identityUserRepository;
private readonly IdentityUserManager _identityUserManager;
private readonly IIdentityUserRepository _identityUserRepository;
protected SampleDomainTests()
{

1
modules/admin/test/KonSoft.Admin.EntityFrameworkCore.Tests/EntityFrameworkCore/AdminEntityFrameworkCoreCollection.cs
View File

@ -5,5 +5,4 @@ namespace KonSoft.Admin.EntityFrameworkCore;
[CollectionDefinition(AdminTestConsts.CollectionDefinitionName)]
public class AdminEntityFrameworkCoreCollection : ICollectionFixture<AdminEntityFrameworkCoreFixture>
{
}

4
modules/admin/test/KonSoft.Admin.EntityFrameworkCore.Tests/EntityFrameworkCore/AdminEntityFrameworkCoreCollectionFixtureBase.cs
View File

@ -1,9 +1,7 @@
using KonSoft.Admin.EntityFrameworkCore;
using Xunit;
using Xunit;
namespace KonSoft.Admin.EntityFrameworkCore;
public class AdminEntityFrameworkCoreCollectionFixtureBase : ICollectionFixture<AdminEntityFrameworkCoreFixture>
{
}

1
modules/admin/test/KonSoft.Admin.EntityFrameworkCore.Tests/EntityFrameworkCore/AdminEntityFrameworkCoreFixture.cs
View File

@ -6,6 +6,5 @@ public class AdminEntityFrameworkCoreFixture : IDisposable
{
public void Dispose()
{
}
}

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

@ -1,8 +1,5 @@
using Volo.Abp;
namespace KonSoft.Admin.EntityFrameworkCore;
namespace KonSoft.Admin.EntityFrameworkCore;
public abstract class AdminEntityFrameworkCoreTestBase : AdminTestBase<AdminEntityFrameworkCoreTestModule>
{
}

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

@ -51,10 +51,7 @@ public class AdminEntityFrameworkCoreTestModule : AbpModule
services.Configure<AbpDbContextOptions>(options =>
{
options.Configure(context =>
{
context.DbContextOptions.UseSqlite(_sqliteConnection);
});
options.Configure(context => { context.DbContextOptions.UseSqlite(_sqliteConnection); });
});
}

1
modules/admin/test/KonSoft.Admin.EntityFrameworkCore.Tests/EntityFrameworkCore/Applications/EfCoreSampleAppServiceTests.cs
View File

@ -6,5 +6,4 @@ namespace KonSoft.Admin.EntityFrameworkCore.Applications;
[Collection(AdminTestConsts.CollectionDefinitionName)]
public class EfCoreSampleAppServiceTests : SampleAppServiceTests<AdminEntityFrameworkCoreTestModule>
{
}

1
modules/admin/test/KonSoft.Admin.EntityFrameworkCore.Tests/EntityFrameworkCore/Domains/EfCoreSampleDomainTests.cs
View File

@ -6,5 +6,4 @@ namespace KonSoft.Admin.EntityFrameworkCore.Domains;
[Collection(AdminTestConsts.CollectionDefinitionName)]
public class EfCoreSampleDomainTests : SampleDomainTests<AdminEntityFrameworkCoreTestModule>
{
}

6
modules/admin/test/KonSoft.Admin.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepositoryTests.cs
View File

@ -1,8 +1,8 @@
using Microsoft.EntityFrameworkCore;
using Shouldly;
using System;
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Shouldly;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Identity;
using Xunit;

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

@ -21,8 +21,8 @@ public class AdminConsoleApiClientModule : AbpModule
{
options.ProxyClientBuildActions.Add((remoteServiceName, clientBuilder) =>
{
clientBuilder.AddTransientHttpErrorPolicy(
policyBuilder => policyBuilder.WaitAndRetryAsync(3, i => TimeSpan.FromSeconds(Math.Pow(2, i)))
clientBuilder.AddTransientHttpErrorPolicy(policyBuilder =>
policyBuilder.WaitAndRetryAsync(3, i => TimeSpan.FromSeconds(Math.Pow(2, i)))
);
});
});

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