chore 优化authserver配置

This reverts commit 6dd678ec31.

.gitignore

@@ -263,3 +263,6 @@ src/KonSoft.Admin.Blazor.Server.Tiered/Logs/*
 
 # Use abp install-libs to restore.
 **/wwwroot/libs/*
+
+**/Logs/*
+**/logs.txt

KonSoft.sln

@@ -193,6 +193,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.Hosting.Gate
 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
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.DbMigrator", "shared\KonSoft.Shared.DbMigrator\KonSoft.Shared.DbMigrator.csproj", "{AFCC65BC-8477-819B-2575-674AC9D2FDDD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{72B7AEA8-8968-469E-AFFC-170E572D640F}"
+	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
+		adminservice.Jenkinsfile = adminservice.Jenkinsfile
+		authserver.Jenkinsfile = authserver.Jenkinsfile
+		docker-compose.yml = docker-compose.yml
+		internalgateway.Jenkinsfile = internalgateway.Jenkinsfile
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -499,6 +510,10 @@ Global
 		{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
+		{AFCC65BC-8477-819B-2575-674AC9D2FDDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFCC65BC-8477-819B-2575-674AC9D2FDDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFCC65BC-8477-819B-2575-674AC9D2FDDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFCC65BC-8477-819B-2575-674AC9D2FDDD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -594,6 +609,7 @@ Global
 		{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}
+		{AFCC65BC-8477-819B-2575-674AC9D2FDDD} = {7EFFD2C6-2041-4967-A715-0F817D70C433}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}

KonSoft.sln.DotSettings

@@ -20,4 +20,6 @@
 	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=Async/@EntryIndexedValue">False</s:String>
 	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=Mutable/@EntryIndexedValue">False</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">SQL</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Consts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Iddict/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>

adminservice.Jenkinsfile

@@ -0,0 +1,27 @@
+pipeline {
+    agent any
+    
+    stages {
+
+        stage('Deploy') {
+            steps {
+                script {
+                    try {
+                        sh '/usr/libexec/docker/cli-plugins/docker-compose -f ./docker-compose.yml up --build -d adminservice'
+                    } catch (Exception e) {
+                        error "部署失败: ${e.message}"
+                    }
+                }
+            }
+        }
+        
+        stage('Health Check') {
+            steps {
+                script {
+                    sleep time: 30, unit: 'SECONDS'
+                    sh 'docker ps | grep adminservice'
+                }
+            }
+        }
+    }
+}

applications/KonSoft.AuthServer/Dockerfile

@@ -1,13 +1,32 @@
 FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 USER $APP_UID
 WORKDIR /app
-EXPOSE 8081
+EXPOSE 8080
 
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
+ARG NODE_VERSION=16.13.0
+ARG YARN_VERSION=1.22.15
+RUN echo "deb https://mirrors.huaweicloud.com/debian/ bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
+    echo "deb https://mirrors.huaweicloud.com/debian/ bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
+    echo "deb https://mirrors.huaweicloud.com/debian/ bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
+    echo "deb https://mirrors.huaweicloud.com/debian-security bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
+    apt-get update -yq && \
+    apt-get install -yq curl gnupg && \
+    curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
+    apt-get install -yq nodejs && \
+    npm install -g yarn@${YARN_VERSION} && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["NuGet.Config", "."]
 COPY ["applications/KonSoft.AuthServer/KonSoft.AuthServer.csproj", "applications/KonSoft.AuthServer/"]
+COPY ["modules/admin/src/KonSoft.Admin.Application/KonSoft.Admin.Application.csproj", "modules/admin/src/KonSoft.Admin.Application/"]
+COPY ["modules/admin/src/KonSoft.Admin.Domain/KonSoft.Admin.Domain.csproj", "modules/admin/src/KonSoft.Admin.Domain/"]
+COPY ["modules/admin/src/KonSoft.Admin.Domain.Shared/KonSoft.Admin.Domain.Shared.csproj", "modules/admin/src/KonSoft.Admin.Domain.Shared/"]
+COPY ["modules/admin/src/KonSoft.Admin.Application.Contracts/KonSoft.Admin.Application.Contracts.csproj", "modules/admin/src/KonSoft.Admin.Application.Contracts/"]
+COPY ["modules/admin/src/KonSoft.Admin.EntityFrameworkCore/KonSoft.Admin.EntityFrameworkCore.csproj", "modules/admin/src/KonSoft.Admin.EntityFrameworkCore/"]
 COPY ["shared/KonSoft.Shared.Hosting.Microservices/KonSoft.Shared.Hosting.Microservices.csproj", "shared/KonSoft.Shared.Hosting.Microservices/"]
 COPY ["shared/KonSoft.Shared.Hosting.AspNetCore/KonSoft.Shared.Hosting.AspNetCore.csproj", "shared/KonSoft.Shared.Hosting.AspNetCore/"]
 COPY ["shared/KonSoft.Shared.Hosting/KonSoft.Shared.Hosting.csproj", "shared/KonSoft.Shared.Hosting/"]
@@ -15,6 +34,13 @@ COPY ["shared/KonSoft.Shared.Localization/KonSoft.Shared.Localization.csproj", "
 RUN dotnet restore "./applications/KonSoft.AuthServer/KonSoft.AuthServer.csproj"
 COPY . .
 WORKDIR "/src/applications/KonSoft.AuthServer"
+RUN dotnet nuget locals all --clear
+RUN dotnet nuget add source https://mirrors.huaweicloud.com/repository/nuget/v3/index.json -n HuaweiCloud
+RUN dotnet tool install -g Volo.Abp.Cli --version 8.3.4
+ENV PATH="$PATH:/root/.dotnet/tools"
+RUN yarn config set registry https://registry.npmmirror.com
+RUN yarn cache clean
+RUN abp install-libs
 RUN dotnet build "./KonSoft.AuthServer.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 # 此阶段用于发布要复制到最终阶段的服务项目

applications/KonSoft.AuthServer/KonSoft.AuthServer.csproj

@@ -59,6 +59,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.Application\KonSoft.Admin.Application.csproj" />
+    <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.EntityFrameworkCore\KonSoft.Admin.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\shared\KonSoft.Shared.Hosting.Microservices\KonSoft.Shared.Hosting.Microservices.csproj" />
   </ItemGroup>
 

applications/KonSoft.AuthServer/KonSoftAuthServerModule.cs

@@ -1,15 +1,23 @@
+using KonSoft.Admin;
+using KonSoft.Admin.EntityFrameworkCore;
 using KonSoft.Shared.Hosting.AspNetCore;
 using KonSoft.Shared.Hosting.Microservices;
 using KonSoft.Shared.Localization.Localization;
 using Localization.Resources.AbpUi;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using System;
+using System.Linq;
+using System.Net;
 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.Auditing;
@@ -18,6 +26,8 @@ using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.OpenIddict;
 using Volo.Abp.Security.Claims;
+using Volo.Abp.UI.Navigation.Urls;
+using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
 
 namespace KonSoft;
 
@@ -25,6 +35,9 @@ namespace KonSoft;
     typeof(AbpAccountWebOpenIddictModule),
     typeof(AbpAccountApplicationModule),
     typeof(AbpAccountHttpApiModule), 
+    typeof(AdminApplicationModule),
+    typeof(AdminEntityFrameworkCoreModule),
+    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
     typeof(KonSoftSharedHostingMicroservicesModule)
 )]
 public class KonSoftAuthServerModule : AbpModule
@@ -38,12 +51,22 @@ public class KonSoftAuthServerModule : AbpModule
         {
             builder.AddValidation(options =>
             {
-                options.AddAudiences("KonSoft");
+                options.AddAudiences(KonSoftConsts.AuthServerAudience);
                 options.UseLocalServer();
                 options.UseAspNetCore();
             });
         });
 
+        PreConfigure<ForwardedHeadersOptions>(options =>
+        {
+            options.ForwardedHeaders = ForwardedHeaders.XForwardedFor |
+                                       ForwardedHeaders.XForwardedProto |
+                                       ForwardedHeaders.XForwardedHost;
+
+            options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("::ffff:127.0.0.1"), 104));
+            options.KnownProxies.Add(IPAddress.Parse("::ffff:127.0.0.1"));
+        });
+
         if (!hostingEnvironment.IsDevelopment())
         {
             PreConfigure<AbpOpenIddictAspNetCoreOptions>(options =>
@@ -53,7 +76,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 +101,7 @@ public class KonSoftAuthServerModule : AbpModule
         {
             options.StyleBundles.Configure(
                 BasicThemeBundles.Styles.Global,
-                bundle =>
+                bundle => { bundle.AddFiles("/global-styles.css"); }
-                {
-                    bundle.AddFiles("/global-styles.css");
-                }
             );
         });
 
@@ -90,15 +111,41 @@ public class KonSoftAuthServerModule : AbpModule
             options.ApplicationName = "AuthServer";
         });
 
-        Configure<AbpBackgroundJobOptions>(options =>
+        Configure<AppUrlOptions>(options =>
         {
-            options.IsJobExecutionEnabled = false;
+            options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"];
+            options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"]?.Split(',') ??
+                                                 Array.Empty<string>());
+
+            options.Applications["Angular"].RootUrl = configuration["App:ClientUrl"];
+            options.Applications["Angular"].Urls[AccountUrlNames.PasswordReset] = "account/reset-password";
         });
 
+        Configure<AbpBackgroundJobOptions>(options => { options.IsJobExecutionEnabled = false; });
+
         context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options =>
         {
             options.IsDynamicClaimsEnabled = true;
         });
+
+        context.Services.AddCors(options =>
+        {
+            options.AddDefaultPolicy(builder =>
+            {
+                builder
+                    .WithOrigins(
+                        configuration["App:CorsOrigins"]?
+                            .Split(",", StringSplitOptions.RemoveEmptyEntries)
+                            .Select(o => o.RemovePostFix("/"))
+                            .ToArray() ?? Array.Empty<string>()
+                    )
+                    .WithAbpExposedHeaders()
+                    .SetIsOriginAllowedToAllowWildcardSubdomains()
+                    .AllowAnyHeader()
+                    .AllowAnyMethod()
+                    .AllowCredentials();
+            });
+        });
     }
 
     public override void OnApplicationInitialization(ApplicationInitializationContext context)
@@ -106,18 +153,19 @@ public class KonSoftAuthServerModule : AbpModule
         var app = context.GetApplicationBuilder();
         var env = context.GetEnvironment();
 
-        if (env.IsDevelopment())
+        app.UseForwardedHeaders();
+        app.Use(async (ctx, next) =>
         {
+            ctx.Request.Scheme = "https";
+            await next();
+        });
+
         app.UseDeveloperExceptionPage();
-        }
+        app.UseAbpRequestLocalization();
+        app.UseErrorPage();
 
         app.UseAbpRequestLocalization();
 
-        if (!env.IsDevelopment())
-        {
-            app.UseErrorPage();
-        }
-
         app.UseCorrelationId();
         app.UseStaticFiles();
         app.UseRouting();

applications/KonSoft.AuthServer/KonSoftBrandingProvider.cs

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

applications/KonSoft.AuthServer/Pages/Index.cshtml

@@ -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 Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid
-@using KonSoft.Shared.Localization.Localization
-@using Volo.Abp.Users
 @using Volo.Abp.AspNetCore.Mvc.UI.Theming
 @using Volo.Abp.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>
                                                     @{

applications/KonSoft.AuthServer/Pages/Index.cshtml.cs

@@ -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();

applications/KonSoft.AuthServer/Program.cs

@@ -1,56 +1,37 @@
-using System;
+using KonSoft.Shared.Hosting.AspNetCore;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Serilog;
-using Serilog.Events;
+using System;
+using System.Threading.Tasks;
 
 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()
+        var assemblyName = typeof(Program).Assembly.GetName().Name!;
-#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();
 
+        SerilogConfigurationHelper.Configure(assemblyName);
         try
         {
-            Log.Information("Starting KonSoft.AuthServer.");
+            Log.Information($"Starting {assemblyName}.");
-            var builder = WebApplication.CreateBuilder(args);
+            var app = await ApplicationBuilderHelper
-            builder.Host.AddAppSettingsSecretsJson()
+                .BuildApplicationAsync<KonSoftAuthServerModule>(args);
-                .UseAutofac()
-                .UseSerilog();
-            await builder.AddApplicationAsync<KonSoftAuthServerModule>();
-            var app = builder.Build();
             await app.InitializeApplicationAsync();
+            app.MapGet("/heath", () => "Online");
             await app.RunAsync();
+
             return 0;
         }
         catch (Exception ex)
         {
-            if (ex is HostAbortedException)
+            Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!");
-            {
-                throw;
-            }
-
-            Log.Fatal(ex, "KonSoft.AuthServer terminated unexpectedly!");
             return 1;
         }
         finally
         {
-            Log.CloseAndFlush();
+            await Log.CloseAndFlushAsync();
         }
     }
 }

applications/KonSoft.AuthServer/Properties/launchSettings.json

@@ -1,5 +1,4 @@
 {
-  "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
     "http": {
       "commandName": "Project",
@@ -8,6 +7,18 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "https://localhost:44322"
+    },
+    "Container (Dockerfile)": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
+      "environmentVariables": {
+        "ASPNETCORE_HTTPS_PORTS": "8081",
+        "ASPNETCORE_HTTP_PORTS": "8080"
+      },
+      "publishAllPorts": true,
+      "useSSL": true
     }
-  }
+  },
+  "$schema": "http://json.schemastore.org/launchsettings.json"
 }

applications/KonSoft.AuthServer/appsettings.json

@@ -1,17 +1,8 @@
 {
-  "App": {
+  "AgileConfig": {
-    "SelfUrl": "https://localhost:44322",
+    "appId": "KonSoft.Admin.HttpApi.Host",
-    "ClientUrl": "http://localhost:4200",
+    "name": "KonSoft.Admin.HttpApi.Host",
-    "CorsOrigins": "https://*.KonSoft.com,http://localhost:4200,https://localhost:44316,https://localhost:44370",
+    "nodes": "https://config.konsoft.top/",
-    "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44319,https://localhost:44316,https://localhost:44347"
+    "secret": "DBE31703-14F9-4B01-893D-900B8380CE04"
-  },
-  "ConnectionStrings": {
-    "Default": "Host=localhost;Port=5432;Database=KonSoft;User ID=root;Password=myPassword;"
-  },
-  "Redis": {
-    "Configuration": "127.0.0.1"
-  },
-  "StringEncryption": {
-    "DefaultPassPhrase": "kxtywyrXW4i7vijT"
   }
 }

applications/KonSoft.AuthServer/web.config

@@ -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>

applications/KonSoft.AuthServer/yarn.lock

@@ -1,322 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@abp/aspnetcore.mvc.ui.theme.basic@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-8.3.4.tgz#75708276b2d9162d4f208ebf566fb0a7343636a7"
-  integrity sha512-m5NBySj8tPbXwMKI1hUfYDzGVxvcU4JGJsSDegetuiulZYm59tPnfdwBeM0zSqx72UPowu/2oDwJsgjODVrDlg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~8.3.4"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.3.4.tgz#169ae0893302ced9256f94174d9bb870e49f446c"
-  integrity sha512-bZy8iAIN0QfNJXCRg+RR1NxqTzNDSXRPBx+ksFtDxY6FzMJvwwSOmHF0wqsMLj1xpwXjijWaVWQ2RM/7scDWmw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~8.3.4"
-    "@abp/bootstrap" "~8.3.4"
-    "@abp/bootstrap-datepicker" "~8.3.4"
-    "@abp/bootstrap-daterangepicker" "~8.3.4"
-    "@abp/datatables.net-bs5" "~8.3.4"
-    "@abp/font-awesome" "~8.3.4"
-    "@abp/jquery-form" "~8.3.4"
-    "@abp/jquery-validation-unobtrusive" "~8.3.4"
-    "@abp/lodash" "~8.3.4"
-    "@abp/luxon" "~8.3.4"
-    "@abp/malihu-custom-scrollbar-plugin" "~8.3.4"
-    "@abp/moment" "~8.3.4"
-    "@abp/select2" "~8.3.4"
-    "@abp/sweetalert2" "~8.3.4"
-    "@abp/timeago" "~8.3.4"
-    "@abp/toastr" "~8.3.4"
-
-"@abp/aspnetcore.mvc.ui@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.3.4.tgz#041d83f34541081d9e0f37c36c302cbe871a4897"
-  integrity sha512-sjGE/EoNM98mXNYPze2C7GPP+TNpv4TLIt416ojaqtxru60oddr4VWrOGuhaqUCO2jJes3OwFZi5PY3hVOBbYw==
-  dependencies:
-    ansi-colors "^4.1.3"
-
-"@abp/bootstrap-datepicker@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.3.4.tgz#072f4a3cea93e3a1bb1de13b355201648929f84c"
-  integrity sha512-txilFovf9zT1w+fTkyI3eZdiISjaxc/+wRRFKwrkVH+0xEgaiR41svKm6sjWBORxgTddlGas87SZJvYY3IKBjA==
-  dependencies:
-    bootstrap-datepicker "^1.10.0"
-
-"@abp/bootstrap-daterangepicker@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.3.4.tgz#b0f65611ca4fafdf2b551f9f139868eae6e22e9a"
-  integrity sha512-bYkYjk1zTdWcM4DGwnDoU+4pDvs1S8hkNWhrnpP0o8oRoJiesO8Aeda+82rtydtWnxHg+HkDC0iYFFqaNuHvbg==
-  dependencies:
-    bootstrap-daterangepicker "^3.1.0"
-
-"@abp/bootstrap@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-8.3.4.tgz#744bb4d30d4c269ce8e6a7d16c6777dd3cd9fe1e"
-  integrity sha512-GXCLFFmPNaR3DjQYSaqACL5sH/M9FPia2OKAAMOd796+NmcoFpT+S7l4C6ihqeQc4bjFm0voB8QklueGWx6r8A==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    bootstrap "^5.3.3"
-
-"@abp/core@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-8.3.4.tgz#12635bc2ac325a426334150502a32fefa4ec3767"
-  integrity sha512-wImAdZABahaQe6mmZAZlPfYZ3PEhL7eEq+18c1WFO0xeD98oxqi8H1X7+3ABjyFscIh9LIxJVaD3RJ9OHCc5bw==
-  dependencies:
-    "@abp/utils" "~8.3.4"
-
-"@abp/datatables.net-bs5@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.3.4.tgz#efc28fa57144c7b495a4aeea38df962807ca20df"
-  integrity sha512-u85aXjqYIJJfOsMq6oNqfxNgxQqV6vOEnJ32vrH294ceW8RzUxHA+G/ZkGRLLRGWVuxuARD/UXzEotH5sd1Ssw==
-  dependencies:
-    "@abp/datatables.net" "~8.3.4"
-    datatables.net-bs5 "^2.0.8"
-
-"@abp/datatables.net@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-8.3.4.tgz#23a3155a2d84247a29a6b80ff98d1d5f6422a245"
-  integrity sha512-cwE9TFoRoszmI3zNVaYJtqjSPtwkL9dhCfE02zsmJo8GBdFAlbzAmQenfQiWb3BZhvUvKKN20e+og9S8qoCbXA==
-  dependencies:
-    "@abp/jquery" "~8.3.4"
-    datatables.net "^2.0.8"
-
-"@abp/font-awesome@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-8.3.4.tgz#f79f7b439f9ffadfc03be3a415a977eab21fa5a1"
-  integrity sha512-5+D5XKnrZROtg9PJ2zex52gbphXGK/7ZIUsszEg8rOIc/niXggaZLmuDcYJwOEzIkwpGO9OvYy7lc0tHv/Pr4g==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    "@fortawesome/fontawesome-free" "^6.5.2"
-
-"@abp/jquery-form@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-8.3.4.tgz#c1705bd5213ab5c2b895dd5bd9f3e54f3d94cf54"
-  integrity sha512-vFjWbTbHQyIsk5SS7Cc+5YrJ15ORjJU+YWVPchI0qoug26for06a7lDGpazWMadxx3iPL7cKLqneOqaVtHkgJA==
-  dependencies:
-    "@abp/jquery" "~8.3.4"
-    jquery-form "^4.3.0"
-
-"@abp/jquery-validation-unobtrusive@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.3.4.tgz#e89eafed89787bcb5221c0ba89832b79a7396d19"
-  integrity sha512-+kJA5vfvxkrj/iW4Q84BrMTrAGOhC2Hb5czAKr6c60Prmayk5hcakZdXc3wDBHREBLVAq1Muk4AtEJZmaKIeaA==
-  dependencies:
-    "@abp/jquery-validation" "~8.3.4"
-    jquery-validation-unobtrusive "^4.0.0"
-
-"@abp/jquery-validation@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-8.3.4.tgz#a445592d80edc6b6b1334ece2007b3084c329cc6"
-  integrity sha512-XvL0H3IRuSHwpPKUyJmW6PH8KwPDt9NllMqPGreRANF8l5IU10hOLEeP2BnGFfGMqFwqUMh+eJRar5yZcegkmg==
-  dependencies:
-    "@abp/jquery" "~8.3.4"
-    jquery-validation "^1.20.1"
-
-"@abp/jquery@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-8.3.4.tgz#2dc3f5f124ac65b5f45d29749ebb5d6cf17db23b"
-  integrity sha512-Zx2rErtgc0gxjX5PURjp6sjDQfzxBChUE9YWN37Xh+Ysm3tTGcXlF0Emwl94MZ640NfmYRpG4AWdik6kbaU5Wg==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    jquery "~3.7.1"
-
-"@abp/lodash@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-8.3.4.tgz#b0ef4e82a788ae7389a31793c3bad6702efdbe33"
-  integrity sha512-yGd/oLds0jpTgTpmkFYOEomS4K15DGcffMP3N1t0qKLgTaBYTQzeugHVgQ0baufC+OvLjumDNuu3eHjBJewwKg==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    lodash "^4.17.21"
-
-"@abp/luxon@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-8.3.4.tgz#f152b2d7b62bd27f3d27aa3a1794b868bf06a1a4"
-  integrity sha512-l1nvfqdhHBgHBPK+bLClAEprRK3K5zx5Jar93o5++6r3zXUhYi5OUHUxl+LuGn8MXLvHJVGL41irHl6sYjFSww==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    luxon "^3.4.4"
-
-"@abp/malihu-custom-scrollbar-plugin@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.3.4.tgz#0868214884e3e0b94dade0e8e78c01741d71106a"
-  integrity sha512-uKRk8+HCvXtpmvof5W09908AkivlweErTE62b0JhkrJVIlYt/0LC1MmB/qHHBfPj6OK05HYGBi3inr7fNAPXEQ==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    malihu-custom-scrollbar-plugin "^3.1.5"
-
-"@abp/moment@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-8.3.4.tgz#a5809520dc50b50402ade4ac630c6ec985fd4518"
-  integrity sha512-61J8drO3OqkaaAn66xBg6jCws1iV6zutjYQvpEXLdGBA9Kvw2J87GSomxJ4mcIo/5+jzrVro6JYaCfKWY8b1dw==
-  dependencies:
-    moment "^2.30.1"
-
-"@abp/select2@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-8.3.4.tgz#1731b465760e0515d0d4280f38189c9366fecda5"
-  integrity sha512-sPtYstFVvMTT8fdXRIfHeODIgSN2ufWm6zCMGH7C0cST3FF59M4m/MtdKGBlA/itzHPxeDv7A6dy4Aw4l7Gk4Q==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    select2 "^4.0.13"
-
-"@abp/sweetalert2@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-8.3.4.tgz#c0768ca4fe0a9926b8f33d8bf5251d3e4202cd2f"
-  integrity sha512-6HqxISh+FodwUsCrR3nX49RQDhzHtDlz8ul42TecUMsGa96qX2lvwnoWkXAHLG3mdLRy62Z0dhJ1JKMfrPeJeg==
-  dependencies:
-    "@abp/core" "~8.3.4"
-    sweetalert2 "^11.3.6"
-
-"@abp/timeago@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-8.3.4.tgz#26ca0bec90d861f9f4af714061b370950551c839"
-  integrity sha512-cDARYysPn5Rr/9rqVn7S4sBWbeEpaIXr8NKwGZqNOzMF2g283SkLKrkQJBWIC6Pn2lVeIB7AV1+GtVn81V/nnw==
-  dependencies:
-    "@abp/jquery" "~8.3.4"
-    timeago "^1.6.7"
-
-"@abp/toastr@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-8.3.4.tgz#cb433bc4ed2e302f2704ad0456c99d6f12fd0529"
-  integrity sha512-29C9GgwlumrHgt1iZ4lArDnlXfSvmCHDehxkbDutrkC1m257UxQaOID11us2UeCs3JobueQcLlQKD/LqnDB4xA==
-  dependencies:
-    "@abp/jquery" "~8.3.4"
-    toastr "^2.1.4"
-
-"@abp/utils@~8.3.4":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-8.3.4.tgz#4b06575a110e85e2a360294f678b782818e1ab10"
-  integrity sha512-7Lq3wdk/07vKgQnR56DTmdSuYRABMe0XTGPJRS5F91DVbggeJyDUaqifVvOeurF/3CZJOS7fJpoIHQXeUveFtQ==
-  dependencies:
-    just-compare "^2.3.0"
-
-"@fortawesome/fontawesome-free@^6.5.2":
-  version "6.7.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz#8249de9b7e22fcb3ceb5e66090c30a1d5492b81a"
-  integrity sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==
-
-ansi-colors@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
-  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
-
-bootstrap-datepicker@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.10.0.tgz#61612bbe8bf0a69a5bce32bbcdda93ebb6ccf24a"
-  integrity sha512-lWxtSYddAQOpbAO8UhYhHLcK6425eWoSjb5JDvZU3ePHEPF6A3eUr51WKaFy4PccU19JRxUG6wEU3KdhtKfvpg==
-  dependencies:
-    jquery ">=3.4.0 <4.0.0"
-
-bootstrap-daterangepicker@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bootstrap-daterangepicker/-/bootstrap-daterangepicker-3.1.0.tgz#632e6fb2de4b6360c5c0a9d5f6adb9aace051fe8"
-  integrity sha512-oaQZx6ZBDo/dZNyXGVi2rx5GmFXThyQLAxdtIqjtLlYVaQUfQALl5JZMJJZzyDIX7blfy4ppZPAJ10g8Ma4d/g==
-  dependencies:
-    jquery ">=1.10"
-    moment "^2.9.0"
-
-bootstrap@^5.3.3:
-  version "5.3.8"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.8.tgz#6401a10057a22752d21f4e19055508980656aeed"
-  integrity sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==
-
-datatables.net-bs5@^2.0.8:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/datatables.net-bs5/-/datatables.net-bs5-2.3.3.tgz#8bf3aec484a69e373f6007038eaac0cc0ef4ee15"
-  integrity sha512-IPtC57k3KyZaLzIYTHies23Cm2zqaKfD6lkxy/aOAUUAtsg35l53VqNY9y84AEySYG3YLghMHVBvl2ckUhvm0A==
-  dependencies:
-    datatables.net "2.3.3"
-    jquery ">=1.7"
-
-datatables.net@2.3.3, datatables.net@^2.0.8:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.3.3.tgz#fe4f96bdbc4cf47c8d11162a7af525ca6a3683d2"
-  integrity sha512-SWL3za6nheY6gdoiLgCc++tYmxbwrmv2bjrEiII9rXBWXXSbOZct6pjR3FueMVRM5jmt7pQcXiGovfuFDnutQg==
-  dependencies:
-    jquery ">=1.7"
-
-jquery-form@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/jquery-form/-/jquery-form-4.3.0.tgz#7d3961c314a1f2d15298f4af1d3943f54f4149c6"
-  integrity sha512-q3uaVCEWdLOYUCI6dpNdwf/7cJFOsUgdpq6r0taxtGQ5NJSkOzofyWm4jpOuJ5YxdmL1FI5QR+q+HB63HHLGnQ==
-  dependencies:
-    jquery ">=1.7.2"
-
-jquery-mousewheel@>=3.0.6:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.2.2.tgz#48c833f6260ee0c46d438a999e7d0060ec9eed0b"
-  integrity sha512-JP71xTAg08ZY3hcs9ZbYUZ5i+dkSsz4yRl/zpWkAmtzc+kMs5EfPkpkINSidiLYMaR0MTo3DfFGF9WIezMsFQQ==
-  dependencies:
-    jquery ">=1.2.6"
-
-jquery-validation-unobtrusive@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.0.tgz#dfcf25a558496a2c883db6021d10f5398d15f99d"
-  integrity sha512-1ervYFFv6LX/rp7ktuLnMakHNG0piNRDyROI8Ir3hL1vPIwylAehB1AY3BPrYJnzW3WmwWryZq+Bz4sazZK9iQ==
-  dependencies:
-    jquery "^3.6.0"
-    jquery-validation ">=1.19"
-
-jquery-validation@>=1.19, jquery-validation@^1.20.1:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.21.0.tgz#78fc05ab76020912a246af3661b3f54a438bca93"
-  integrity sha512-xNot0rlUIgu7duMcQ5qb6MGkGL/Z1PQaRJQoZAURW9+a/2PGOUxY36o/WyNeP2T9R6jvWB8Z9lUVvvQWI/Zs5w==
-
-jquery@>=1.10, jquery@>=1.12.0, jquery@>=1.2.6, "jquery@>=1.5.0 <4.0", jquery@>=1.7, jquery@>=1.7.2, "jquery@>=3.4.0 <4.0.0", jquery@^3.6.0, jquery@~3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
-  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
-
-just-compare@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/just-compare/-/just-compare-2.3.0.tgz#a2adcc1d1940536263275f5a1ef1298bcacfeda7"
-  integrity sha512-6shoR7HDT+fzfL3gBahx1jZG3hWLrhPAf+l7nCwahDdT9XDtosB9kIF0ZrzUp5QY8dJWfQVr5rnsPqsbvflDzg==
-
-lodash@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-luxon@^3.4.4:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.7.2.tgz#d697e48f478553cca187a0f8436aff468e3ba0ba"
-  integrity sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==
-
-malihu-custom-scrollbar-plugin@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.5.tgz#310cecc5e59415a1c29e9dfb5d2b6e01d66a29ef"
-  integrity sha512-lwW3LgI+CNDMPnP4ED2la6oYxWMkCXlnhex+s2wuOLhFDFGnGmQuTQVdRK9bvDLpxs10sGlfErVufJy9ztfgJQ==
-  dependencies:
-    jquery-mousewheel ">=3.0.6"
-
-moment@^2.30.1, moment@^2.9.0:
-  version "2.30.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
-  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
-
-select2@^4.0.13:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.13.tgz#0dbe377df3f96167c4c1626033e924372d8ef44d"
-  integrity sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw==
-
-sweetalert2@^11.3.6:
-  version "11.23.0"
-  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.23.0.tgz#ba8a051b1e94215c762af08692171b7b4611c4c1"
-  integrity sha512-cKzzbC3C1sIs7o9XAMw4E8F9kBtGXsBDUsd2JZ8JM/dqa+nzWwSGM+9LLYILZWzWHzX9W+HJNHyBlbHPVS/krw==
-
-timeago@^1.6.7:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/timeago/-/timeago-1.6.7.tgz#afd467c29a911e697fc22a81888c7c3022783cb5"
-  integrity sha512-FikcjN98+ij0siKH4VO4dZ358PR3oDDq4Vdl1+sN9gWz1/+JXGr3uZbUShYH/hL7bMhcTpPbplJU5Tej4b4jbQ==
-  dependencies:
-    jquery ">=1.5.0 <4.0"
-
-toastr@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/toastr/-/toastr-2.1.4.tgz#8b43be64fb9d0c414871446f2db8e8ca4e95f181"
-  integrity sha512-LIy77F5n+sz4tefMmFOntcJ6HL0Fv3k1TDnNmFZ0bU/GcvIIfy6eG2v7zQmMiYgaalAiUv75ttFrPn5s0gyqlA==
-  dependencies:
-    jquery ">=1.12.0"

applications/KonSoft.BackgroundJobs/Controllers/WeatherForecastController.cs

@@ -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();
     }
 }
-}

applications/KonSoft.BackgroundJobs/WeatherForecast.cs

@@ -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; }
 }
-}

applications/KonSoft.BackgroundWorker/Controllers/WeatherForecastController.cs

@@ -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();
     }
 }
-}

applications/KonSoft.BackgroundWorker/WeatherForecast.cs

@@ -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; }
 }
-}

authserver.Jenkinsfile

@@ -0,0 +1,27 @@
+pipeline {
+    agent any
+    
+    stages {
+
+        stage('Deploy') {
+            steps {
+                script {
+                    try {
+                        sh '/usr/libexec/docker/cli-plugins/docker-compose -f ./docker-compose.yml up --build -d authserver'
+                    } catch (Exception e) {
+                        error "部署失败: ${e.message}"
+                    }
+                }
+            }
+        }
+        
+        stage('Health Check') {
+            steps {
+                script {
+                    sleep time: 30, unit: 'SECONDS'
+                    sh 'docker ps | grep authserver'
+                }
+            }
+        }
+    }
+}

docker-compose.yml

@@ -0,0 +1,90 @@
+services:
+  internalgateways:
+    container_name: clean-internalgateways
+    restart: unless-stopped
+    build: 
+      context: .
+      dockerfile: ./gateways/KonSoft.InternalGateway/Dockerfile
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Test
+      - AgileConfig__AppId=KonSoft.InternalGateway
+      - AgileConfig__Name=KonSoft.InternalGateway
+      - AgileConfig__Nodes=https://config.konsoft.top/
+      - AgileConfig__Secret=DBE31703-14F9-4B01-893D-900B8380CE04
+    ports:
+      - 8080:8080
+    networks:
+      - konsoft-shared-network
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+      
+  authserver:
+    container_name: clean-authserver
+    restart: unless-stopped
+    build: 
+      context: .
+      dockerfile: ./applications/KonSoft.AuthServer/Dockerfile
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Test
+      - AgileConfig__AppId=KonSoft.AuthServer
+      - AgileConfig__Name=KonSoft.AuthServer
+      - AgileConfig__Nodes=https://config.konsoft.top/
+      - AgileConfig__Secret=DBE31703-14F9-4B01-893D-900B8380CE04
+    ports:
+      - 8081:8080
+    volumes:
+      - /etc/letsencrypt/archive/code.konsoft.top/openiddict.pfx:/app/openiddict.pfx
+    networks:
+      - konsoft-shared-network
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+
+  adminservice:
+    container_name: clean-adminservice
+    restart: unless-stopped
+    build: 
+      context: .
+      dockerfile: ./microservices/KonSoft.Admin.HttpApi.Host/Dockerfile
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Test
+      - AgileConfig__AppId=KonSoft.Admin.HttpApi.Host
+      - AgileConfig__Name=KonSoft.Admin.HttpApi.Host
+      - AgileConfig__Nodes=https://config.konsoft.top/
+      - AgileConfig__Secret=DBE31703-14F9-4B01-893D-900B8380CE04
+    networks:
+      - konsoft-shared-network
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+
+networks:
+  konsoft-shared-network:
+    name: konsoft-shared-network
+    driver: bridge
+    external: true

gateways/KonSoft.InternalGateway/Controllers/WeatherForecastController.cs

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

gateways/KonSoft.InternalGateway/Dockerfile

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

gateways/KonSoft.InternalGateway/Extensions/YarpSwaggerUIBuilderExtensions.cs

@@ -0,0 +1,50 @@
+using Microsoft.AspNetCore.Builder;
+using Yarp.ReverseProxy.Configuration;
+namespace KonSoft.InternalGateway.Extensions
+{
+    public static class YarpSwaggerUIBuilderExtensions
+    {
+        public static IApplicationBuilder UseSwaggerUIWithYarp(this IApplicationBuilder app)
+        {
+            var serviceProvider = app.ApplicationServices;
+
+            app.UseSwagger();
+            app.UseSwaggerUI(options =>
+            {
+                var configuration = serviceProvider.GetRequiredService<IConfiguration>();
+                var logger = serviceProvider.GetRequiredService<ILogger<Program>>();
+                var proxyConfigProvider = serviceProvider.GetRequiredService<IProxyConfigProvider>();
+                var yarpConfig = proxyConfigProvider.GetConfig();
+
+                var routedClusters = yarpConfig.Clusters
+                    .SelectMany(t => t.Destinations,
+                        (clusterId, destination) => new { clusterId.ClusterId, destination.Value });
+
+                var groupedClusters = routedClusters
+                    .GroupBy(q => q.Value.Address)
+                    .Select(t => t.First())
+                    .Distinct()
+                    .ToList();
+                var gatewayUrl = configuration["GatewayUrl"];
+
+                options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
+                options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);
+                foreach (var clusterGroup in groupedClusters)
+                {
+                    var routeConfig = yarpConfig.Routes.FirstOrDefault(q =>
+                        q.ClusterId == clusterGroup.ClusterId);
+                    if (routeConfig == null)
+                    {
+                        logger.LogWarning($"Swagger UI: Couldn't find route configuration for {clusterGroup.ClusterId}...");
+                        continue;
+                    }
+                    
+                   // options.SwaggerEndpoint($"{clusterGroup.Value.Address}/swagger/v1/swagger.json", $"{routeConfig.RouteId} API");
+                    options.SwaggerEndpoint(new Uri(new Uri(!string.IsNullOrWhiteSpace(gatewayUrl)? gatewayUrl: clusterGroup.Value.Address), $"{routeConfig.RouteId.Split("-")[0]}/swagger/v1/swagger.json").AbsoluteUri, $"{routeConfig.RouteId} API");
+                }
+            });
+
+            return app;
+        }
+    }
+}

gateways/KonSoft.InternalGateway/InternalGatewayModule.cs

@@ -0,0 +1,14 @@
+using KonSoft.Admin;
+using KonSoft.Shared.Hosting.Gateways;
+using Volo.Abp.Modularity;
+
+namespace KonSoft.InternalGateway
+{
+    [DependsOn(
+        typeof(KonSoftSharedHostingGatewaysModule),
+        typeof(AdminHttpApiModule)
+        )]
+    public class InternalGatewayModule : AbpModule
+    {
+    }
+}

gateways/KonSoft.InternalGateway/KonSoft.InternalGateway.csproj

@@ -4,10 +4,14 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>98521e87-fe4a-4555-8c3b-e83559a64e03</UserSecretsId>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerfileContext>..\..</DockerfileContext>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+    <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.HttpApi\KonSoft.Admin.HttpApi.csproj" />
+    <ProjectReference Include="..\..\shared\KonSoft.Shared.Hosting.Gateways\KonSoft.Shared.Hosting.Gateways.csproj" />
   </ItemGroup>
 
 </Project>

gateways/KonSoft.InternalGateway/Program.cs

@@ -1,25 +1,58 @@
-var builder = WebApplication.CreateBuilder(args);
+using KonSoft.InternalGateway;
+using KonSoft.InternalGateway.Extensions;
+using KonSoft.Shared.Hosting.AspNetCore;
+using Microsoft.AspNetCore.Rewrite;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.OpenApi.Models;
+using Serilog;
 
-// Add services to the container.
+var assemblyName = typeof(Program).Assembly.GetName().Name!;
+SerilogConfigurationHelper.Configure(assemblyName);
 
-builder.Services.AddControllers();
+try
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
 {
-    app.UseSwagger();
+    var builder = WebApplication.CreateBuilder(args);
-    app.UseSwaggerUI();
+    builder.Configuration
+        .AddAgileConfig(option =>
+        {
+            option.ENV = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Development";
+        });
+    builder.Host
+        .AddAppSettingsSecretsJson()
+        .UseAutofac()
+        .UseSerilog();
+
+    builder.Services.AddAbpSwaggerGenWithOidc(builder.Configuration["AuthServer:Authority"]!, setupAction: options =>
+    {
+        options.SwaggerDoc("v1", new OpenApiInfo
+        {
+            Title = "Gateway",
+            Version = "v1"
+        });
+        options.DocInclusionPredicate((docName, description) => true);
+        options.CustomSchemaIds(type => type.FullName);
+    });
+
+
+    builder.Services.AddReverseProxy()
+        .LoadFromConfig(builder.Configuration.GetSection("ReverseProxy"));
+    builder.Services.AddControllers();
+    await builder.AddApplicationAsync<InternalGatewayModule>();
+    var app = builder.Build();
+    await app.InitializeApplicationAsync();
+    app.UseSwaggerUIWithYarp();
+    app.MapReverseProxy();
+    app.MapGet("/heath", () => "Online");
+    await app.RunAsync();
+
+    return 0;
+}
+catch (Exception ex)
+{
+    Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!");
+    return 1;
+}
+finally
+{
+    await Log.CloseAndFlushAsync();
 }
-
-app.UseHttpsRedirection();
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();

gateways/KonSoft.InternalGateway/Properties/launchSettings.json

@@ -1,33 +1,24 @@
-{
+{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:15968",
-      "sslPort": 44395
-    }
-  },
   "profiles": {
     "http": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5090",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5090"
     },
     "https": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7264;http://localhost:5090",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:7264;http://localhost:5090"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -36,6 +27,26 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
+    },
+    "Container (Dockerfile)": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
+      "environmentVariables": {
+        "ASPNETCORE_HTTPS_PORTS": "8081",
+        "ASPNETCORE_HTTP_PORTS": "8080"
+      },
+      "publishAllPorts": true,
+      "useSSL": true
+    }
+  },
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:15968",
+      "sslPort": 44395
     }
   }
 }

gateways/KonSoft.InternalGateway/WeatherForecast.cs

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

gateways/KonSoft.InternalGateway/appsettings.json

@@ -1,9 +1,13 @@
 {
-  "Logging": {
+  "AgileConfig": {
-    "LogLevel": {
+    "appId": "KonSoft.InternalGateway",
-      "Default": "Information",
+    "name": "KonSoft.InternalGateway",
-      "Microsoft.AspNetCore": "Warning"
+    "nodes": "https://config.konsoft.top/",
-    }
+    "secret": "DBE31703-14F9-4B01-893D-900B8380CE04"
   },
-  "AllowedHosts": "*"
+  "AuthServer": {
+    "Authority": "https://devauth.konsoft.top",
+    "RequireHttpsMetadata": true,
+    "SwaggerClientId": "Gateway_Swagger"
+  }
 }

gateways/KonSoft.PublicGateway/Controllers/WeatherForecastController.cs

@@ -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();
     }
 }
-}

gateways/KonSoft.PublicGateway/WeatherForecast.cs

@@ -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; }
 }
-}

internalgateway.Jenkinsfile

@@ -0,0 +1,27 @@
+pipeline {
+    agent any
+    
+    stages {
+
+        stage('Deploy') {
+            steps {
+                script {
+                    try {
+                        sh '/usr/libexec/docker/cli-plugins/docker-compose -f ./docker-compose.yml up --build -d internalgateways'
+                    } catch (Exception e) {
+                        error "部署失败: ${e.message}"
+                    }
+                }
+            }
+        }
+        
+        stage('Health Check') {
+            steps {
+                script {
+                    sleep time: 30, unit: 'SECONDS'
+                    sh 'docker ps | grep internalgateways'
+                }
+            }
+        }
+    }
+}

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

@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc.Libs;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.Modularity;
 
@@ -23,15 +24,20 @@ public class AdminHttpApiHostModule : AbpModule
         var configuration = context.Services.GetConfiguration();
 
         SwaggerConfigurationHelper.ConfigureWithOidc(
-            context: context,
+            context,
-            authority: configuration["AuthServer:Authority"]!,
+            configuration["AuthServer:Authority"]!,
-            scopes: ["AdministrationService"],
+            ["Admin", "Dispatch", "Payment", "Report", "TenantManagement"],
             discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
             apiTitle: "Administration Service API"
         );
 
         // ֻ<><D6BB><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD>
         Configure<AbpBackgroundJobOptions>(options => options.IsJobExecutionEnabled = false);
+
+        Configure<AbpMvcLibsOptions>(options =>
+        {
+            options.CheckLibs = false;
+        });
     }
 
     public override void OnApplicationInitialization(ApplicationInitializationContext context)
@@ -74,4 +80,10 @@ public class AdminHttpApiHostModule : AbpModule
         app.UseAbpSerilogEnrichers();
         app.UseConfiguredEndpoints();
     }
+
+    //public override async Task OnPostApplicationInitializationAsync(ApplicationInitializationContext context)
+    //{
+    //    await context.ServiceProvider.GetRequiredService<AdminPendingEfCoreMigrationsChecker>()
+    //        .CheckAndApplyDatabaseMigrationsAsync();
+    //}
 }

microservices/KonSoft.Admin.HttpApi.Host/DbMigrations/AdminDataSeedContributor.cs

@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+
+namespace KonSoft.Admin.DbMigrations;
+
+public class AdminDataSeedContributor : IDataSeedContributor, ITransientDependency
+{
+    public Task SeedAsync(DataSeedContext context)
+    {
+        return Task.CompletedTask;
+    }
+}

microservices/KonSoft.Admin.HttpApi.Host/DbMigrations/AdminDataSeeder.cs

@@ -1,14 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-
-namespace KonSoft.Admin.DbMigrations
-{
-    public class AdminDataSeeder : IDataSeedContributor, ITransientDependency
-    {
-        public Task SeedAsync(DataSeedContext context)
-        {
-            return Task.CompletedTask;
-        }
-    }
-}

microservices/KonSoft.Admin.HttpApi.Host/DbMigrations/AdminPendingEfCoreMigrationsChecker.cs

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

microservices/KonSoft.Admin.HttpApi.Host/Dockerfile

@@ -4,7 +4,6 @@ WORKDIR /app
 EXPOSE 8080
 
 
-# 此阶段用于生成服务项目
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src

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

@@ -17,6 +17,10 @@
     <None Remove="Logs\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.Application\KonSoft.Admin.Application.csproj" />
     <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.EntityFrameworkCore\KonSoft.Admin.EntityFrameworkCore.csproj" />

microservices/KonSoft.Admin.HttpApi.Host/Logs/logs.txt

@@ -1025,3 +1025,141 @@ System.InvalidOperationException: An exception has been raised that is likely du
 --- End of stack trace from previous location ---
    at Microsoft.AspNetCore.Diagnostics.DeveloperExceptionPageMiddlewareImpl.Invoke(HttpContext context)
 2025-10-03 18:04:14.530 +08:00 [INF] Request finished HTTP/2 GET https://localhost:44354/favicon.ico - 500 null text/plain; charset=utf-8 2509.1194ms
+2025-10-26 10:37:00.036 +08:00 [INF] Starting KonSoft.Admin.HttpApi.Host.
+2025-10-26 10:39:17.756 +08:00 [INF] Starting KonSoft.Admin.HttpApi.Host.
+2025-10-26 10:39:21.029 +08:00 [INF] Loaded ABP modules:
+2025-10-26 10:39:21.030 +08:00 [INF] - KonSoft.Admin.AdminHttpApiHostModule
+2025-10-26 10:39:21.030 +08:00 [INF]   - KonSoft.Admin.AdminHttpApiModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - KonSoft.Admin.AdminApplicationContractsModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - KonSoft.Admin.AdminDomainSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.AuditLogging.AbpAuditLoggingDomainSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.Validation.AbpValidationModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.Validation.AbpValidationAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.Localization.AbpLocalizationModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.Settings.AbpSettingsModule
+2025-10-26 10:39:21.030 +08:00 [INF]                 - Volo.Abp.Localization.AbpLocalizationAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]                 - Volo.Abp.Security.AbpSecurityModule
+2025-10-26 10:39:21.030 +08:00 [INF]                 - Volo.Abp.Data.AbpDataModule
+2025-10-26 10:39:21.030 +08:00 [INF]                   - Volo.Abp.ObjectExtending.AbpObjectExtendingModule
+2025-10-26 10:39:21.030 +08:00 [INF]                   - Volo.Abp.Uow.AbpUnitOfWorkModule
+2025-10-26 10:39:21.030 +08:00 [INF]                   - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.Threading.AbpThreadingModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.BackgroundJobs.AbpBackgroundJobsDomainSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.FeatureManagement.AbpFeatureManagementDomainSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.Json.SystemTextJson.AbpJsonSystemTextJsonModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.Json.AbpJsonAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.Timing.AbpTimingModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.Identity.AbpIdentityDomainSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.Users.AbpUsersDomainSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.Features.AbpFeaturesModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.MultiTenancy.AbpMultiTenancyModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.MultiTenancy.AbpMultiTenancyAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.OpenIddict.AbpOpenIddictDomainSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.SettingManagement.AbpSettingManagementDomainSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.TenantManagement.AbpTenantManagementDomainSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.Account.AbpAccountApplicationContractsModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.Identity.AbpIdentityApplicationContractsModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.Users.AbpUsersAbstractionModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.EventBus.AbpEventBusModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.Json.AbpJsonModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.Guids.AbpGuidsModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.BackgroundWorkers.AbpBackgroundWorkersModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.DistributedLocking.AbpDistributedLockingAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.Authorization.AbpAuthorizationModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.PermissionManagement.AbpPermissionManagementApplicationContractsModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.Application.AbpDddApplicationContractsModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.Auditing.AbpAuditingContractsModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.FeatureManagement.AbpFeatureManagementApplicationContractsModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.SettingManagement.AbpSettingManagementApplicationContractsModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.TenantManagement.AbpTenantManagementApplicationContractsModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.Account.AbpAccountHttpApiModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.Identity.AbpIdentityHttpApiModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.AspNetCore.AbpAspNetCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.Auditing.AbpAuditingModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.Http.AbpHttpModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.Http.AbpHttpAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.Minify.AbpMinifyModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.AspNetCore.AbpAspNetCoreAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.UI.Navigation.AbpUiNavigationModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.UI.AbpUiModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.Application.AbpDddApplicationModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.Domain.AbpDddDomainModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.ObjectMapping.AbpObjectMappingModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.Specifications.AbpSpecificationsModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.Caching.AbpCachingModule
+2025-10-26 10:39:21.030 +08:00 [INF]                 - Volo.Abp.Serialization.AbpSerializationModule
+2025-10-26 10:39:21.030 +08:00 [INF]               - Volo.Abp.Domain.AbpDddDomainSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.PermissionManagement.HttpApi.AbpPermissionManagementHttpApiModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.TenantManagement.AbpTenantManagementHttpApiModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.FeatureManagement.AbpFeatureManagementHttpApiModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.SettingManagement.AbpSettingManagementHttpApiModule
+2025-10-26 10:39:21.030 +08:00 [INF]   - KonSoft.Admin.AdminApplicationModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - KonSoft.Admin.AdminDomainModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.AuditLogging.AbpAuditLoggingDomainModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.BackgroundJobs.AbpBackgroundJobsDomainModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.BackgroundJobs.AbpBackgroundJobsModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.BackgroundJobs.AbpBackgroundJobsAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.AutoMapper.AbpAutoMapperModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.FeatureManagement.AbpFeatureManagementDomainModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.Identity.AbpIdentityDomainModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.Users.AbpUsersDomainModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.OpenIddict.AbpOpenIddictDomainModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.PermissionManagement.OpenIddict.AbpPermissionManagementDomainOpenIddictModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.PermissionManagement.Identity.AbpPermissionManagementDomainIdentityModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.SettingManagement.AbpSettingManagementDomainModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.TenantManagement.AbpTenantManagementDomainModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.Emailing.AbpEmailingModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.TextTemplating.AbpTextTemplatingModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.TextTemplating.Scriban.AbpTextTemplatingScribanModule
+2025-10-26 10:39:21.030 +08:00 [INF]             - Volo.Abp.TextTemplating.AbpTextTemplatingCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.Account.AbpAccountApplicationModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.Identity.AbpIdentityApplicationModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.PermissionManagement.AbpPermissionManagementApplicationModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.TenantManagement.AbpTenantManagementApplicationModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.FeatureManagement.AbpFeatureManagementApplicationModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.SettingManagement.AbpSettingManagementApplicationModule
+2025-10-26 10:39:21.030 +08:00 [INF]   - KonSoft.Admin.EntityFrameworkCore.AdminEntityFrameworkCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.Identity.EntityFrameworkCore.AbpIdentityEntityFrameworkCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.Users.EntityFrameworkCore.AbpUsersEntityFrameworkCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.EntityFrameworkCore.AbpEntityFrameworkCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.OpenIddict.EntityFrameworkCore.AbpOpenIddictEntityFrameworkCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.PermissionManagement.EntityFrameworkCore.AbpPermissionManagementEntityFrameworkCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.SettingManagement.EntityFrameworkCore.AbpSettingManagementEntityFrameworkCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.EntityFrameworkCore.PostgreSql.AbpEntityFrameworkCorePostgreSqlModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.BackgroundJobs.EntityFrameworkCore.AbpBackgroundJobsEntityFrameworkCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.AuditLogging.EntityFrameworkCore.AbpAuditLoggingEntityFrameworkCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.TenantManagement.EntityFrameworkCore.AbpTenantManagementEntityFrameworkCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.FeatureManagement.EntityFrameworkCore.AbpFeatureManagementEntityFrameworkCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]   - KonSoft.Shared.Hosting.Microservices.KonSoftSharedHostingMicroservicesModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - KonSoft.Shared.Hosting.AspNetCore.KonSoftSharedHostingAspNetCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - KonSoft.Shared.Localization.KonSoftSharedLocalizationModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - KonSoft.Shared.Hosting.KonSoftSharedHostingModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.Autofac.AbpAutofacModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.Castle.AbpCastleCoreModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.AspNetCore.Serilog.AbpAspNetCoreSerilogModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.Swashbuckle.AbpSwashbuckleModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.BackgroundJobs.RabbitMQ.AbpBackgroundJobsRabbitMqModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.RabbitMQ.AbpRabbitMqModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.AspNetCore.Authentication.JwtBearer.AbpAspNetCoreAuthenticationJwtBearerModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.EventBus.RabbitMq.AbpEventBusRabbitMqModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.Caching.StackExchangeRedis.AbpCachingStackExchangeRedisModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.DistributedLocking.AbpDistributedLockingModule
+2025-10-26 10:39:21.030 +08:00 [INF]     - Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.AbpAspNetCoreMvcUiMultiTenancyModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.AbpAspNetCoreMvcUiThemeSharedModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.AbpAspNetCoreMvcUiBootstrapModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.AspNetCore.Mvc.UI.AbpAspNetCoreMvcUiModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.AspNetCore.Mvc.UI.Packages.AbpAspNetCoreMvcUiPackagesModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingAbstractionsModule
+2025-10-26 10:39:21.030 +08:00 [INF]         - Volo.Abp.AspNetCore.Mvc.UI.Widgets.AbpAspNetCoreMvcUiWidgetsModule
+2025-10-26 10:39:21.030 +08:00 [INF]           - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingModule
+2025-10-26 10:39:21.030 +08:00 [INF]       - Volo.Abp.AspNetCore.MultiTenancy.AbpAspNetCoreMultiTenancyModule
+2025-10-26 10:39:21.367 +08:00 [DBG] Started background worker: Volo.Abp.OpenIddict.Tokens.TokenCleanupBackgroundWorker

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

@@ -13,6 +13,7 @@ try
     var app = await ApplicationBuilderHelper
         .BuildApplicationAsync<AdminHttpApiHostModule>(args);
     await app.InitializeApplicationAsync();
+    app.MapGet("/heath", () => "Online");
     await app.RunAsync();
 
     return 0;

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

@@ -1,5 +1,4 @@
 {
-  "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
     "http": {
       "commandName": "Project",
@@ -7,7 +6,8 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "https://localhost:44354"
+      "applicationUrl": "http://localhost:44354"
-    }
     }
+  },
+  "$schema": "http://json.schemastore.org/launchsettings.json"
 }

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

@@ -1,29 +1,14 @@
 {
-  "App": {
+  "AgileConfig": {
-    "CorsOrigins": "https://*.KonSoft.top"
+    "appId": "KonSoft.Admin.HttpApi.Host",
-  },
+    "name": "KonSoft.Admin.HttpApi.Host",
-  "ConnectionStrings": {
+    "nodes": "https://config.konsoft.top/",
-    "Default": "Host=1.94.99.47;Port=26666;Database=Clean;User ID=postgres;Password=zzx7845zzx;"
+    "secret": "DBE31703-14F9-4B01-893D-900B8380CE04"
-  },
-  "Redis": {
-    "Configuration": "1.94.99.47:26668"
   },
   "AuthServer": {
-    "Authority": "https://localhost:44397",
+    "Authority": "https://devauth.konsoft.top",
-    "RequireHttpsMetadata": true,
+    "RequireHttpsMetadata": false,
-    "SwaggerClientId": "Admin_Swagger"
+    "SwaggerClientId": "Dev_Admin_Swagger",
-  },
+    "MetadataAddress": "https://devauth.konsoft.top"
-  "StringEncryption": {
-    "DefaultPassPhrase": "g3NdNOyDR9oYj0gK"
-  },
-  "RabbitMQ": {
-    "Connections": {
-      "Default": {
-        "HostName": "1.94.99.47",
-        "Port": 26667,
-        "UserName": "admin",
-        "Password": "zzx7845zzx"
-      }
-    }
   }
 }

microservices/KonSoft.Admin.HttpApi.Host/web.config

@@ -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>

microservices/KonSoft.Dispatch.HttpApi.Host/DispatchHttpApiHostModule.cs

@@ -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,
+            context,
-            authority: configuration["AuthServer:Authority"]!,
+            configuration["AuthServer:Authority"]!,
-            scopes: ["DispatchService"],
+            ["DispatchService"],
             discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
             apiTitle: "Dispatch Service API"
         );

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

@@ -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

microservices/KonSoft.Dispatch.HttpApi.Host/web.config

@@ -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>

microservices/KonSoft.Payment.HttpApi.Host/PaymentHttpApiHostModule.cs

@@ -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,
+            context,
-            authority: configuration["AuthServer:Authority"]!,
+            configuration["AuthServer:Authority"]!,
-            scopes: ["PaymentService"],
+            ["PaymentService"],
             discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
             apiTitle: "Payment Service API"
         );

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

@@ -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

microservices/KonSoft.Payment.HttpApi.Host/web.config

@@ -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>

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

@@ -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

microservices/KonSoft.Report.HttpApi.Host/ReportHttpApiHostModule.cs

@@ -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,
+            context,
-            authority: configuration["AuthServer:Authority"]!,
+            configuration["AuthServer:Authority"]!,
-            scopes: ["ReportService"],
+            ["ReportService"],
             discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
             apiTitle: "Report Service API"
         );

microservices/KonSoft.Report.HttpApi.Host/web.config

@@ -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>

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

@@ -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

microservices/KonSoft.TenantManagement.HttpApi.Host/TenantManagementHttpApiHostModule.cs

@@ -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,
+            context,
-            authority: configuration["AuthServer:Authority"]!,
+            configuration["AuthServer:Authority"]!,
-            scopes: ["TenantManagementService"],
+            ["TenantManagementService"],
             discoveryEndpoint: configuration["AuthServer:MetadataAddress"],
             apiTitle: "TenantManagement Service API"
         );

microservices/KonSoft.TenantManagement.HttpApi.Host/web.config

@@ -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>

modules/admin/src/KonSoft.Admin.Application.Contracts/AdminDtoExtensions.cs

@@ -1,12 +1,10 @@
-using Volo.Abp.Identity;
+using Volo.Abp.Threading;
-using Volo.Abp.ObjectExtending;
-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()
     {

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

@@ -1,11 +1,5 @@
-using System;
+namespace KonSoft.Admin.Dtos;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace KonSoft.Admin.Dtos
-{
 public class AddressDto
 {
     public string ContactName { get; set; }
@@ -14,4 +8,3 @@ namespace KonSoft.Admin.Dtos
     public string City { get; set; }
     public string District { get; set; }
 }
-}

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

@@ -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]
+    [Required] public Guid CustomerId { get; set; }
-        public Guid CustomerId { get; set; }
+
-        [Required]
+    [Required] public Guid ServiceCategoryId { get; set; }
-        public Guid ServiceCategoryId { get; set; }
+
-        [Required]
+    [Required] public DateTime ServiceTime { get; set; }
-        public DateTime ServiceTime { get; set; }
+
-        [Required]
+    [Required] public decimal Amount { get; set; }
-        public decimal Amount { get; set; }
+
-        [Required]
+    [Required] public AddressDto Address { get; set; }
-        public AddressDto Address { get; set; }
 
     public string Remark { get; set; }
 }
-}

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

@@ -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; }
 }
-}

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

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

modules/admin/src/KonSoft.Admin.Application.Contracts/Dtos/OrderPagedResultRequestDto.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;
+using Volo.Abp.Application.Dtos;
+
+namespace KonSoft.Admin.Dtos
+{
+    public class OrderPagedResultRequestDto : PagedResultRequestDto
+    {
+        /// <summary>
+        /// 订单状态
+        /// </summary>
+        public OrderStatus Status { get; set; } = OrderStatus.Created;
+
+        /// <summary>
+        /// 服务时间
+        /// </summary>
+        public DateTime? ServiceTime { get;  set; }
+
+
+    }
+}

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

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

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

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

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

@@ -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();
-    }
 }

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

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

modules/admin/src/KonSoft.Admin.Application.Contracts/Dtos/WorkerRegisterDto.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 WorkerRegisterDto
+    {
+    }
+}

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

@@ -0,0 +1,61 @@
+using KonSoft.Admin.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace KonSoft.Admin.IApplicationServices;
+
+public interface IHouseholdWorkerAppService : IApplicationService
+{
+    /// <summary>
+    /// 家政人员注册
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task RegisterAsync(WorkerRegisterDto input);
+
+    /// <summary>
+    /// 家政人员接单
+    /// </summary>
+    /// <param name="orderId"></param>
+    /// <returns></returns>
+    Task AcceptOrderAsync(Guid orderId);
+
+    /// <summary>
+    /// 家政人员退单
+    /// </summary>
+    /// <param name="orderId"></param>
+    /// <returns></returns>
+    Task RejectOrderAsync(Guid orderId);
+
+
+    /// <summary>
+    /// 已到达(开始服务)
+    /// </summary>
+    /// <param name="orderId"></param>
+    /// <returns></returns>
+    Task StartServiceAsync(Guid orderId);
+
+    /// <summary>
+    /// 完成服务
+    /// </summary>
+    /// <param name="orderId"></param>
+    /// <returns></returns>
+    Task CompleteServiceAsync(Guid orderId);
+
+    /// <summary>
+    /// 获取当前分配给家政人员的订单列表
+    /// </summary>
+    /// <returns></returns>
+    Task<List<OrderDto>> GetAssignedOrdersAsync(OrderPagedResultRequestDto requestDto);
+
+    /// <summary>
+    /// 获取待接单订单
+    /// </summary>
+    /// <returns></returns>
+    Task<List<OrderDto>> GetCreatedOrdersAsync(OrderPagedResultRequestDto requestDto);
+
+
+
+}

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

@@ -1,13 +1,11 @@
-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;
+using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 
-namespace KonSoft.Admin.IApplicationServices
+namespace KonSoft.Admin.IApplicationServices;
-{
+
 public interface IOrderAppService : IApplicationService
 {
     /// <summary>
@@ -16,11 +14,38 @@ 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);
+    /// <summary>
-        Task StartServiceAsync(Guid orderId);
+    /// 支付上门费
-        Task CompleteServiceAsync(Guid orderId);
+    /// </summary>
-        Task ConfirmAsync(Guid orderId);
+    /// <param name="orderId"></param>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task PayServiceCallFeeAsync(Guid orderId, PayOrderDto input);
+
+
+    /// <summary>
+    /// 支付
+    /// </summary>
+    /// <param name="orderId"></param>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task PayAsync(Guid orderId, PayOrderDto input);
+
+    /// <summary>
+    /// 取消订单
+    /// </summary>
+    /// <param name="orderId"></param>
+    /// <param name="reason"></param>
+    /// <returns></returns>
     Task CancelAsync(Guid orderId, string reason);
-    }
+    Task DeleteAsync(params Guid[] ids);
+    /// <summary>
+    /// 修改订单
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task EditAsync(OrderDto input);
+    Task<OrderDto> GetAsync(Guid id);
+    Task<PagedResultDto<OrderDto>> GetListAsync(OrderPagedResultRequestDto input);
 }

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

@@ -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);
+}

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

@@ -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();
 }
-}

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

@@ -1,13 +0,0 @@
-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

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

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

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

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

@@ -1,6 +1,7 @@
 using AutoMapper;
 using KonSoft.Admin.Dtos;
 using KonSoft.Admin.Entities;
+using KonSoft.Admin.ValueObjects;
 
 namespace KonSoft.Admin;
 

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

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

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

@@ -0,0 +1,126 @@
+using KonSoft.Admin.Dtos;
+using KonSoft.Admin.Entities;
+using KonSoft.Admin.IApplicationServices;
+using KonSoft.Admin.IRepositories;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.ObjectMapping;
+
+namespace KonSoft.Admin.ApplicationServices
+{
+    public class HouseholdWorkerAppService : ApplicationService, IHouseholdWorkerAppService
+    {
+        public IOrderRepository _orderRepository { get; set; }
+
+        public HouseholdWorkerAppService(IOrderRepository orderRepository)
+        {
+            _orderRepository = orderRepository;
+        }
+
+        /// <summary>
+        /// 家政人员接单
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task AcceptOrderAsync(Guid orderId)
+        {
+            var order = await _orderRepository.FirstOrDefaultAsync(o => o.Id == orderId);
+            if (order == null) throw new BusinessException("未找到订单");
+
+            order.AssignWorker(CurrentUser.Id!.Value);
+
+        }
+
+
+
+        /// <summary>
+        /// 获取已接单任务
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<List<OrderDto>> GetAssignedOrdersAsync(OrderPagedResultRequestDto requestDto)
+        {
+            //TODO 默认根据角色筛选对应订单,整合到一个接口中
+            var query =  await _orderRepository.GetQueryableAsync();
+           var orders = query.Where(o => o.HouseholdWorkerId == CurrentUser.Id)
+                .PageBy(requestDto).ToList(); ;
+
+            return ObjectMapper.Map<List<Order>, List<OrderDto>>(orders);
+        }
+
+        /// <summary>
+        /// 获取待接单任务
+        /// </summary>
+        /// <param name="requestDto"></param>
+        /// <returns></returns>
+        public async Task<List<OrderDto>> GetCreatedOrdersAsync(OrderPagedResultRequestDto requestDto)
+        {       
+           //TODO 默认根据角色筛选对应订单,整合到一个接口中
+            var query = await _orderRepository.GetQueryableAsync();
+            var orders = query.Where(o => o.Status == Enums.OrderStatus.Created)
+                 .PageBy(requestDto).ToList(); ;
+
+            return ObjectMapper.Map<List<Order>, List<OrderDto>>(orders);
+        }
+
+        /// <summary>
+        /// 家政人员注册
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public Task RegisterAsync(WorkerRegisterDto input)
+        {
+            throw new NotImplementedException();
+        }
+        /// <summary>
+        /// 退单
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        /// <exasception cref="NotImplementedException"></exception>
+        public async Task RejectOrderAsync(Guid orderId)
+        {
+            var order = await _orderRepository.FirstOrDefaultAsync(o => o.Id == orderId);
+            if (order == null) throw new BusinessException("未找到订单");
+
+            order.RejectOrder(CurrentUser.Id!.Value);
+        }
+        /// <summary>
+        /// 开始服务
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task StartServiceAsync(Guid orderId)
+        {
+            var order = await _orderRepository.FirstOrDefaultAsync(o => o.Id == orderId);
+            if (order == null) throw new BusinessException("未找到订单");
+
+            order.StartService();
+
+        }
+
+        /// <summary>
+        /// 服务完成
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task CompleteServiceAsync(Guid orderId)
+        {
+            var order = await _orderRepository.FirstOrDefaultAsync(o => o.Id == orderId);
+            if (order == null) throw new BusinessException("未找到订单");
+
+            order.CompleteService();
+
+        }
+    }
+}

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

@@ -1,34 +1,23 @@
-using KonSoft.Admin.Dtos;
+using System;
-using KonSoft.Admin.Entities;
-using KonSoft.Admin.IApplicationServices;
-using KonSoft.Admin.Repositories;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
+using KonSoft.Admin.Dtos;
+using KonSoft.Admin.Entities;
+using KonSoft.Admin.IApplicationServices;
+using KonSoft.Admin.IRepositories;
+using KonSoft.Admin.ValueObjects;
 using Volo.Abp;
+using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
-using Volo.Abp.ObjectMapping;
+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;
 
-        /// <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>
     ///     取消订单
@@ -43,29 +32,6 @@ namespace KonSoft.Admin.ApplicationServices
         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>
     ///     创建订单
@@ -78,7 +44,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(input.CustomerId, input.ServiceCategoryId, input.ServiceTime,
+            input.Amount, address, input.Remark);
 
         await _orderRepository.InsertAsync(order);
         return ObjectMapper.Map<Order, OrderDto>(order);
@@ -88,16 +55,16 @@ namespace KonSoft.Admin.ApplicationServices
     ///     根据订单ID删除订单
     /// </summary>
     /// <param name="id">订单ID</param>
-        public async Task DeleteAsync(Guid id)
+    public async Task DeleteAsync(params Guid[] ids)
     {
         // 根据ID删除订单
-            await _orderRepository.DeleteAsync(x => x.Id == id);
+        await _orderRepository.DeleteAsync(x => ids.Contains(x.Id));
     }
 
     /// <summary>
     /// 修改订单信息
     /// </summary>
-        /// <param name="input">订单DTO对象</param>s
+    /// <param name="input">订单DTO对象</param>
     public async Task EditAsync(OrderDto input)
     {
         // 根据ID查询订单，如果不存在则抛出异常【修改前端必然看到了,数据若查不到提示自定义异常信息】
@@ -108,9 +75,19 @@ namespace KonSoft.Admin.ApplicationServices
         ObjectMapper.Map(input, order);
 
         // 更新订单
-            await _orderRepository.UpdateAsync(order);
+        //await _orderRepository.UpdateAsync(order);
     }
 
+    public async Task PayServiceCallFeeAsync(Guid orderId, PayOrderDto input)
+    {
+        var order = await _orderRepository.FirstOrDefaultAsync(o => o.Id == orderId);
+        if (order == null) throw new BusinessException("未找到订单");
+
+        order.PayServiceCallFee();
+
+    }
+
+
     /// <summary>
     /// 支付
     /// </summary>
@@ -118,22 +95,14 @@ namespace KonSoft.Admin.ApplicationServices
     /// <param name="input"></param>
     /// <returns></returns>
     /// <exception cref="NotImplementedException"></exception>
-        public Task<OrderDto> PayAsync(Guid orderId, PayOrderDto input)
+    public async Task PayAsync(Guid orderId, PayOrderDto input)
     {
-            throw new NotImplementedException();
+        var order = await _orderRepository.FirstOrDefaultAsync(o => o.Id == orderId);
+        if (order == null) throw new BusinessException("未找到订单");
+
+        order.Pay();
     }
 
-        /// <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();
-        }
 
     /// <summary>
     /// 根据订单ID获取单个订单
@@ -148,15 +117,22 @@ namespace KonSoft.Admin.ApplicationServices
     }
 
     /// <summary>
-        /// 获取所有订单列表
+    /// 获取订单列表
     /// </summary>
-        public async Task<List<OrderDto>> GetListAsync()
+    public async Task<PagedResultDto<OrderDto>> GetListAsync(OrderPagedResultRequestDto input)
     {
-            // 查询所有订单
+        //TODO 默认根据角色筛选对应订单,整合到一个接口中
-            var orders = await _orderRepository.GetListAsync();
+        var query = await _orderRepository.GetQueryableAsync();
+        var orders = query.PageBy(input).OrderBy(o => o.Id).ToList();
 
-            // 转换为OrderDto列表返回
+        var totalCount = await _orderRepository.CountAsync();
-            return ObjectMapper.Map<List<Order>, List<OrderDto>>(orders);
+
-        }
+        var orderDtos = ObjectMapper.Map<List<Order>, List<OrderDto>>(orders);
+
+        return new PagedResultDto<OrderDto>(totalCount, orderDtos);
     }
+
+
+
+
 }

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

@@ -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); // 递归
+        }
+    }
+}

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

@@ -1,16 +1,15 @@
-using KonSoft.Admin.Dtos;
+using System;
-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 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();
     }
 }
-}

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

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

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

@@ -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;
-        }
-    }
-}

modules/admin/src/KonSoft.Admin.Application/Properties/AssemblyInfo.cs

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

modules/admin/src/KonSoft.Admin.Domain.Shared/AdminDomainSharedModule.cs

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

modules/admin/src/KonSoft.Admin.Domain.Shared/AdminGlobalFeatureConfigurator.cs

@@ -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()
     {

modules/admin/src/KonSoft.Admin.Domain.Shared/AdminModuleExtensionConfigurator.cs

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

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

@@ -1,22 +1,14 @@
-using System;
+namespace KonSoft.Admin.Enums;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace KonSoft.Admin.Enums
-{
 public enum OrderStatus
 {
-        PendingPayment,      // 待支付
+    Created = 1,             //用户创建订单
-        PaidWaitingAssign,   // 已支付待派单
+    Assigned,                //家政人员已接单
-        AssignedWaitingService, // 已派单待服务
+    ServiceCallPaymentComplete,   //上门费支付完成
-        InService,           // 服务中
+    ServiceStarted,          //服务开始
-        WaitingConfirm,      // 待用户确认
+    ServiceCompleted,        //服务已完成
-        Completed,           // 已完成
+    PaymentPending,          //用户支付订单
-        Canceled,            // 已取消
+    PaymentComplete,         //用户支付完成
-        Refunding,           // 退款中
+    Cancelled,               //订单取消
-        Refunded             // 已退款
+    Refunded,                //订单退款
-
-    }
 }

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

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

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

@@ -3,6 +3,6 @@
 public static class AdminConsts
 {
     public const string DbTablePrefix = "App";
-
+    public const string DbSchema = "";
-    public const string DbSchema = null;
+    public const string ConnectionStringName = "Default";
 }

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

@@ -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;

modules/admin/src/KonSoft.Admin.Domain/Data/IAdminDbSchemaMigrator.cs

@@ -1,8 +0,0 @@
-using System.Threading.Tasks;
-
-namespace KonSoft.Admin.Data;
-
-public interface IAdminDbSchemaMigrator
-{
-    Task MigrateAsync();
-}

modules/admin/src/KonSoft.Admin.Domain/Data/NullAdminDbSchemaMigrator.cs

@@ -1,15 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.DependencyInjection;
-
-namespace KonSoft.Admin.Data;
-
-/* This is used if database provider does't define
- * IAdminDbSchemaMigrator implementation.
- */
-public class NullAdminDbSchemaMigrator : IAdminDbSchemaMigrator, ITransientDependency
-{
-    public Task MigrateAsync()
-    {
-        return Task.CompletedTask;
-    }
-}

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

@@ -1,60 +0,0 @@
-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/HouseholdWorker.cs

@@ -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; }
+}

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

@@ -1,64 +1,73 @@
 using KonSoft.Admin.Enums;
+using KonSoft.Admin.ValueObjects;
 using System;
-using System.Collections.Generic;
+using Volo.Abp;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Volo.Abp.Domain.Entities.Auditing;
 using Volo.Abp.Identity;
 
-namespace KonSoft.Admin.Entities
+namespace KonSoft.Admin.Entities;
-{
+
 public class Order : FullAuditedAggregateRoot<Guid>
 {
-        /// <summary>
+    private Order()
-        /// 订单编号
+    {
-        /// </summary>
+    }
-        public string OrderSN { get; private set; }
+
+
+    public Order(Guid customerId, Guid serviceCategoryId, DateTime serviceTime, decimal amount,
+        AddressInfo address, string? remark = null)
+    {
+        CustomerId = customerId;
+        ServiceCategoryId = serviceCategoryId;
+        ServiceTime = serviceTime;
+        Amount = amount;
+        Address = address;
+        Remark = remark;
+        Status = OrderStatus.Created;
+    }
 
     /// <summary>
     ///     用户ID
     /// </summary>
     public Guid CustomerId { get; private set; }
+    public virtual IdentityUser Customer { get; private set; }
+
     /// <summary>
     ///     家政人员ID
     /// </summary>
-        public Guid? WorkerId { get; private set; }
+    public Guid? HouseholdWorkerId { get; private set; }
+    public IdentityUser? HouseholdWorker { 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; }
 
+    /// <summary>
+    /// 订单状态
+    /// </summary>
     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>
@@ -68,90 +77,112 @@ namespace KonSoft.Admin.Entities
     ///     备注
     /// </summary>
     public string? Remark { get; private set; }
+
     /// <summary>
     ///     取消原因
     /// </summary>
     public string? CancelReason { get; private set; }
 
-        protected Order() { }
+
+    //public void MarkPaid(decimal paidAmount, string method)
+    //{
+    //    if (Status != OrderStatus.PendingPayment)
+    //    {
+    //        throw new InvalidOperationException("订单不在待付款状态");
+    //    }
 
 
-        public Order(Guid id, string orderSN, Guid customerId, Guid serviceCategoryId, DateTime serviceTime, decimal amount, AddressInfo address, string remark = null)
+    //    PaidAmount = paidAmount;
-        : base(id)
+    //    PaymentMethod = method;
-        {
+    //    Status = OrderStatus.PaidWaitingAssign;
-            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)
+        if (Status != OrderStatus.Created)
-                throw new InvalidOperationException("订单无法分配师傅");
+        {
+            throw new BusinessException("订单无法分配师傅");
+        }
 
 
-            WorkerId = workerId;
+        HouseholdWorkerId = workerId;
-            Status = OrderStatus.AssignedWaitingService;
+        Status = OrderStatus.Assigned;
+    }
+
+    public void RejectOrder(Guid workerId)
+    {
+        if (Status != OrderStatus.Created)
+        {
+            throw new BusinessException("订单无法分配师傅");
+        }
+        if (HouseholdWorkerId != workerId)
+        {
+            throw new BusinessException("订单不属于你,无法退单");
+        }
+
+
+        Status = OrderStatus.Created;
+    }
+
+
+    public void PayServiceCallFee()
+    {
+        if (Status != OrderStatus.Assigned)
+        {
+            throw new BusinessException("订单无法支付上门费");
+        }
+
+
+        Status = OrderStatus.ServiceCallPaymentComplete;
+    }
+
+
+    public void Pay()
+    {
+        if (Status != OrderStatus.ServiceCompleted)
+        {
+            throw new BusinessException("订单服务未完成无法支付");
+        }
+
+        Status = OrderStatus.PaymentPending;
     }
 
 
     public void StartService()
     {
-            if (Status != OrderStatus.AssignedWaitingService)
+        if (Status != OrderStatus.ServiceCallPaymentComplete)
-                throw new InvalidOperationException("订单无法开始");
+        {
+            throw new BusinessException("订单未支付上门费无法开始");
+        }
 
-
+        Status = OrderStatus.ServiceStarted;
-            Status = OrderStatus.InService;
     }
 
 
     public void CompleteService()
     {
-            if (Status != OrderStatus.InService)
+        if (Status != OrderStatus.ServiceStarted)
-                throw new InvalidOperationException("订单未开始服务,无法完成");
-
-
-            Status = OrderStatus.WaitingConfirm;
-        }
-
-
-        public void ConfirmCompletion()
         {
-            if (Status != OrderStatus.WaitingConfirm)
+            throw new BusinessException("订单未开始,无法完成");
-                throw new InvalidOperationException("订单无法确认");
-
-
-            Status = OrderStatus.Completed;
         }
 
+        Status = OrderStatus.ServiceCompleted;
+    }
+
+
+
 
     public void Cancel(string reason)
     {
         // 若已完成或退款中则不可取消
-            if (Status == OrderStatus.Completed || Status == OrderStatus.Refunding || Status == OrderStatus.Refunded)
+        if (Status == OrderStatus.ServiceCompleted || Status == OrderStatus.Cancelled || Status == OrderStatus.Refunded)
-                throw new InvalidOperationException("订单无法被取消");
+        {
+            throw new BusinessException("订单无法被取消");
+        }
 
 
         CancelReason = reason;
-            Status = OrderStatus.Canceled;
+        Status = OrderStatus.Cancelled;
-        }
     }
 }

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

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

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

@@ -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; }
+    protected ServiceCategory()
-        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)
@@ -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();
     }
-
-
-    }
 }

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

@@ -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);
-        }
-    }
-}