add: 师傅实体和服务类型

KonSoft.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.14.36414.22 d17.14
+VisualStudioVersion = 17.14.36414.22
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "applications", "applications", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 EndProject
@@ -49,8 +49,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E67FA5C3-132
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1C06151A-45F0-4D48-8303-3D4CBE9517F7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared", "shared\KonSoft.Shared\KonSoft.Shared.csproj", "{345B5CDA-DC77-4956-BF96-80707EC1B5B2}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Admin.Application", "modules\admin\src\KonSoft.Admin.Application\KonSoft.Admin.Application.csproj", "{9D9D979A-AFC7-F9D0-2D23-8809E83F9EF9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Admin.Application.Contracts", "modules\admin\src\KonSoft.Admin.Application.Contracts\KonSoft.Admin.Application.Contracts.csproj", "{9F68B0E2-0B1D-E0E8-1BE7-079F693A4643}"
@@ -185,6 +183,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Report.HttpApi.Host
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.TenantManagement.HttpApi.Host", "microservices\KonSoft.TenantManagement.HttpApi.Host\KonSoft.TenantManagement.HttpApi.Host.csproj", "{3641CA05-99C5-2245-C663-6CE00730E87C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.Localization", "shared\KonSoft.Shared.Localization\KonSoft.Shared.Localization.csproj", "{A773C53C-F145-043A-7F55-79ABDB11893B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.Hosting", "shared\KonSoft.Shared.Hosting\KonSoft.Shared.Hosting.csproj", "{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.Hosting.AspNetCore", "shared\KonSoft.Shared.Hosting.AspNetCore\KonSoft.Shared.Hosting.AspNetCore.csproj", "{8CA6B487-3AAF-4E77-ACE0-01D878DE4836}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.Hosting.Gateways", "shared\KonSoft.Shared.Hosting.Gateways\KonSoft.Shared.Hosting.Gateways.csproj", "{BBB1A129-9ED7-4F08-B710-B6C287197BFB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.Hosting.Microservices", "shared\KonSoft.Shared.Hosting.Microservices\KonSoft.Shared.Hosting.Microservices.csproj", "{ADF28580-F8A0-4495-96D6-736C6C7CF3FF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -203,10 +211,6 @@ Global
 		{AEBC7053-743F-4F80-BD10-8ED6A8A7B3EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AEBC7053-743F-4F80-BD10-8ED6A8A7B3EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AEBC7053-743F-4F80-BD10-8ED6A8A7B3EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{345B5CDA-DC77-4956-BF96-80707EC1B5B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{345B5CDA-DC77-4956-BF96-80707EC1B5B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{345B5CDA-DC77-4956-BF96-80707EC1B5B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{345B5CDA-DC77-4956-BF96-80707EC1B5B2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9D9D979A-AFC7-F9D0-2D23-8809E83F9EF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9D9D979A-AFC7-F9D0-2D23-8809E83F9EF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9D9D979A-AFC7-F9D0-2D23-8809E83F9EF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -475,6 +479,26 @@ Global
 		{3641CA05-99C5-2245-C663-6CE00730E87C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3641CA05-99C5-2245-C663-6CE00730E87C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3641CA05-99C5-2245-C663-6CE00730E87C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A773C53C-F145-043A-7F55-79ABDB11893B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A773C53C-F145-043A-7F55-79ABDB11893B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A773C53C-F145-043A-7F55-79ABDB11893B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A773C53C-F145-043A-7F55-79ABDB11893B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CA6B487-3AAF-4E77-ACE0-01D878DE4836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CA6B487-3AAF-4E77-ACE0-01D878DE4836}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CA6B487-3AAF-4E77-ACE0-01D878DE4836}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CA6B487-3AAF-4E77-ACE0-01D878DE4836}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBB1A129-9ED7-4F08-B710-B6C287197BFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBB1A129-9ED7-4F08-B710-B6C287197BFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBB1A129-9ED7-4F08-B710-B6C287197BFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBB1A129-9ED7-4F08-B710-B6C287197BFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADF28580-F8A0-4495-96D6-736C6C7CF3FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADF28580-F8A0-4495-96D6-736C6C7CF3FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADF28580-F8A0-4495-96D6-736C6C7CF3FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADF28580-F8A0-4495-96D6-736C6C7CF3FF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -498,7 +522,6 @@ Global
 		{6C762F40-30BB-4CDA-951B-01D45F7C2B53} = {AAF02051-771B-4CC0-BD17-1A3643F83E09}
 		{E67FA5C3-132C-4F47-B6A6-8FA4376C70BB} = {CF59695F-7948-4743-A467-42E4B4C9EECA}
 		{1C06151A-45F0-4D48-8303-3D4CBE9517F7} = {CF59695F-7948-4743-A467-42E4B4C9EECA}
-		{345B5CDA-DC77-4956-BF96-80707EC1B5B2} = {7EFFD2C6-2041-4967-A715-0F817D70C433}
 		{9D9D979A-AFC7-F9D0-2D23-8809E83F9EF9} = {EBCB740D-07E7-4CED-A422-90EB824B9021}
 		{9F68B0E2-0B1D-E0E8-1BE7-079F693A4643} = {EBCB740D-07E7-4CED-A422-90EB824B9021}
 		{D1A86C77-533D-5B68-04F1-7F7BFBF56AC7} = {EBCB740D-07E7-4CED-A422-90EB824B9021}
@@ -566,6 +589,11 @@ Global
 		{9A034977-0FBC-A3C8-8432-9FDD073F215A} = {4CBFE8AF-968B-453D-B763-3D0437C0883D}
 		{1C89424B-DA16-8840-4AB0-C446CFBD634C} = {4CBFE8AF-968B-453D-B763-3D0437C0883D}
 		{3641CA05-99C5-2245-C663-6CE00730E87C} = {4CBFE8AF-968B-453D-B763-3D0437C0883D}
+		{A773C53C-F145-043A-7F55-79ABDB11893B} = {7EFFD2C6-2041-4967-A715-0F817D70C433}
+		{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF} = {7EFFD2C6-2041-4967-A715-0F817D70C433}
+		{8CA6B487-3AAF-4E77-ACE0-01D878DE4836} = {7EFFD2C6-2041-4967-A715-0F817D70C433}
+		{BBB1A129-9ED7-4F08-B710-B6C287197BFB} = {7EFFD2C6-2041-4967-A715-0F817D70C433}
+		{ADF28580-F8A0-4495-96D6-736C6C7CF3FF} = {7EFFD2C6-2041-4967-A715-0F817D70C433}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}

applications/KonSoft.AuthServer/KonSoft.AuthServer.csproj

@@ -69,4 +69,8 @@
     <PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="8.3.4" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\shared\KonSoft.Shared.Hosting.Microservices\KonSoft.Shared.Hosting.Microservices.csproj" />
+  </ItemGroup>
+
 </Project>

applications/KonSoft.AuthServer/KonSoftAuthServerModule.cs

@@ -1,48 +1,31 @@
+using KonSoft.Shared.Hosting.AspNetCore;
+using KonSoft.Shared.Hosting.Microservices;
+using KonSoft.Shared.Localization.Localization;
 using Localization.Resources.AbpUi;
-using Medallion.Threading;
-using Medallion.Threading.Redis;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using StackExchange.Redis;
-using System;
-using System.IO;
-using System.Linq;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Account.Localization;
 using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
-using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Auditing;
-using Volo.Abp.Autofac;
 using Volo.Abp.BackgroundJobs;
-using Volo.Abp.Caching;
-using Volo.Abp.Caching.StackExchangeRedis;
-using Volo.Abp.DistributedLocking;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.OpenIddict;
 using Volo.Abp.Security.Claims;
-using Volo.Abp.UI.Navigation.Urls;
-using Volo.Abp.VirtualFileSystem;
 
 namespace KonSoft;
 
 [DependsOn(
-    typeof(AbpAutofacModule),
-    typeof(AbpCachingStackExchangeRedisModule),
-    typeof(AbpDistributedLockingModule),
     typeof(AbpAccountWebOpenIddictModule),
     typeof(AbpAccountApplicationModule),
     typeof(AbpAccountHttpApiModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
+    typeof(KonSoftSharedHostingMicroservicesModule)
-    typeof(AbpAspNetCoreSerilogModule)
     )]
 public class KonSoftAuthServerModule : AbpModule
 {
@@ -107,54 +90,11 @@ public class KonSoftAuthServerModule : AbpModule
                 options.ApplicationName = "AuthServer";
         });
 
-        Configure<AppUrlOptions>(options =>
-        {
-            options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"];
-            options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"]?.Split(',') ?? []);
-        });
-
         Configure<AbpBackgroundJobOptions>(options =>
         {
             options.IsJobExecutionEnabled = false;
         });
 
-        Configure<AbpDistributedCacheOptions>(options =>
-        {
-            options.KeyPrefix = "KonSoft:";
-        });
-
-        var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("KonSoft");
-        if (!hostingEnvironment.IsDevelopment())
-        {
-            var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!);
-            dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "KonSoft-Protection-Keys");
-        }
-
-        context.Services.AddSingleton<IDistributedLockProvider>(sp =>
-        {
-            var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!);
-            return new RedisDistributedSynchronizationProvider(connection.GetDatabase());
-        });
-
-        context.Services.AddCors(options =>
-        {
-            options.AddDefaultPolicy(builder =>
-            {
-                builder
-                    .WithOrigins(
-                        configuration["App:CorsOrigins"]?
-                            .Split(",", StringSplitOptions.RemoveEmptyEntries)
-                            .Select(o => o.RemovePostFix("/"))
-                            .ToArray() ?? []
-                    )
-                    .WithAbpExposedHeaders()
-                    .SetIsOriginAllowedToAllowWildcardSubdomains()
-                    .AllowAnyHeader()
-                    .AllowAnyMethod()
-                    .AllowCredentials();
-            });
-        });
-
         context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options =>
         {
             options.IsDynamicClaimsEnabled = true;
@@ -185,7 +125,7 @@ public class KonSoftAuthServerModule : AbpModule
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();
 
-        if (MultiTenancyConsts.IsEnabled)
+        if (KonSoftConsts.MultiTenancyEnabled)
         {
             app.UseMultiTenancy();
         }

applications/KonSoft.AuthServer/KonSoftBrandingProvider.cs

@@ -1,7 +1,7 @@
-using Microsoft.Extensions.Localization;
+using KonSoft.Shared.Localization.Localization;
-using KonSoft.Localization;
+using Microsoft.Extensions.Localization;
-using Volo.Abp.Ui.Branding;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Ui.Branding;
 
 namespace KonSoft;
 

applications/KonSoft.AuthServer/Pages/Index.cshtml

@@ -2,7 +2,7 @@
 @using Microsoft.AspNetCore.Http.Extensions
 @using Microsoft.AspNetCore.Mvc.Localization
 @using KonSoft.Pages
-@using KonSoft.Localization
+@using KonSoft.Shared.Localization.Localization
 @using Volo.Abp.Users
 @using Volo.Abp.AspNetCore.Mvc.UI.Theming
 @using Volo.Abp.Ui.Branding

microservices/KonSoft.Admin.HttpApi.Host/AdminHttpApiHostModule.cs

@@ -1,179 +1,37 @@
-using System;
+using KonSoft.Admin.EntityFrameworkCore;
-using System.Collections.Generic;
+using KonSoft.Shared.Hosting.AspNetCore;
-using System.IO;
+using KonSoft.Shared.Hosting.Microservices;
-using System.Linq;
-using Medallion.Threading;
-using Medallion.Threading.Redis;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNetCore.DataProtection;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using KonSoft.Admin.EntityFrameworkCore;
-using KonSoft.Admin.MultiTenancy;
-using StackExchange.Redis;
-using Microsoft.OpenApi.Models;
 using Volo.Abp;
-using Volo.Abp.AspNetCore.Authentication.JwtBearer;
+using Volo.Abp.BackgroundJobs;
-using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
-using Volo.Abp.AspNetCore.Serilog;
-using Volo.Abp.Autofac;
-using Volo.Abp.Caching;
-using Volo.Abp.Caching.StackExchangeRedis;
-using Volo.Abp.DistributedLocking;
-using Volo.Abp.Identity;
-using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
-using Volo.Abp.Security.Claims;
-using Volo.Abp.Swashbuckle;
-using Volo.Abp.VirtualFileSystem;
 
 namespace KonSoft.Admin;
 
 [DependsOn(
     typeof(AdminHttpApiModule),
-    typeof(AbpAutofacModule),
-    typeof(AbpCachingStackExchangeRedisModule),
-    typeof(AbpDistributedLockingModule),
-    typeof(AbpAspNetCoreMvcUiMultiTenancyModule),
-    typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
     typeof(AdminApplicationModule),
     typeof(AdminEntityFrameworkCoreModule),
-    typeof(AbpAspNetCoreSerilogModule),
+    typeof(KonSoftSharedHostingMicroservicesModule)
-    typeof(AbpSwashbuckleModule)
 )]
 public class AdminHttpApiHostModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         var configuration = context.Services.GetConfiguration();
-        var hostingEnvironment = context.Services.GetHostingEnvironment();
 
-        ConfigureConventionalControllers();
+        SwaggerConfigurationHelper.ConfigureWithOidc(
-        ConfigureAuthentication(context, configuration);
+            context: context,
-        ConfigureCache(configuration);
+            authority: configuration["AuthServer:Authority"]!,
-        ConfigureVirtualFileSystem(context);
+            scopes: ["AdministrationService"],
-        ConfigureDataProtection(context, configuration, hostingEnvironment);
+            discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
-        ConfigureDistributedLocking(context, configuration);
+            apiTitle: "Administration Service API"
-        ConfigureCors(context, configuration);
+        );
-        ConfigureSwaggerServices(context, configuration);
-    }
 
-    private void ConfigureCache(IConfiguration configuration)
+        // ֻ<><D6BB><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD>
-    {
+        Configure<AbpBackgroundJobOptions>(options => options.IsJobExecutionEnabled = false);
-        Configure<AbpDistributedCacheOptions>(options => { options.KeyPrefix = "Admin:"; });
-    }
-
-    private void ConfigureVirtualFileSystem(ServiceConfigurationContext context)
-    {
-        var hostingEnvironment = context.Services.GetHostingEnvironment();
-
-        if (hostingEnvironment.IsDevelopment())
-        {
-            Configure<AbpVirtualFileSystemOptions>(options =>
-            {
-                options.FileSets.ReplaceEmbeddedByPhysical<AdminDomainSharedModule>(
-                    Path.Combine(hostingEnvironment.ContentRootPath,
-                        $"..{Path.DirectorySeparatorChar}KonSoft.Admin.Domain.Shared"));
-                options.FileSets.ReplaceEmbeddedByPhysical<AdminDomainModule>(
-                    Path.Combine(hostingEnvironment.ContentRootPath,
-                        $"..{Path.DirectorySeparatorChar}KonSoft.Admin.Domain"));
-                options.FileSets.ReplaceEmbeddedByPhysical<AdminApplicationContractsModule>(
-                    Path.Combine(hostingEnvironment.ContentRootPath,
-                        $"..{Path.DirectorySeparatorChar}KonSoft.Admin.Application.Contracts"));
-                options.FileSets.ReplaceEmbeddedByPhysical<AdminApplicationModule>(
-                    Path.Combine(hostingEnvironment.ContentRootPath,
-                        $"..{Path.DirectorySeparatorChar}KonSoft.Admin.Application"));
-            });
-        }
-    }
-
-    private void ConfigureConventionalControllers()
-    {
-        Configure<AbpAspNetCoreMvcOptions>(options =>
-        {
-            options.ConventionalControllers.Create(typeof(AdminApplicationModule).Assembly);
-        });
-    }
-
-    private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
-    {
-        context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
-            .AddAbpJwtBearer(options =>
-            {
-                options.Authority = configuration["AuthServer:Authority"];
-                options.RequireHttpsMetadata = configuration.GetValue<bool>("AuthServer:RequireHttpsMetadata");
-                options.Audience = "Admin";
-            });
-
-        context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options =>
-        {
-            options.IsDynamicClaimsEnabled = true;
-        });
-    }
-
-    private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration)
-    {
-        context.Services.AddAbpSwaggerGenWithOAuth(
-            configuration["AuthServer:Authority"]!,
-            new Dictionary<string, string>
-            {
-                    {"Admin", "Admin API"}
-            },
-            options =>
-            {
-                options.SwaggerDoc("v1", new OpenApiInfo { Title = "Admin API", Version = "v1" });
-                options.DocInclusionPredicate((docName, description) => true);
-                options.CustomSchemaIds(type => type.FullName);
-            });
-    }
-
-    private void ConfigureDataProtection(
-        ServiceConfigurationContext context,
-        IConfiguration configuration,
-        IWebHostEnvironment hostingEnvironment)
-    {
-        var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Admin");
-        if (!hostingEnvironment.IsDevelopment())
-        {
-            var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!);
-            dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Admin-Protection-Keys");
-        }
-    }
-
-    private void ConfigureDistributedLocking(
-        ServiceConfigurationContext context,
-        IConfiguration configuration)
-    {
-        context.Services.AddSingleton<IDistributedLockProvider>(sp =>
-        {
-            var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!);
-            return new RedisDistributedSynchronizationProvider(connection.GetDatabase());
-        });
-    }
-
-    private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration)
-    {
-        context.Services.AddCors(options =>
-        {
-            options.AddDefaultPolicy(builder =>
-            {
-                builder
-                    .WithOrigins(configuration["App:CorsOrigins"]?
-                        .Split(",", StringSplitOptions.RemoveEmptyEntries)
-                        .Select(o => o.RemovePostFix("/"))
-                        .ToArray() ?? [])
-                    .WithAbpExposedHeaders()
-                    .SetIsOriginAllowedToAllowWildcardSubdomains()
-                    .AllowAnyHeader()
-                    .AllowAnyMethod()
-                    .AllowCredentials();
-            });
-        });
     }
 
     public override void OnApplicationInitialization(ApplicationInitializationContext context)
@@ -193,7 +51,7 @@ public class AdminHttpApiHostModule : AbpModule
         app.UseCors();
         app.UseAuthentication();
 
-        if (MultiTenancyConsts.IsEnabled)
+        if (KonSoftConsts.MultiTenancyEnabled)
         {
             app.UseMultiTenancy();
         }

microservices/KonSoft.Admin.HttpApi.Host/KonSoft.Admin.HttpApi.Host.csproj

@@ -10,22 +10,6 @@
     <DockerfileContext>..\..</DockerfileContext>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" />
-    <PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="8.3.4" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="8.3.4" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="8.3.4" />
-    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.4" />
-    <PackageReference Include="Volo.Abp.DistributedLocking" Version="8.3.4" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.4" />
-    <PackageReference Include="Volo.Abp.Swashbuckle" Version="8.3.4" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Remove="Logs\**" />
     <Content Remove="Logs\**" />
@@ -37,6 +21,7 @@
     <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.Application\KonSoft.Admin.Application.csproj" />
     <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.EntityFrameworkCore\KonSoft.Admin.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.HttpApi\KonSoft.Admin.HttpApi.csproj" />
+    <ProjectReference Include="..\..\shared\KonSoft.Shared.Hosting.Microservices\KonSoft.Shared.Hosting.Microservices.csproj" />
   </ItemGroup>
 
 </Project>

microservices/KonSoft.Admin.HttpApi.Host/Program.cs

@@ -1,56 +1,28 @@
-using System;
+using KonSoft.Admin;
-using System.Threading.Tasks;
+using KonSoft.Shared.Hosting.AspNetCore;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Serilog;
-using Serilog.Events;
+using System;
 
-namespace KonSoft.Admin;
+var assemblyName = typeof(Program).Assembly.GetName().Name!;
 
-public class Program
+SerilogConfigurationHelper.Configure(assemblyName);
+try
 {
-    public async static Task<int> Main(string[] args)
+    Log.Information($"Starting {assemblyName}.");
-    {
+    var app = await ApplicationBuilderHelper
-        Log.Logger = new LoggerConfiguration()
+        .BuildApplicationAsync<AdminHttpApiHostModule>(args);
-#if DEBUG
-            .MinimumLevel.Debug()
-#else
-            .MinimumLevel.Information()
-#endif
-            .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
-            .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
-            .Enrich.FromLogContext()
-            .WriteTo.Async(c => c.File("Logs/logs.txt"))
-            .WriteTo.Async(c => c.Console())
-            .CreateLogger();
-
-        try
-        {
-            Log.Information("Starting KonSoft.Admin.HttpApi.Host.");
-            var builder = WebApplication.CreateBuilder(args);
-            builder.Host.AddAppSettingsSecretsJson()
-                .UseAutofac()
-                .UseSerilog();
-            await builder.AddApplicationAsync<AdminHttpApiHostModule>();
-            var app = builder.Build();
     await app.InitializeApplicationAsync();
     await app.RunAsync();
-            return 0;
-        }
-        catch (Exception ex)
-        {
-            if (ex is HostAbortedException)
-            {
-                throw;
-            }
 
-            Log.Fatal(ex, "Host terminated unexpectedly!");
+    return 0;
-            return 1;
+}
-        }
+catch (Exception ex)
-        finally
+{
-        {
+    Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!");
-            Log.CloseAndFlush();
+    return 1;
-        }
+}
-    }
+finally
+{
+    await Log.CloseAndFlushAsync();
 }

microservices/KonSoft.Admin.HttpApi.Host/Properties/launchSettings.json

@@ -1,12 +1,5 @@
 {
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "KonSoft.Admin.HttpApi.Host": {
       "commandName": "Project",
       "launchBrowser": true,
@@ -26,13 +19,5 @@
       "publishAllPorts": true,
       "useSSL": true
     }
-  },
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "https://localhost:44354",
-      "sslPort": 44354
-    }
   }
 }

microservices/KonSoft.Admin.HttpApi.Host/appsettings.json

@@ -1,12 +1,12 @@
 {
   "App": {
-    "CorsOrigins": "https://*.Admin.com,https://localhost:44357"
+    "CorsOrigins": "https://*.KonSoft.top"
   },
   "ConnectionStrings": {
-    "Default": "Host=localhost;Port=5432;Database=Admin;User ID=root;Password=myPassword;"
+    "Default": "Host=1.94.99.47;Port=26666;Database=Clean;User ID=postgres;Password=zzx7845zzx;"
   },
   "Redis": {
-    "Configuration": "127.0.0.1"
+    "Configuration": "1.94.99.47:26668"
   },
   "AuthServer": {
     "Authority": "https://localhost:44397",
@@ -15,5 +15,15 @@
   },
   "StringEncryption": {
     "DefaultPassPhrase": "g3NdNOyDR9oYj0gK"
+  },
+  "RabbitMQ": {
+    "Connections": {
+      "Default": {
+        "HostName": "1.94.99.47",
+        "Port": 26667,
+        "UserName": "admin",
+        "Password": "zzx7845zzx"
+      }
+    }
   }
 }

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

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

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

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+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; }
+
+        public string Remark { get; set; }
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+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>();
+    }
+}

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

@@ -0,0 +1,17 @@
+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;
+
+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();  // 擅长服务类型
+    }
+}

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

@@ -0,0 +1,26 @@
+using KonSoft.Admin.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace KonSoft.Admin.IApplicationServices
+{
+    public interface IOrderAppService : IApplicationService
+    {
+        /// <summary>
+        /// 创建订单
+        /// </summary>
+        /// <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);
+        Task CompleteServiceAsync(Guid orderId);
+        Task ConfirmAsync(Guid orderId);
+        Task CancelAsync(Guid orderId, string reason);
+    }
+}

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

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

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

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

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

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

modules/admin/src/KonSoft.Admin.Application/AdminApplicationAutoMapperProfile.cs

@@ -1,4 +1,6 @@
 using AutoMapper;
+using KonSoft.Admin.Dtos;
+using KonSoft.Admin.Entities;
 
 namespace KonSoft.Admin;
 
@@ -9,5 +11,10 @@ public class AdminApplicationAutoMapperProfile : Profile
         /* You can configure your AutoMapper mapping configuration here.
          * Alternatively, you can split your mapping configurations
          * into multiple profile classes for a better organization. */
+
+        CreateMap<Order, OrderDto>();
+        //CreateMap<CreateOrderDto, Order>();
+        CreateMap<AddressDto, AddressInfo>();
+        CreateMap<ServiceCategoryDto, ServiceCategory>();
     }
 }

modules/admin/src/KonSoft.Admin.Application/ApplicationServices/OrderAppService.cs

@@ -0,0 +1,115 @@
+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.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Volo.Abp.ObjectMapping;
+
+namespace KonSoft.Admin.ApplicationServices
+{
+    public class OrderAppService : ApplicationService, IOrderAppService
+    {
+        private readonly IOrderRepository _orderRepository;
+
+        public OrderAppService(IOrderRepository orderRepository)
+        {
+            _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)
+        {
+            var order = await _orderRepository.GetAsync(o => o.Id == orderId);
+            order.AssignWorker(workerId);
+        }
+
+        /// <summary>
+        /// 取消订单
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <param name="reason"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task CancelAsync(Guid orderId, string reason)
+        {
+            var order = await _orderRepository.GetAsync(o => o.Id == orderId);
+            order.Cancel(reason);
+        }
+        /// <summary>
+        /// 完成订单
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task CompleteServiceAsync(Guid orderId)
+        {
+            var order = await _orderRepository.GetAsync(o => o.Id == orderId);
+            order.CompleteService();
+        }
+        /// <summary>
+        /// 确认订单
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task ConfirmAsync(Guid orderId)
+        {
+            var order = await _orderRepository.GetAsync(o => o.Id == orderId);
+            order.ConfirmCompletion();
+        }
+        /// <summary>
+        /// 创建订单
+        /// </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);
+            return ObjectMapper.Map<Order, OrderDto>(order);
+        }
+        /// <summary>
+        /// 支付
+        /// </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>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task StartServiceAsync(Guid orderId)
+        {
+            var order = await _orderRepository.GetAsync(o => o.Id == orderId);
+            order.StartService();
+        }
+
+        public async Task<OrderDto> GetAsync(Guid id)
+        {
+            var order = await _orderRepository.GetAsync(o => o.Id == id);
+            return ObjectMapper.Map<Order, OrderDto>(order);
+        }
+    }
+}

modules/admin/src/KonSoft.Admin.Application/ApplicationServices/ServiceCategoryAppService.cs

@@ -0,0 +1,75 @@
+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 ServiceCategoryAppService : ApplicationService, IServiceCategoryAppService
+    {
+        private readonly IRepository<ServiceCategory, Guid> _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();
+        }
+    }
+}

modules/admin/src/KonSoft.Admin.Application/ApplicationServices/WorkerAppService.cs

@@ -0,0 +1,20 @@
+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)
+        {
+        }
+    }
+}

modules/admin/src/KonSoft.Admin.Application/ApplicationServices/WorkerAssignmentService.cs

@@ -0,0 +1,27 @@
+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;
+        }
+    }
+}

modules/admin/src/KonSoft.Admin.Application/KonSoft.Admin.Application.csproj

@@ -6,8 +6,8 @@
     <RootNamespace>KonSoft.Admin</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\KonSoft.Admin.Domain\KonSoft.Admin.Domain.csproj"/>
+    <ProjectReference Include="..\KonSoft.Admin.Domain\KonSoft.Admin.Domain.csproj" />
-    <ProjectReference Include="..\KonSoft.Admin.Application.Contracts\KonSoft.Admin.Application.Contracts.csproj"/>
+    <ProjectReference Include="..\KonSoft.Admin.Application.Contracts\KonSoft.Admin.Application.Contracts.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Volo.Abp.Account.Application" Version="8.3.4" />

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

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

modules/admin/src/KonSoft.Admin.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs

@@ -1,10 +0,0 @@
-namespace KonSoft.Admin.MultiTenancy;
-
-public static class MultiTenancyConsts
-{
-    /* Enable/disable multi-tenancy easily in a single point.
-     * If you will never need to multi-tenancy, you can remove
-     * related modules and code parts, including this file.
-     */
-    public const bool IsEnabled = true;
-}

modules/admin/src/KonSoft.Admin.Domain/AdminDomainModule.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using KonSoft.Admin.MultiTenancy;
 using Volo.Abp.AuditLogging;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.Emailing;
@@ -56,10 +55,6 @@ public class AdminDomainModule : AbpModule
             options.Languages.Add(new LanguageInfo("es", "es", "Español"));
         });
 
-        Configure<AbpMultiTenancyOptions>(options =>
-        {
-            options.IsEnabled = MultiTenancyConsts.IsEnabled;
-        });
 
 #if DEBUG
         context.Services.Replace(ServiceDescriptor.Singleton<IEmailSender, NullEmailSender>());

modules/admin/src/KonSoft.Admin.Domain/Entities/AddressInfo.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Values;
+
+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(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;
+        }
+
+    }
+}

modules/admin/src/KonSoft.Admin.Domain/Entities/Order.cs

@@ -0,0 +1,157 @@
+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;
+using Volo.Abp.Identity;
+
+namespace KonSoft.Admin.Entities
+{
+    public class Order : FullAuditedAggregateRoot<Guid>
+    {
+        /// <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;
+        }
+    }
+}

modules/admin/src/KonSoft.Admin.Domain/Entities/ServiceCategory.cs

@@ -0,0 +1,46 @@
+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
+{
+    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() { }
+
+        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();
+        }
+
+
+    }
+}

modules/admin/src/KonSoft.Admin.Domain/Entities/Worker.cs

@@ -0,0 +1,34 @@
+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);
+        }
+    }
+}

modules/admin/src/KonSoft.Admin.Domain/Repositories/IOrderRepository.cs

@@ -0,0 +1,14 @@
+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
+{
+    public interface IOrderRepository : IRepository<Order>
+    {
+    }
+}

modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using KonSoft.Admin.Entities;
+using Microsoft.EntityFrameworkCore;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
 using Volo.Abp.Data;
@@ -53,6 +54,12 @@ public class AdminDbContext :
 
     #endregion
 
+    #region 订单
+    public DbSet<Order> Order { get; set; }
+    public DbSet<Worker> Worker { get; set; }
+    public DbSet<ServiceCategory> ServiceCategory { get; set; }
+    #endregion
+
     public AdminDbContext(DbContextOptions<AdminDbContext> options)
         : base(options)
     {

modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/Configures/ApplicationDbContextModelBuilderExtensions.cs

@@ -0,0 +1,52 @@
+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
+{
+    public static class ApplicationDbContextModelBuilderExtensions
+    {
+        public static void ConfigureApplication([NotNull] this ModelBuilder builder)
+        {
+            Check.NotNull(builder, nameof(builder));
+
+            builder.Entity<Order>(b =>
+            {
+                b.ToTable(AdminConsts.DbTablePrefix + nameof(Order) + AdminConsts.DbSchema);
+
+                b.OwnsOne(o => o.Address, a =>
+                {
+                    a.Property(p => p.ContactName).HasColumnName("ContactName").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);
+
+
+            });
+
+        }
+
+
+    }
+}

modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/Repositories/OrderRepository.cs

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

shared/KonSoft.Shared.Hosting.AspNetCore/AbpSwaggerUIBuilderExtensions.cs

@@ -0,0 +1,27 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Swashbuckle.AspNetCore.SwaggerUI;
+using Volo.Abp.Swashbuckle;
+
+namespace KonSoft.Shared.Hosting.AspNetCore;
+
+public static class AbpSwaggerUIBuilderExtensions
+{
+    public static IApplicationBuilder UseAbpSwaggerWithCustomScriptUI(
+        this IApplicationBuilder app,
+        Action<SwaggerUIOptions>? setupAction = null)
+    {
+        var resolver = app.ApplicationServices.GetService<ISwaggerHtmlResolver>();
+
+        return app.UseSwaggerUI(options =>
+        {
+            options.InjectJavascript("ui/abp.js");
+            options.InjectJavascript("ui/abp.swagger.js");
+            options.InjectJavascript("ui/requestinterceptor.js");
+            options.IndexStream = () => resolver?.Resolver();
+
+            setupAction?.Invoke(options);
+        });
+    }
+}

shared/KonSoft.Shared.Hosting.AspNetCore/ApplicationBuilderHelper.cs

@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Serilog;
+using Volo.Abp.Modularity;
+
+namespace KonSoft.Shared.Hosting.AspNetCore;
+
+public static class ApplicationBuilderHelper
+{
+    public static async Task<WebApplication> BuildApplicationAsync<TStartupModule>(string[] args)
+        where TStartupModule : IAbpModule
+    {
+        var builder = WebApplication.CreateBuilder(args);
+        builder.Host
+            .AddAppSettingsSecretsJson()
+            .UseAutofac()
+            .UseSerilog();
+
+        await builder.AddApplicationAsync<TStartupModule>();
+        return builder.Build();
+    }
+}

shared/KonSoft.Shared.Hosting.AspNetCore/KonSoft.Shared.Hosting.AspNetCore.csproj

@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+		<RootNamespace>KonSoft.Shared.Hosting.AspNetCore</RootNamespace>
+	  <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\KonSoft.Shared.Hosting\KonSoft.Shared.Hosting.csproj" />
+    <ProjectReference Include="..\KonSoft.Shared.Localization\KonSoft.Shared.Localization.csproj" />
+  </ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+		<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.4" />
+		<PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="8.3.4" />
+		<PackageReference Include="Volo.Abp.Swashbuckle" Version="8.3.4" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Remove="wwwroot\swagger\ui\requestinterceptor.js" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Content Include="wwwroot\swagger\ui\requestinterceptor.js">
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+		</Content>
+	</ItemGroup>
+
+	<ItemGroup>
+		<EmbeddedResource Include="wwwroot\swagger\ui\requestinterceptor.js" />
+	</ItemGroup>
+
+</Project>

shared/KonSoft.Shared.Hosting.AspNetCore/KonSoftBrandingProvider.cs

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

shared/KonSoft.Shared.Hosting.AspNetCore/KonSoftConsts.cs

@@ -0,0 +1,8 @@
+namespace KonSoft.Shared.Hosting.AspNetCore;
+
+public static class KonSoftConsts
+{
+    public const string AuthServerAudience = "KonSoft";
+    public const string AnonymousUserClaimName = "anonymous_id";
+    public const bool MultiTenancyEnabled = true;
+}

shared/KonSoft.Shared.Hosting.AspNetCore/KonSoftSharedHostingAspNetCoreModule.cs

@@ -0,0 +1,32 @@
+using KonSoft.Shared.Localization;
+using Volo.Abp.AspNetCore.Serilog;
+using Volo.Abp.Modularity;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Swashbuckle;
+using Volo.Abp.VirtualFileSystem;
+
+namespace KonSoft.Shared.Hosting.AspNetCore
+{
+    [DependsOn(
+        typeof(KonSoftSharedLocalizationModule),
+        typeof(KonSoftSharedHostingModule),
+        typeof(AbpAspNetCoreSerilogModule),
+        typeof(AbpSwashbuckleModule),
+        typeof(AbpMultiTenancyModule)
+    )]
+    public class KonSoftSharedHostingAspNetCoreModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<KonSoftSharedHostingAspNetCoreModule>("KonSoft.Shared.Hosting.AspNetCore");
+            });
+
+            Configure<AbpMultiTenancyOptions>(options =>
+            {
+                options.IsEnabled = KonSoftConsts.MultiTenancyEnabled;
+            });
+        }
+    }
+}

shared/KonSoft.Shared.Hosting.AspNetCore/SerilogConfigurationHelper.cs

@@ -0,0 +1,24 @@
+using Serilog;
+using Serilog.Events;
+
+namespace KonSoft.Shared.Hosting.AspNetCore;
+
+public static class SerilogConfigurationHelper
+{
+    public static void Configure(string applicationName)
+    {
+        Log.Logger = new LoggerConfiguration()
+#if DEBUG
+            .MinimumLevel.Debug()
+#else
+                .MinimumLevel.Information()
+#endif
+            .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+            .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
+            .Enrich.FromLogContext()
+            .Enrich.WithProperty("Application", $"{applicationName}")
+            .WriteTo.Async(c => c.File("Logs/logs.txt"))
+            .WriteTo.Async(c => c.Console())
+            .CreateLogger();
+    }
+}

shared/KonSoft.Shared.Hosting.AspNetCore/SwaggerConfigurationHelper.cs

@@ -0,0 +1,32 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.OpenApi.Models;
+using Volo.Abp.Modularity;
+
+namespace KonSoft.Shared.Hosting.AspNetCore;
+
+public static class SwaggerConfigurationHelper
+{
+    public static void ConfigureWithOidc(
+        ServiceConfigurationContext context,
+        string authority,
+        string[] scopes,
+        string apiTitle,
+        string apiVersion = "v1",
+        string apiName = "v1",
+        string[]? flows = null,
+        string? discoveryEndpoint = null
+    )
+    {
+        context.Services.AddAbpSwaggerGenWithOidc(
+            authority: authority,
+            scopes: scopes,
+            flows: flows,
+            discoveryEndpoint: discoveryEndpoint,
+            options =>
+            {
+                options.SwaggerDoc(apiName, new OpenApiInfo { Title = apiTitle, Version = apiVersion });
+                options.DocInclusionPredicate((docName, description) => true);
+                options.CustomSchemaIds(type => type.FullName);
+            });
+    }
+}

shared/KonSoft.Shared.Hosting.AspNetCore/wwwroot/swagger/ui/requestinterceptor.js

@@ -0,0 +1,9 @@
+const originalFetch = window.fetch;
+
+window.fetch = function (input, init) {
+    if (init !== undefined && init.headers['RequestVerificationToken'] !== undefined) {
+        delete init.headers['RequestVerificationToken'];
+    }
+
+    return originalFetch.apply(this, arguments);
+};

shared/KonSoft.Shared.Hosting.Gateways/Class1.cs

@@ -0,0 +1,7 @@
+namespace KonSoft.Shared.Hosting.Gateways
+{
+    public class Class1
+    {
+
+    }
+}

shared/KonSoft.Shared.Hosting.Gateways/KonSoft.Shared.Hosting.Gateways.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
+		<RootNamespace>KonSoft.Shared.Hosting.Gateways</RootNamespace>
 	  <Nullable>enable</Nullable>
   </PropertyGroup>
 

shared/KonSoft.Shared.Hosting.Microservices/KonSoft.Shared.Hosting.Microservices.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+		<RootNamespace>KonSoft.Shared.Hosting.Microservices</RootNamespace>
+	  <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\KonSoft.Shared.Hosting.AspNetCore\KonSoft.Shared.Hosting.AspNetCore.csproj" />
+  </ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.20" />
+		<PackageReference Include="DistributedLock.Redis" Version="1.1.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="8.3.4" />
+		<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="8.3.4" />
+		<PackageReference Include="Volo.Abp.BackgroundJobs.RabbitMQ" Version="8.3.4" />
+		<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.4" />
+		<PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="8.3.4" />
+		<PackageReference Include="Volo.Abp.DistributedLocking" Version="8.3.4" />
+	</ItemGroup>
+
+</Project>

shared/KonSoft.Shared.Hosting.Microservices/KonSoftSharedHostingMicroservivesModule.cs

@@ -0,0 +1,100 @@
+using KonSoft.Shared.Hosting.AspNetCore;
+using Medallion.Threading;
+using Medallion.Threading.Redis;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using StackExchange.Redis;
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Cors;
+using Volo.Abp.AspNetCore.Authentication.JwtBearer;
+using Volo.Abp.BackgroundJobs.RabbitMQ;
+using Volo.Abp.Caching;
+using Volo.Abp.Caching.StackExchangeRedis;
+using Volo.Abp.DistributedLocking;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.EventBus.RabbitMq;
+using Volo.Abp.Modularity;
+using Volo.Abp.Security.Claims;
+
+namespace KonSoft.Shared.Hosting.Microservices
+{
+    [DependsOn(
+        typeof(KonSoftSharedHostingAspNetCoreModule),
+        typeof(AbpBackgroundJobsRabbitMqModule),
+        typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
+        typeof(AbpEventBusRabbitMqModule),
+        typeof(AbpCachingStackExchangeRedisModule),
+        typeof(AbpDistributedLockingModule),
+        typeof(AbpEntityFrameworkCoreModule)
+    )]
+    public class KonSoftSharedHostingMicroservicesModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            var configuration = context.Services.GetConfiguration();
+            var hostingEnvironment = context.Services.GetHostingEnvironment();
+
+            ConfigureCache();
+            ConfigureDataProtection(context, configuration);
+            ConfigureAuthentication(context, configuration);
+            ConfigureCors(context, configuration);
+        }
+
+        private void ConfigureCache()
+        {
+            Configure<AbpDistributedCacheOptions>(options => { options.KeyPrefix = "KonSoft:"; });
+        }
+
+        private void ConfigureDataProtection(
+            ServiceConfigurationContext context,
+            IConfiguration configuration)
+        {
+            context.Services.AddDataProtection().SetApplicationName("KonSoft")
+                .PersistKeysToStackExchangeRedis(ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!),
+                    "KonSoft-Protection-Keys");
+
+            context.Services.AddSingleton<IDistributedLockProvider>(_ =>
+                new RedisDistributedSynchronizationProvider(ConnectionMultiplexer
+                    .Connect(configuration["Redis:Configuration"]!).GetDatabase()));
+        }
+
+        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
+        {
+            context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+                .AddAbpJwtBearer(options =>
+                {
+                    options.Authority = configuration["AuthServer:Authority"];
+                    options.RequireHttpsMetadata = configuration.GetValue<bool>("AuthServer:RequireHttpsMetadata");
+                    options.Audience = KonSoftConsts.AuthServerAudience;
+                });
+
+            context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options =>
+            {
+                options.IsDynamicClaimsEnabled = true;
+            });
+        }
+
+        private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration)
+        {
+            context.Services.AddCors(options =>
+            {
+                options.AddDefaultPolicy(builder =>
+                {
+                    builder
+                        .WithOrigins(configuration["App:CorsOrigins"]?
+                            .Split(",", StringSplitOptions.RemoveEmptyEntries)
+                            .Select(o => o.RemovePostFix("/"))
+                            .ToArray() ?? [])
+                        .WithAbpExposedHeaders()
+                        .SetIsOriginAllowedToAllowWildcardSubdomains()
+                        .AllowAnyHeader()
+                        .AllowAnyMethod()
+                        .AllowCredentials();
+                });
+            });
+        }
+    }
+}

shared/KonSoft.Shared.Hosting/KonSoft.Shared.Hosting.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<RootNamespace>KonSoft.Shared.Hosting</RootNamespace>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+		<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
+		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+		<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Volo.Abp.Autofac" Version="8.3.4" />
+		<PackageReference Include="Volo.Abp.Data" Version="8.3.4" />
+	</ItemGroup>
+
+</Project>

shared/KonSoft.Shared.Hosting/KonSoftSharedHostingModule.cs

@@ -0,0 +1,21 @@
+using Volo.Abp.Autofac;
+using Volo.Abp.Data;
+using Volo.Abp.Modularity;
+
+namespace KonSoft.Shared.Hosting
+{
+    [DependsOn(
+        typeof(AbpAutofacModule),
+        typeof(AbpDataModule)
+    )]
+    public class KonSoftSharedHostingModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpDbConnectionOptions>(options =>
+            {
+                // TODO Mapping DbConnections
+            });
+        }
+    }
+}

shared/KonSoft.Shared.Localization/KonSoft.Shared.Localization.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+		<RootNamespace>KonSoft.Shared.Localization</RootNamespace>
+	  <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4" />
+		<PackageReference Include="Volo.Abp.Validation" Version="8.3.4" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<EmbeddedResource Include="Localization\EShopOnAbp\*.json" />
+		<Content Remove="Localization\EShopOnAbp\*.json" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <EmbeddedResource Include="Localization\KonSoft\en.json" />
+	  <EmbeddedResource Include="Localization\KonSoft\zh-Hans.json" />
+	</ItemGroup>
+
+</Project>

shared/KonSoft.Shared.Localization/KonSoftSharedLocalizationModule.cs

@@ -0,0 +1,35 @@
+using KonSoft.Shared.Localization.Localization;
+using Volo.Abp.Localization;
+using Volo.Abp.Modularity;
+using Volo.Abp.Validation;
+using Volo.Abp.Validation.Localization;
+using Volo.Abp.VirtualFileSystem;
+
+namespace KonSoft.Shared.Localization
+{
+
+    [DependsOn(
+        typeof(AbpValidationModule)
+    )]
+    public class KonSoftSharedLocalizationModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<KonSoftSharedLocalizationModule>();
+            });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Add<KonSoftResource>("en")
+                    .AddBaseTypes(
+                        typeof(AbpValidationResource)
+                    ).AddVirtualJson("/Localization/KonSoft");
+
+                options.DefaultResourceType = typeof(KonSoftResource);
+            });
+        }
+    }
+}

shared/KonSoft.Shared.Localization/Localization/KonSoft/en.json

@@ -0,0 +1,9 @@
+{
+  "culture": "en",
+  "texts": {
+    "AppName": "Admin",
+    "Menu:Home": "Home",
+    "Welcome": "Welcome",
+    "LongWelcomeMessage": "Welcome to the application. This is a startup project based on the ABP framework. For more information, visit abp.io."
+  }
+}

shared/KonSoft.Shared.Localization/Localization/KonSoft/zh-Hans.json

@@ -0,0 +1,9 @@
+{
+  "culture": "zh-Hans",
+  "texts": {
+    "AppName": "Admin",
+    "Menu:Home": "首页",
+    "Welcome": "欢迎",
+    "LongWelcomeMessage": "欢迎使用本应用程序。这是一个基于 ABP 框架的启动项目。更多信息，请访问 abp.io。"
+  }
+}

shared/KonSoft.Shared.Localization/Localization/KonSoftResource.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.Localization;
+
+namespace KonSoft.Shared.Localization.Localization
+{
+    [LocalizationResourceName("KonSoft")]
+    public class KonSoftResource
+    {
+    }
+}

shared/KonSoft.Shared/Class1.cs

@@ -1,7 +0,0 @@
-namespace KonSoft.Shared
-{
-    public class Class1
-    {
-
-    }
-}