Compare commits
	
		
			19 Commits
		
	
	
		
			dv_karl
			...
			28954870f6
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 28954870f6 | |||
| 89c8236f99 | |||
| 69d2b460b6 | |||
| 1f5bc3e971 | |||
| f1c609b4be | |||
| 1419e37ed5 | |||
| 4e465563c4 | |||
| 8bb4f18be3 | |||
| 2709816ccd | |||
| ea0d6d21f0 | |||
| 36759da784 | |||
| 26db968945 | |||
| dbde1486e2 | |||
| b545a603b0 | |||
| ff0ec31ed0 | |||
| 6f2a1d1990 | |||
| a1038f1b7b | |||
| c667df1ce3 | |||
| 886cec11fb | 
							
								
								
									
										44
									
								
								KonSoft.sln
									
									
									
									
									
								
							
							
						
						
									
										44
									
								
								KonSoft.sln
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | ||||
|  | ||||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||||
| # Visual Studio Version 17 | ||||
| VisualStudioVersion = 17.14.36414.22 d17.14 | ||||
| VisualStudioVersion = 17.14.36414.22 | ||||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "applications", "applications", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}" | ||||
| EndProject | ||||
| @ -49,8 +49,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E67FA5C3-132 | ||||
| EndProject | ||||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1C06151A-45F0-4D48-8303-3D4CBE9517F7}" | ||||
| EndProject | ||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared", "shared\KonSoft.Shared\KonSoft.Shared.csproj", "{345B5CDA-DC77-4956-BF96-80707EC1B5B2}" | ||||
| EndProject | ||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Admin.Application", "modules\admin\src\KonSoft.Admin.Application\KonSoft.Admin.Application.csproj", "{9D9D979A-AFC7-F9D0-2D23-8809E83F9EF9}" | ||||
| EndProject | ||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Admin.Application.Contracts", "modules\admin\src\KonSoft.Admin.Application.Contracts\KonSoft.Admin.Application.Contracts.csproj", "{9F68B0E2-0B1D-E0E8-1BE7-079F693A4643}" | ||||
| @ -185,6 +183,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Report.HttpApi.Host | ||||
| EndProject | ||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.TenantManagement.HttpApi.Host", "microservices\KonSoft.TenantManagement.HttpApi.Host\KonSoft.TenantManagement.HttpApi.Host.csproj", "{3641CA05-99C5-2245-C663-6CE00730E87C}" | ||||
| EndProject | ||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.Localization", "shared\KonSoft.Shared.Localization\KonSoft.Shared.Localization.csproj", "{A773C53C-F145-043A-7F55-79ABDB11893B}" | ||||
| EndProject | ||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.Hosting", "shared\KonSoft.Shared.Hosting\KonSoft.Shared.Hosting.csproj", "{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF}" | ||||
| EndProject | ||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.Hosting.AspNetCore", "shared\KonSoft.Shared.Hosting.AspNetCore\KonSoft.Shared.Hosting.AspNetCore.csproj", "{8CA6B487-3AAF-4E77-ACE0-01D878DE4836}" | ||||
| EndProject | ||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.Hosting.Gateways", "shared\KonSoft.Shared.Hosting.Gateways\KonSoft.Shared.Hosting.Gateways.csproj", "{BBB1A129-9ED7-4F08-B710-B6C287197BFB}" | ||||
| EndProject | ||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KonSoft.Shared.Hosting.Microservices", "shared\KonSoft.Shared.Hosting.Microservices\KonSoft.Shared.Hosting.Microservices.csproj", "{ADF28580-F8A0-4495-96D6-736C6C7CF3FF}" | ||||
| EndProject | ||||
| Global | ||||
| 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||
| 		Debug|Any CPU = Debug|Any CPU | ||||
| @ -203,10 +211,6 @@ Global | ||||
| 		{AEBC7053-743F-4F80-BD10-8ED6A8A7B3EE}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{AEBC7053-743F-4F80-BD10-8ED6A8A7B3EE}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| 		{AEBC7053-743F-4F80-BD10-8ED6A8A7B3EE}.Release|Any CPU.Build.0 = Release|Any CPU | ||||
| 		{345B5CDA-DC77-4956-BF96-80707EC1B5B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||
| 		{345B5CDA-DC77-4956-BF96-80707EC1B5B2}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{345B5CDA-DC77-4956-BF96-80707EC1B5B2}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| 		{345B5CDA-DC77-4956-BF96-80707EC1B5B2}.Release|Any CPU.Build.0 = Release|Any CPU | ||||
| 		{9D9D979A-AFC7-F9D0-2D23-8809E83F9EF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||
| 		{9D9D979A-AFC7-F9D0-2D23-8809E83F9EF9}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{9D9D979A-AFC7-F9D0-2D23-8809E83F9EF9}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| @ -475,6 +479,26 @@ Global | ||||
| 		{3641CA05-99C5-2245-C663-6CE00730E87C}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{3641CA05-99C5-2245-C663-6CE00730E87C}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| 		{3641CA05-99C5-2245-C663-6CE00730E87C}.Release|Any CPU.Build.0 = Release|Any CPU | ||||
| 		{A773C53C-F145-043A-7F55-79ABDB11893B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||
| 		{A773C53C-F145-043A-7F55-79ABDB11893B}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{A773C53C-F145-043A-7F55-79ABDB11893B}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| 		{A773C53C-F145-043A-7F55-79ABDB11893B}.Release|Any CPU.Build.0 = Release|Any CPU | ||||
| 		{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||
| 		{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| 		{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF}.Release|Any CPU.Build.0 = Release|Any CPU | ||||
| 		{8CA6B487-3AAF-4E77-ACE0-01D878DE4836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||
| 		{8CA6B487-3AAF-4E77-ACE0-01D878DE4836}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{8CA6B487-3AAF-4E77-ACE0-01D878DE4836}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| 		{8CA6B487-3AAF-4E77-ACE0-01D878DE4836}.Release|Any CPU.Build.0 = Release|Any CPU | ||||
| 		{BBB1A129-9ED7-4F08-B710-B6C287197BFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||
| 		{BBB1A129-9ED7-4F08-B710-B6C287197BFB}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{BBB1A129-9ED7-4F08-B710-B6C287197BFB}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| 		{BBB1A129-9ED7-4F08-B710-B6C287197BFB}.Release|Any CPU.Build.0 = Release|Any CPU | ||||
| 		{ADF28580-F8A0-4495-96D6-736C6C7CF3FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||
| 		{ADF28580-F8A0-4495-96D6-736C6C7CF3FF}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||
| 		{ADF28580-F8A0-4495-96D6-736C6C7CF3FF}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||
| 		{ADF28580-F8A0-4495-96D6-736C6C7CF3FF}.Release|Any CPU.Build.0 = Release|Any CPU | ||||
| 	EndGlobalSection | ||||
| 	GlobalSection(SolutionProperties) = preSolution | ||||
| 		HideSolutionNode = FALSE | ||||
| @ -498,7 +522,6 @@ Global | ||||
| 		{6C762F40-30BB-4CDA-951B-01D45F7C2B53} = {AAF02051-771B-4CC0-BD17-1A3643F83E09} | ||||
| 		{E67FA5C3-132C-4F47-B6A6-8FA4376C70BB} = {CF59695F-7948-4743-A467-42E4B4C9EECA} | ||||
| 		{1C06151A-45F0-4D48-8303-3D4CBE9517F7} = {CF59695F-7948-4743-A467-42E4B4C9EECA} | ||||
| 		{345B5CDA-DC77-4956-BF96-80707EC1B5B2} = {7EFFD2C6-2041-4967-A715-0F817D70C433} | ||||
| 		{9D9D979A-AFC7-F9D0-2D23-8809E83F9EF9} = {EBCB740D-07E7-4CED-A422-90EB824B9021} | ||||
| 		{9F68B0E2-0B1D-E0E8-1BE7-079F693A4643} = {EBCB740D-07E7-4CED-A422-90EB824B9021} | ||||
| 		{D1A86C77-533D-5B68-04F1-7F7BFBF56AC7} = {EBCB740D-07E7-4CED-A422-90EB824B9021} | ||||
| @ -566,6 +589,11 @@ Global | ||||
| 		{9A034977-0FBC-A3C8-8432-9FDD073F215A} = {4CBFE8AF-968B-453D-B763-3D0437C0883D} | ||||
| 		{1C89424B-DA16-8840-4AB0-C446CFBD634C} = {4CBFE8AF-968B-453D-B763-3D0437C0883D} | ||||
| 		{3641CA05-99C5-2245-C663-6CE00730E87C} = {4CBFE8AF-968B-453D-B763-3D0437C0883D} | ||||
| 		{A773C53C-F145-043A-7F55-79ABDB11893B} = {7EFFD2C6-2041-4967-A715-0F817D70C433} | ||||
| 		{2DBCE12E-4A5F-4AB9-82BB-4BDDE48AABBF} = {7EFFD2C6-2041-4967-A715-0F817D70C433} | ||||
| 		{8CA6B487-3AAF-4E77-ACE0-01D878DE4836} = {7EFFD2C6-2041-4967-A715-0F817D70C433} | ||||
| 		{BBB1A129-9ED7-4F08-B710-B6C287197BFB} = {7EFFD2C6-2041-4967-A715-0F817D70C433} | ||||
| 		{ADF28580-F8A0-4495-96D6-736C6C7CF3FF} = {7EFFD2C6-2041-4967-A715-0F817D70C433} | ||||
| 	EndGlobalSection | ||||
| 	GlobalSection(ExtensibilityGlobals) = postSolution | ||||
| 		SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} | ||||
|  | ||||
| @ -1,23 +1,41 @@ | ||||
| FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base | ||||
| USER $APP_UID | ||||
| WORKDIR /app | ||||
| EXPOSE 8080 | ||||
| EXPOSE 8081 | ||||
|  | ||||
| FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build | ||||
| ARG BUILD_CONFIGURATION=Release | ||||
| ARG NODE_VERSION=16.13.0 | ||||
| ARG YARN_VERSION=1.22.15 | ||||
| RUN 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 ["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/"] | ||||
| COPY ["shared/KonSoft.Shared.Localization/KonSoft.Shared.Localization.csproj", "shared/KonSoft.Shared.Localization/"] | ||||
| RUN dotnet restore "./applications/KonSoft.AuthServer/KonSoft.AuthServer.csproj" | ||||
| COPY . . | ||||
| WORKDIR "/src/applications/KonSoft.AuthServer" | ||||
| RUN dotnet tool install -g Volo.Abp.Cli \ | ||||
|     && export PATH="$PATH:/root/.dotnet/tools" \ | ||||
|     && abp install-libs | ||||
| RUN dotnet build "./KonSoft.AuthServer.csproj" -c $BUILD_CONFIGURATION -o /app/build | ||||
|  | ||||
| # 此阶段用于发布要复制到最终阶段的服务项目 | ||||
| FROM build AS publish | ||||
| ARG BUILD_CONFIGURATION=Release | ||||
| RUN dotnet publish "./KonSoft.AuthServer.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false | ||||
|  | ||||
| # 此阶段在生产中使用,或在常规模式下从 VS 运行时使用(在不使用调试配置时为默认值) | ||||
| FROM base AS final | ||||
| WORKDIR /app | ||||
| COPY --from=publish /app/publish . | ||||
|  | ||||
| @ -39,22 +39,11 @@ | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" /> | ||||
|     <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" /> | ||||
|     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" /> | ||||
|     <PackageReference Include="DistributedLock.Redis" Version="1.0.2" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
| 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" /> | ||||
| 		<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Volo.Abp.Autofac" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.DistributedLocking" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Account.Application" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Account.HttpApi" Version="8.3.4" /> | ||||
| @ -69,4 +58,8 @@ | ||||
|     <PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\..\shared\KonSoft.Shared.Hosting.Microservices\KonSoft.Shared.Hosting.Microservices.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -1,49 +1,32 @@ | ||||
| using KonSoft.Shared.Hosting.AspNetCore; | ||||
| using KonSoft.Shared.Hosting.Microservices; | ||||
| using KonSoft.Shared.Localization.Localization; | ||||
| using Localization.Resources.AbpUi; | ||||
| using Medallion.Threading; | ||||
| using Medallion.Threading.Redis; | ||||
| using Microsoft.AspNetCore.Builder; | ||||
| using Microsoft.AspNetCore.Cors; | ||||
| using Microsoft.AspNetCore.DataProtection; | ||||
| using Microsoft.Extensions.DependencyInjection; | ||||
| using Microsoft.Extensions.Hosting; | ||||
| using StackExchange.Redis; | ||||
| using System; | ||||
| using System.IO; | ||||
| using System.Linq; | ||||
| using Volo.Abp; | ||||
| using Volo.Abp.Account; | ||||
| using Volo.Abp.Account.Localization; | ||||
| using Volo.Abp.Account.Web; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.Bundling; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; | ||||
| using Volo.Abp.AspNetCore.Serilog; | ||||
| using Volo.Abp.Auditing; | ||||
| using Volo.Abp.Autofac; | ||||
| using Volo.Abp.BackgroundJobs; | ||||
| using Volo.Abp.Caching; | ||||
| using Volo.Abp.Caching.StackExchangeRedis; | ||||
| using Volo.Abp.DistributedLocking; | ||||
| using Volo.Abp.Localization; | ||||
| using Volo.Abp.Modularity; | ||||
| using Volo.Abp.OpenIddict; | ||||
| using Volo.Abp.Security.Claims; | ||||
| using Volo.Abp.UI.Navigation.Urls; | ||||
| using Volo.Abp.VirtualFileSystem; | ||||
|  | ||||
| namespace KonSoft; | ||||
|  | ||||
| [DependsOn( | ||||
|     typeof(AbpAutofacModule), | ||||
|     typeof(AbpCachingStackExchangeRedisModule), | ||||
|     typeof(AbpDistributedLockingModule), | ||||
|     typeof(AbpAccountWebOpenIddictModule), | ||||
|     typeof(AbpAccountApplicationModule), | ||||
|     typeof(AbpAccountHttpApiModule), | ||||
|     typeof(AbpAspNetCoreMvcUiBasicThemeModule), | ||||
|     typeof(AbpAspNetCoreSerilogModule) | ||||
|     )] | ||||
|     typeof(KonSoftSharedHostingMicroservicesModule) | ||||
| )] | ||||
| public class KonSoftAuthServerModule : AbpModule | ||||
| { | ||||
|     public override void PreConfigureServices(ServiceConfigurationContext context) | ||||
| @ -70,7 +53,8 @@ public class KonSoftAuthServerModule : AbpModule | ||||
|  | ||||
|             PreConfigure<OpenIddictServerBuilder>(serverBuilder => | ||||
|             { | ||||
|                 serverBuilder.AddProductionEncryptionAndSigningCertificate("openiddict.pfx", "59464dba-b66e-48cd-8b81-2e4a9c08c977"); | ||||
|                 serverBuilder.AddProductionEncryptionAndSigningCertificate("openiddict.pfx", | ||||
|                     "59464dba-b66e-48cd-8b81-2e4a9c08c977"); | ||||
|             }); | ||||
|         } | ||||
|     } | ||||
| @ -94,66 +78,17 @@ public class KonSoftAuthServerModule : AbpModule | ||||
|         { | ||||
|             options.StyleBundles.Configure( | ||||
|                 BasicThemeBundles.Styles.Global, | ||||
|                 bundle => | ||||
|                 { | ||||
|                     bundle.AddFiles("/global-styles.css"); | ||||
|                 } | ||||
|                 bundle => { bundle.AddFiles("/global-styles.css"); } | ||||
|             ); | ||||
|         }); | ||||
|  | ||||
|         Configure<AbpAuditingOptions>(options => | ||||
|         { | ||||
|                 options.IsEnabledForGetRequests = true; | ||||
|                 options.ApplicationName = "AuthServer"; | ||||
|             options.IsEnabledForGetRequests = true; | ||||
|             options.ApplicationName = "AuthServer"; | ||||
|         }); | ||||
|  | ||||
|         Configure<AppUrlOptions>(options => | ||||
|         { | ||||
|             options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"]; | ||||
|             options.RedirectAllowedUrls.AddRange(configuration["App:RedirectAllowedUrls"]?.Split(',') ?? []); | ||||
|         }); | ||||
|  | ||||
|         Configure<AbpBackgroundJobOptions>(options => | ||||
|         { | ||||
|             options.IsJobExecutionEnabled = false; | ||||
|         }); | ||||
|  | ||||
|         Configure<AbpDistributedCacheOptions>(options => | ||||
|         { | ||||
|             options.KeyPrefix = "KonSoft:"; | ||||
|         }); | ||||
|  | ||||
|         var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("KonSoft"); | ||||
|         if (!hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "KonSoft-Protection-Keys"); | ||||
|         } | ||||
|  | ||||
|         context.Services.AddSingleton<IDistributedLockProvider>(sp => | ||||
|         { | ||||
|             var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); | ||||
|         }); | ||||
|  | ||||
|         context.Services.AddCors(options => | ||||
|         { | ||||
|             options.AddDefaultPolicy(builder => | ||||
|             { | ||||
|                 builder | ||||
|                     .WithOrigins( | ||||
|                         configuration["App:CorsOrigins"]? | ||||
|                             .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                             .Select(o => o.RemovePostFix("/")) | ||||
|                             .ToArray() ?? [] | ||||
|                     ) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|                     .AllowAnyHeader() | ||||
|                     .AllowAnyMethod() | ||||
|                     .AllowCredentials(); | ||||
|             }); | ||||
|         }); | ||||
|         Configure<AbpBackgroundJobOptions>(options => { options.IsJobExecutionEnabled = false; }); | ||||
|  | ||||
|         context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options => | ||||
|         { | ||||
| @ -185,7 +120,7 @@ public class KonSoftAuthServerModule : AbpModule | ||||
|         app.UseAuthentication(); | ||||
|         app.UseAbpOpenIddictValidation(); | ||||
|  | ||||
|         if (MultiTenancyConsts.IsEnabled) | ||||
|         if (KonSoftConsts.MultiTenancyEnabled) | ||||
|         { | ||||
|             app.UseMultiTenancy(); | ||||
|         } | ||||
| @ -198,4 +133,4 @@ public class KonSoftAuthServerModule : AbpModule | ||||
|         app.UseAbpSerilogEnrichers(); | ||||
|         app.UseConfiguredEndpoints(); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,14 +1,14 @@ | ||||
| using Microsoft.Extensions.Localization; | ||||
| using KonSoft.Localization; | ||||
| using Volo.Abp.Ui.Branding; | ||||
| using KonSoft.Shared.Localization.Localization; | ||||
| using Microsoft.Extensions.Localization; | ||||
| using Volo.Abp.DependencyInjection; | ||||
| using Volo.Abp.Ui.Branding; | ||||
|  | ||||
| namespace KonSoft; | ||||
|  | ||||
| [Dependency(ReplaceServices = true)] | ||||
| public class KonSoftBrandingProvider : DefaultBrandingProvider | ||||
| { | ||||
|     private IStringLocalizer<KonSoftResource> _localizer; | ||||
|     private readonly IStringLocalizer<KonSoftResource> _localizer; | ||||
|  | ||||
|     public KonSoftBrandingProvider(IStringLocalizer<KonSoftResource> localizer) | ||||
|     { | ||||
| @ -16,4 +16,4 @@ public class KonSoftBrandingProvider : DefaultBrandingProvider | ||||
|     } | ||||
|  | ||||
|     public override string AppName => _localizer["AppName"]; | ||||
| } | ||||
| } | ||||
| @ -1,12 +1,13 @@ | ||||
| @page | ||||
| @using System.Net | ||||
| @using KonSoft.Shared.Localization.Localization | ||||
| @using Microsoft.AspNetCore.Http.Extensions | ||||
| @using Microsoft.AspNetCore.Mvc.Localization | ||||
| @using KonSoft.Pages | ||||
| @using KonSoft.Localization | ||||
| @using Volo.Abp.Users | ||||
| @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid | ||||
| @using Volo.Abp.AspNetCore.Mvc.UI.Theming | ||||
| @using Volo.Abp.Ui.Branding | ||||
| @model IndexModel | ||||
| @using Volo.Abp.Users | ||||
| @model KonSoft.Pages.IndexModel | ||||
| @inject IHtmlLocalizer<KonSoftResource> L | ||||
| @inject ICurrentUser CurrentUser | ||||
| @inject IBrandingProvider BrandingProvider | ||||
| @ -45,32 +46,32 @@ | ||||
|                             <abp-row> | ||||
|                                 <abp-column size="_6"> | ||||
|                                     <div class="mr-auto p-2 float-start"> | ||||
|                                             <div class=""> | ||||
|                                                 @if (CurrentUser.IsAuthenticated) | ||||
|                                                 { | ||||
|                                                     <div class=""> | ||||
|                                                         <a abp-button="Outline_Primary" asp-controller="Manage" asp-action="Index" asp-area="Account" class="me-2">@L["MyAccount"]</a> | ||||
|                                                         <a abp-button="Primary" asp-controller="Logout" asp-action="Index" asp-area="Account" asp-route-returnUrl="/" >@L["Logout"]</a> | ||||
|                                                     </div> | ||||
|                                                 } | ||||
|                                                 else | ||||
|                                                 { | ||||
|                                                     <a abp-button="Primary" asp-controller="Login" asp-action="Index" asp-area="Account">@L["Login"]</a> | ||||
|                                                 } | ||||
|                                             </div> | ||||
|                                         <div class=""> | ||||
|                                             @if (CurrentUser.IsAuthenticated) | ||||
|                                             { | ||||
|                                                 <div class=""> | ||||
|                                                     <a abp-button="Outline_Primary" asp-controller="Manage" asp-action="Index" asp-area="Account" class="me-2">@L["MyAccount"]</a> | ||||
|                                                     <a abp-button="Primary" asp-controller="Logout" asp-action="Index" asp-area="Account" asp-route-returnUrl="/">@L["Logout"]</a> | ||||
|                                                 </div> | ||||
|                                             } | ||||
|                                             else | ||||
|                                             { | ||||
|                                                 <a abp-button="Primary" asp-controller="Login" asp-action="Index" asp-area="Account">@L["Login"]</a> | ||||
|                                             } | ||||
|                                         </div> | ||||
|                                     </div> | ||||
|                                 </abp-column> | ||||
|  | ||||
|                                 <abp-column size="_6"> | ||||
|                                     <div class="ml-auto p-2 float-end"> | ||||
|                                         <abp-dropdown> | ||||
|                                             <abp-dropdown-button text="@Model.CurrentLanguage" /> | ||||
|                                             @if (@Model.Languages != null) | ||||
|                                             <abp-dropdown-button text="@Model.CurrentLanguage"/> | ||||
|                                             @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> | ||||
| @ -82,18 +83,18 @@ | ||||
|  | ||||
|                             @if (Model.Applications != null) | ||||
|                             { | ||||
|                                 <hr class="m-2" /> | ||||
|                                 <hr class="m-2"/> | ||||
|  | ||||
|                                 <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> | ||||
|                                                     @{  | ||||
|                                                         var clientUri = application.ClientUri.Contains("Swagger") ? application.ClientUri.EnsureEndsWith('/') + "swagger/index.html" : application.ClientUri;  | ||||
|                                                     @{ | ||||
|                                                         var clientUri = application.ClientUri.Contains("Swagger") ? application.ClientUri.EnsureEndsWith('/') + "swagger/index.html" : application.ClientUri; | ||||
|                                                     } | ||||
|                                                      | ||||
|  | ||||
|                                                     @if (!application.LogoUri.IsNullOrEmpty()) | ||||
|                                                     { | ||||
|                                                         <div class="mx-auto"> | ||||
| @ -115,4 +116,4 @@ | ||||
|             </div> | ||||
|         </abp-row> | ||||
|     </div> | ||||
| </div> | ||||
| </div> | ||||
| @ -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(); | ||||
| @ -32,4 +32,4 @@ public class IndexModel : AbpPageModel | ||||
|         Languages = await LanguageProvider.GetLanguagesAsync(); | ||||
|         CurrentLanguage = CultureInfo.CurrentCulture.DisplayName; | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -10,7 +10,7 @@ namespace KonSoft; | ||||
|  | ||||
| public class Program | ||||
| { | ||||
|     public async static Task<int> Main(string[] args) | ||||
|     public static async Task<int> Main(string[] args) | ||||
|     { | ||||
|         Log.Logger = new LoggerConfiguration() | ||||
| #if DEBUG | ||||
| @ -53,4 +53,4 @@ public class Program | ||||
|             Log.CloseAndFlush(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,38 +1,13 @@ | ||||
| { | ||||
|   "$schema": "http://json.schemastore.org/launchsettings.json", | ||||
|   "profiles": { | ||||
|     "IIS Express": { | ||||
|       "commandName": "IISExpress", | ||||
|       "launchBrowser": true, | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     }, | ||||
|     "KonSoft.AuthServer": { | ||||
|     "http": { | ||||
|       "commandName": "Project", | ||||
|       "launchBrowser": true, | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       }, | ||||
|       "applicationUrl": "https://localhost:44322" | ||||
|     }, | ||||
|     "Container (Dockerfile)": { | ||||
|       "commandName": "Docker", | ||||
|       "launchBrowser": true, | ||||
|       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}", | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_HTTPS_PORTS": "8081", | ||||
|         "ASPNETCORE_HTTP_PORTS": "8080" | ||||
|       }, | ||||
|       "publishAllPorts": true, | ||||
|       "useSSL": true | ||||
|     } | ||||
|   }, | ||||
|   "iisSettings": { | ||||
|     "windowsAuthentication": false, | ||||
|     "anonymousAuthentication": true, | ||||
|     "iisExpress": { | ||||
|       "applicationUrl": "https://localhost:44322", | ||||
|       "sslPort": 44322 | ||||
|     } | ||||
|   } | ||||
| } | ||||
| @ -1,18 +1,20 @@ | ||||
| <?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" /> | ||||
|     </system.webServer> | ||||
|   </location> | ||||
|   <system.webServer> | ||||
|     <httpProtocol> | ||||
|       <customHeaders> | ||||
|         <remove name="x-powered-by" /> | ||||
|       </customHeaders> | ||||
|     </httpProtocol> | ||||
|   </system.webServer> | ||||
| </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" /> | ||||
| 		</system.webServer> | ||||
| 	</location> | ||||
| 	<system.webServer> | ||||
| 		<httpProtocol> | ||||
| 			<customHeaders> | ||||
| 				<remove name="x-powered-by" /> | ||||
| 			</customHeaders> | ||||
| 		</httpProtocol> | ||||
| 	</system.webServer> | ||||
| </configuration> | ||||
| @ -1,33 +1,32 @@ | ||||
| using Microsoft.AspNetCore.Mvc; | ||||
|  | ||||
| namespace KonSoft.BackgroundJobs.Controllers | ||||
| namespace KonSoft.BackgroundJobs.Controllers; | ||||
|  | ||||
| [ApiController] | ||||
| [Route("[controller]")] | ||||
| public class WeatherForecastController : ControllerBase | ||||
| { | ||||
|     [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) | ||||
|     { | ||||
|         private static readonly string[] Summaries = | ||||
|         [ | ||||
|             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" | ||||
|         ]; | ||||
|         _logger = logger; | ||||
|     } | ||||
|  | ||||
|         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 | ||||
|     [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(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -22,4 +22,4 @@ app.UseAuthorization(); | ||||
|  | ||||
| app.MapControllers(); | ||||
|  | ||||
| app.Run(); | ||||
| app.Run(); | ||||
| @ -1,13 +1,5 @@ | ||||
| { | ||||
|   "$schema": "http://json.schemastore.org/launchsettings.json", | ||||
|   "iisSettings": { | ||||
|     "windowsAuthentication": false, | ||||
|     "anonymousAuthentication": true, | ||||
|     "iisExpress": { | ||||
|       "applicationUrl": "http://localhost:4773", | ||||
|       "sslPort": 44380 | ||||
|     } | ||||
|   }, | ||||
|   "profiles": { | ||||
|     "http": { | ||||
|       "commandName": "Project", | ||||
| @ -18,24 +10,6 @@ | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     }, | ||||
|     "https": { | ||||
|       "commandName": "Project", | ||||
|       "dotnetRunMessages": true, | ||||
|       "launchBrowser": true, | ||||
|       "launchUrl": "swagger", | ||||
|       "applicationUrl": "https://localhost:7094;http://localhost:5243", | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     }, | ||||
|     "IIS Express": { | ||||
|       "commandName": "IISExpress", | ||||
|       "launchBrowser": true, | ||||
|       "launchUrl": "swagger", | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     } | ||||
|   } | ||||
| } | ||||
|  | ||||
| @ -1,13 +1,12 @@ | ||||
| namespace KonSoft.BackgroundJobs | ||||
| namespace KonSoft.BackgroundJobs; | ||||
|  | ||||
| public class WeatherForecast | ||||
| { | ||||
|     public class WeatherForecast | ||||
|     { | ||||
|         public DateOnly Date { get; set; } | ||||
|     public DateOnly Date { get; set; } | ||||
|  | ||||
|         public int TemperatureC { get; set; } | ||||
|     public int TemperatureC { get; set; } | ||||
|  | ||||
|         public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); | ||||
|     public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); | ||||
|  | ||||
|         public string? Summary { get; set; } | ||||
|     } | ||||
| } | ||||
|     public string? Summary { get; set; } | ||||
| } | ||||
| @ -1,33 +1,32 @@ | ||||
| using Microsoft.AspNetCore.Mvc; | ||||
|  | ||||
| namespace KonSoft.BackgroundWorker.Controllers | ||||
| namespace KonSoft.BackgroundWorker.Controllers; | ||||
|  | ||||
| [ApiController] | ||||
| [Route("[controller]")] | ||||
| public class WeatherForecastController : ControllerBase | ||||
| { | ||||
|     [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) | ||||
|     { | ||||
|         private static readonly string[] Summaries = | ||||
|         [ | ||||
|             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" | ||||
|         ]; | ||||
|         _logger = logger; | ||||
|     } | ||||
|  | ||||
|         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 | ||||
|     [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(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -22,4 +22,4 @@ app.UseAuthorization(); | ||||
|  | ||||
| app.MapControllers(); | ||||
|  | ||||
| app.Run(); | ||||
| app.Run(); | ||||
| @ -1,13 +1,5 @@ | ||||
| { | ||||
|   "$schema": "http://json.schemastore.org/launchsettings.json", | ||||
|   "iisSettings": { | ||||
|     "windowsAuthentication": false, | ||||
|     "anonymousAuthentication": true, | ||||
|     "iisExpress": { | ||||
|       "applicationUrl": "http://localhost:22937", | ||||
|       "sslPort": 44300 | ||||
|     } | ||||
|   }, | ||||
|   "profiles": { | ||||
|     "http": { | ||||
|       "commandName": "Project", | ||||
| @ -18,24 +10,6 @@ | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     }, | ||||
|     "https": { | ||||
|       "commandName": "Project", | ||||
|       "dotnetRunMessages": true, | ||||
|       "launchBrowser": true, | ||||
|       "launchUrl": "swagger", | ||||
|       "applicationUrl": "https://localhost:7183;http://localhost:5074", | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     }, | ||||
|     "IIS Express": { | ||||
|       "commandName": "IISExpress", | ||||
|       "launchBrowser": true, | ||||
|       "launchUrl": "swagger", | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     } | ||||
|   } | ||||
| } | ||||
|  | ||||
| @ -1,13 +1,12 @@ | ||||
| namespace KonSoft.BackgroundWorker | ||||
| namespace KonSoft.BackgroundWorker; | ||||
|  | ||||
| public class WeatherForecast | ||||
| { | ||||
|     public class WeatherForecast | ||||
|     { | ||||
|         public DateOnly Date { get; set; } | ||||
|     public DateOnly Date { get; set; } | ||||
|  | ||||
|         public int TemperatureC { get; set; } | ||||
|     public int TemperatureC { get; set; } | ||||
|  | ||||
|         public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); | ||||
|     public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); | ||||
|  | ||||
|         public string? Summary { get; set; } | ||||
|     } | ||||
| } | ||||
|     public string? Summary { get; set; } | ||||
| } | ||||
| @ -1,33 +1,32 @@ | ||||
| using Microsoft.AspNetCore.Mvc; | ||||
|  | ||||
| namespace KonSoft.InternalGateway.Controllers | ||||
| namespace KonSoft.InternalGateway.Controllers; | ||||
|  | ||||
| [ApiController] | ||||
| [Route("[controller]")] | ||||
| public class WeatherForecastController : ControllerBase | ||||
| { | ||||
|     [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) | ||||
|     { | ||||
|         private static readonly string[] Summaries = | ||||
|         [ | ||||
|             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" | ||||
|         ]; | ||||
|         _logger = logger; | ||||
|     } | ||||
|  | ||||
|         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 | ||||
|     [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(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -22,4 +22,4 @@ app.UseAuthorization(); | ||||
|  | ||||
| app.MapControllers(); | ||||
|  | ||||
| app.Run(); | ||||
| app.Run(); | ||||
| @ -1,13 +1,12 @@ | ||||
| namespace KonSoft.InternalGateway | ||||
| namespace KonSoft.InternalGateway; | ||||
|  | ||||
| public class WeatherForecast | ||||
| { | ||||
|     public class WeatherForecast | ||||
|     { | ||||
|         public DateOnly Date { get; set; } | ||||
|     public DateOnly Date { get; set; } | ||||
|  | ||||
|         public int TemperatureC { get; set; } | ||||
|     public int TemperatureC { get; set; } | ||||
|  | ||||
|         public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); | ||||
|     public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); | ||||
|  | ||||
|         public string? Summary { get; set; } | ||||
|     } | ||||
| } | ||||
|     public string? Summary { get; set; } | ||||
| } | ||||
| @ -1,33 +1,32 @@ | ||||
| using Microsoft.AspNetCore.Mvc; | ||||
|  | ||||
| namespace KonSoft.PublicGateway.Controllers | ||||
| namespace KonSoft.PublicGateway.Controllers; | ||||
|  | ||||
| [ApiController] | ||||
| [Route("[controller]")] | ||||
| public class WeatherForecastController : ControllerBase | ||||
| { | ||||
|     [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) | ||||
|     { | ||||
|         private static readonly string[] Summaries = | ||||
|         [ | ||||
|             "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" | ||||
|         ]; | ||||
|         _logger = logger; | ||||
|     } | ||||
|  | ||||
|         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 | ||||
|     [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(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -22,4 +22,4 @@ app.UseAuthorization(); | ||||
|  | ||||
| app.MapControllers(); | ||||
|  | ||||
| app.Run(); | ||||
| app.Run(); | ||||
| @ -1,13 +1,12 @@ | ||||
| namespace KonSoft.PublicGateway | ||||
| namespace KonSoft.PublicGateway; | ||||
|  | ||||
| public class WeatherForecast | ||||
| { | ||||
|     public class WeatherForecast | ||||
|     { | ||||
|         public DateOnly Date { get; set; } | ||||
|     public DateOnly Date { get; set; } | ||||
|  | ||||
|         public int TemperatureC { get; set; } | ||||
|     public int TemperatureC { get; set; } | ||||
|  | ||||
|         public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); | ||||
|     public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); | ||||
|  | ||||
|         public string? Summary { get; set; } | ||||
|     } | ||||
| } | ||||
|     public string? Summary { get; set; } | ||||
| } | ||||
| @ -1,179 +1,39 @@ | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
| using System.IO; | ||||
| using System.Linq; | ||||
| using Medallion.Threading; | ||||
| using Medallion.Threading.Redis; | ||||
| using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||
| using KonSoft.Admin.DbMigrations; | ||||
| using KonSoft.Admin.EntityFrameworkCore; | ||||
| using KonSoft.Shared.Hosting.AspNetCore; | ||||
| using KonSoft.Shared.Hosting.Microservices; | ||||
| using Microsoft.AspNetCore.Builder; | ||||
| using Microsoft.AspNetCore.Cors; | ||||
| using Microsoft.AspNetCore.DataProtection; | ||||
| using Microsoft.AspNetCore.Hosting; | ||||
| using Microsoft.Extensions.Configuration; | ||||
| using Microsoft.Extensions.DependencyInjection; | ||||
| using Microsoft.Extensions.Hosting; | ||||
| using KonSoft.Admin.EntityFrameworkCore; | ||||
| using KonSoft.Admin.MultiTenancy; | ||||
| using StackExchange.Redis; | ||||
| using Microsoft.OpenApi.Models; | ||||
| using System.Threading.Tasks; | ||||
| using Volo.Abp; | ||||
| using Volo.Abp.AspNetCore.Authentication.JwtBearer; | ||||
| using Volo.Abp.AspNetCore.Mvc; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; | ||||
| using Volo.Abp.AspNetCore.Serilog; | ||||
| using Volo.Abp.Autofac; | ||||
| using Volo.Abp.Caching; | ||||
| using Volo.Abp.Caching.StackExchangeRedis; | ||||
| using Volo.Abp.DistributedLocking; | ||||
| using Volo.Abp.Identity; | ||||
| using Volo.Abp.Localization; | ||||
| using Volo.Abp.BackgroundJobs; | ||||
| using Volo.Abp.Modularity; | ||||
| using Volo.Abp.Security.Claims; | ||||
| using Volo.Abp.Swashbuckle; | ||||
| using Volo.Abp.VirtualFileSystem; | ||||
|  | ||||
| namespace KonSoft.Admin; | ||||
|  | ||||
| [DependsOn( | ||||
|     typeof(AdminHttpApiModule), | ||||
|     typeof(AbpAutofacModule), | ||||
|     typeof(AbpCachingStackExchangeRedisModule), | ||||
|     typeof(AbpDistributedLockingModule), | ||||
|     typeof(AbpAspNetCoreMvcUiMultiTenancyModule), | ||||
|     typeof(AbpAspNetCoreAuthenticationJwtBearerModule), | ||||
|     typeof(AdminApplicationModule), | ||||
|     typeof(AdminEntityFrameworkCoreModule), | ||||
|     typeof(AbpAspNetCoreSerilogModule), | ||||
|     typeof(AbpSwashbuckleModule) | ||||
|     typeof(KonSoftSharedHostingMicroservicesModule) | ||||
| )] | ||||
| public class AdminHttpApiHostModule : AbpModule | ||||
| { | ||||
|     public override void ConfigureServices(ServiceConfigurationContext context) | ||||
|     { | ||||
|         var configuration = context.Services.GetConfiguration(); | ||||
|         var hostingEnvironment = context.Services.GetHostingEnvironment(); | ||||
|  | ||||
|         ConfigureConventionalControllers(); | ||||
|         ConfigureAuthentication(context, configuration); | ||||
|         ConfigureCache(configuration); | ||||
|         ConfigureVirtualFileSystem(context); | ||||
|         ConfigureDataProtection(context, configuration, hostingEnvironment); | ||||
|         ConfigureDistributedLocking(context, configuration); | ||||
|         ConfigureCors(context, configuration); | ||||
|         ConfigureSwaggerServices(context, configuration); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureCache(IConfiguration configuration) | ||||
|     { | ||||
|         Configure<AbpDistributedCacheOptions>(options => { options.KeyPrefix = "Admin:"; }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureVirtualFileSystem(ServiceConfigurationContext context) | ||||
|     { | ||||
|         var hostingEnvironment = context.Services.GetHostingEnvironment(); | ||||
|  | ||||
|         if (hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             Configure<AbpVirtualFileSystemOptions>(options => | ||||
|             { | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<AdminDomainSharedModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Admin.Domain.Shared")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<AdminDomainModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Admin.Domain")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<AdminApplicationContractsModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Admin.Application.Contracts")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<AdminApplicationModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Admin.Application")); | ||||
|             }); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private void ConfigureConventionalControllers() | ||||
|     { | ||||
|         Configure<AbpAspNetCoreMvcOptions>(options => | ||||
|         { | ||||
|             options.ConventionalControllers.Create(typeof(AdminApplicationModule).Assembly); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) | ||||
|             .AddAbpJwtBearer(options => | ||||
|             { | ||||
|                 options.Authority = configuration["AuthServer:Authority"]; | ||||
|                 options.RequireHttpsMetadata = configuration.GetValue<bool>("AuthServer:RequireHttpsMetadata"); | ||||
|                 options.Audience = "Admin"; | ||||
|             }); | ||||
|  | ||||
|         context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options => | ||||
|         { | ||||
|             options.IsDynamicClaimsEnabled = true; | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddAbpSwaggerGenWithOAuth( | ||||
|         SwaggerConfigurationHelper.ConfigureWithOidc( | ||||
|             context, | ||||
|             configuration["AuthServer:Authority"]!, | ||||
|             new Dictionary<string, string> | ||||
|             { | ||||
|                     {"Admin", "Admin API"} | ||||
|             }, | ||||
|             options => | ||||
|             { | ||||
|                 options.SwaggerDoc("v1", new OpenApiInfo { Title = "Admin API", Version = "v1" }); | ||||
|                 options.DocInclusionPredicate((docName, description) => true); | ||||
|                 options.CustomSchemaIds(type => type.FullName); | ||||
|             }); | ||||
|     } | ||||
|             ["AdministrationService"], | ||||
|             discoveryEndpoint: configuration["AuthServer:MetadataAddress"], | ||||
|             apiTitle: "Administration Service API" | ||||
|         ); | ||||
|  | ||||
|     private void ConfigureDataProtection( | ||||
|         ServiceConfigurationContext context, | ||||
|         IConfiguration configuration, | ||||
|         IWebHostEnvironment hostingEnvironment) | ||||
|     { | ||||
|         var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Admin"); | ||||
|         if (!hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Admin-Protection-Keys"); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private void ConfigureDistributedLocking( | ||||
|         ServiceConfigurationContext context, | ||||
|         IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddSingleton<IDistributedLockProvider>(sp => | ||||
|         { | ||||
|             var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddCors(options => | ||||
|         { | ||||
|             options.AddDefaultPolicy(builder => | ||||
|             { | ||||
|                 builder | ||||
|                     .WithOrigins(configuration["App:CorsOrigins"]? | ||||
|                         .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                         .Select(o => o.RemovePostFix("/")) | ||||
|                         .ToArray() ?? []) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|                     .AllowAnyHeader() | ||||
|                     .AllowAnyMethod() | ||||
|                     .AllowCredentials(); | ||||
|             }); | ||||
|         }); | ||||
|         // ֻ<><D6BB><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD> | ||||
|         Configure<AbpBackgroundJobOptions>(options => options.IsJobExecutionEnabled = false); | ||||
|     } | ||||
|  | ||||
|     public override void OnApplicationInitialization(ApplicationInitializationContext context) | ||||
| @ -193,7 +53,7 @@ public class AdminHttpApiHostModule : AbpModule | ||||
|         app.UseCors(); | ||||
|         app.UseAuthentication(); | ||||
|  | ||||
|         if (MultiTenancyConsts.IsEnabled) | ||||
|         if (KonSoftConsts.MultiTenancyEnabled) | ||||
|         { | ||||
|             app.UseMultiTenancy(); | ||||
|         } | ||||
| @ -216,4 +76,10 @@ public class AdminHttpApiHostModule : AbpModule | ||||
|         app.UseAbpSerilogEnrichers(); | ||||
|         app.UseConfiguredEndpoints(); | ||||
|     } | ||||
| } | ||||
|  | ||||
|     //public override async Task OnPostApplicationInitializationAsync(ApplicationInitializationContext context) | ||||
|     //{ | ||||
|     //    await context.ServiceProvider.GetRequiredService<AdminPendingEfCoreMigrationsChecker>() | ||||
|     //        .CheckAndApplyDatabaseMigrationsAsync(); | ||||
|     //} | ||||
| } | ||||
| @ -9,4 +9,4 @@ public class HomeController : AbpController | ||||
|     { | ||||
|         return Redirect("~/swagger"); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -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; | ||||
|     } | ||||
| } | ||||
| @ -0,0 +1,25 @@ | ||||
| using System; | ||||
| using KonSoft.Admin.EntityFrameworkCore; | ||||
| using KonSoft.Shared.Hosting.Microservices.DbMigrations.EfCore; | ||||
| using Volo.Abp.DistributedLocking; | ||||
| using Volo.Abp.EventBus.Distributed; | ||||
| using Volo.Abp.MultiTenancy; | ||||
| using Volo.Abp.Uow; | ||||
|  | ||||
| namespace KonSoft.Admin.DbMigrations; | ||||
|  | ||||
| public class AdminPendingEfCoreMigrationsChecker : PendingEfCoreMigrationsChecker<AdminDbContext> | ||||
| { | ||||
|     public AdminPendingEfCoreMigrationsChecker(IUnitOfWorkManager unitOfWorkManager, | ||||
|         IServiceProvider serviceProvider, | ||||
|         ICurrentTenant currentTenant, | ||||
|         IDistributedEventBus distributedEventBus, | ||||
|         IAbpDistributedLock abpDistributedLock) : base(unitOfWorkManager, | ||||
|         serviceProvider, | ||||
|         currentTenant, | ||||
|         distributedEventBus, | ||||
|         abpDistributedLock, | ||||
|         "Clean") | ||||
|     { | ||||
|     } | ||||
| } | ||||
| @ -2,8 +2,9 @@ FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base | ||||
| USER $APP_UID | ||||
| WORKDIR /app | ||||
| EXPOSE 8080 | ||||
| EXPOSE 8081 | ||||
|  | ||||
|  | ||||
| # 此阶段用于生成服务项目 | ||||
| FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build | ||||
| ARG BUILD_CONFIGURATION=Release | ||||
| WORKDIR /src | ||||
| @ -15,6 +16,10 @@ COPY ["modules/admin/src/KonSoft.Admin.Domain.Shared/KonSoft.Admin.Domain.Shared | ||||
| COPY ["modules/admin/src/KonSoft.Admin.Application.Contracts/KonSoft.Admin.Application.Contracts.csproj", "modules/admin/src/KonSoft.Admin.Application.Contracts/"] | ||||
| COPY ["modules/admin/src/KonSoft.Admin.EntityFrameworkCore/KonSoft.Admin.EntityFrameworkCore.csproj", "modules/admin/src/KonSoft.Admin.EntityFrameworkCore/"] | ||||
| COPY ["modules/admin/src/KonSoft.Admin.HttpApi/KonSoft.Admin.HttpApi.csproj", "modules/admin/src/KonSoft.Admin.HttpApi/"] | ||||
| 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/"] | ||||
| COPY ["shared/KonSoft.Shared.Localization/KonSoft.Shared.Localization.csproj", "shared/KonSoft.Shared.Localization/"] | ||||
| RUN dotnet restore "./microservices/KonSoft.Admin.HttpApi.Host/KonSoft.Admin.HttpApi.Host.csproj" | ||||
| COPY . . | ||||
| WORKDIR "/src/microservices/KonSoft.Admin.HttpApi.Host" | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
|  | ||||
|   <PropertyGroup> | ||||
|     <TargetFramework>net8.0</TargetFramework> | ||||
| @ -10,22 +10,6 @@ | ||||
|     <DockerfileContext>..\..</DockerfileContext> | ||||
|   </PropertyGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" /> | ||||
|     <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" /> | ||||
|     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" /> | ||||
|     <PackageReference Include="DistributedLock.Redis" Version="1.0.2" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Autofac" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.DistributedLocking" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Swashbuckle" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <Compile Remove="Logs\**" /> | ||||
|     <Content Remove="Logs\**" /> | ||||
| @ -37,6 +21,7 @@ | ||||
|     <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.Application\KonSoft.Admin.Application.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.EntityFrameworkCore\KonSoft.Admin.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\admin\src\KonSoft.Admin.HttpApi\KonSoft.Admin.HttpApi.csproj" /> | ||||
|     <ProjectReference Include="..\..\shared\KonSoft.Shared.Hosting.Microservices\KonSoft.Shared.Hosting.Microservices.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
							
								
								
									
										1027
									
								
								microservices/KonSoft.Admin.HttpApi.Host/Logs/logs.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1027
									
								
								microservices/KonSoft.Admin.HttpApi.Host/Logs/logs.txt
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -1,56 +1,28 @@ | ||||
| using System; | ||||
| using System.Threading.Tasks; | ||||
| using KonSoft.Admin; | ||||
| using KonSoft.Shared.Hosting.AspNetCore; | ||||
| using Microsoft.AspNetCore.Builder; | ||||
| using Microsoft.Extensions.DependencyInjection; | ||||
| using Microsoft.Extensions.Hosting; | ||||
| using Serilog; | ||||
| using Serilog.Events; | ||||
|  | ||||
| namespace KonSoft.Admin; | ||||
| var assemblyName = typeof(Program).Assembly.GetName().Name!; | ||||
|  | ||||
| public class Program | ||||
| SerilogConfigurationHelper.Configure(assemblyName); | ||||
| try | ||||
| { | ||||
|     public async static Task<int> Main(string[] args) | ||||
|     { | ||||
|         Log.Logger = new LoggerConfiguration() | ||||
| #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(); | ||||
|     Log.Information($"Starting {assemblyName}."); | ||||
|     var app = await ApplicationBuilderHelper | ||||
|         .BuildApplicationAsync<AdminHttpApiHostModule>(args); | ||||
|     await app.InitializeApplicationAsync(); | ||||
|     await app.RunAsync(); | ||||
|  | ||||
|         try | ||||
|         { | ||||
|             Log.Information("Starting KonSoft.Admin.HttpApi.Host."); | ||||
|             var builder = WebApplication.CreateBuilder(args); | ||||
|             builder.Host.AddAppSettingsSecretsJson() | ||||
|                 .UseAutofac() | ||||
|                 .UseSerilog(); | ||||
|             await builder.AddApplicationAsync<AdminHttpApiHostModule>(); | ||||
|             var app = builder.Build(); | ||||
|             await app.InitializeApplicationAsync(); | ||||
|             await app.RunAsync(); | ||||
|             return 0; | ||||
|         } | ||||
|         catch (Exception ex) | ||||
|         { | ||||
|             if (ex is HostAbortedException) | ||||
|             { | ||||
|                 throw; | ||||
|             } | ||||
|  | ||||
|             Log.Fatal(ex, "Host terminated unexpectedly!"); | ||||
|             return 1; | ||||
|         } | ||||
|         finally | ||||
|         { | ||||
|             Log.CloseAndFlush(); | ||||
|         } | ||||
|     } | ||||
|     return 0; | ||||
| } | ||||
| catch (Exception ex) | ||||
| { | ||||
|     Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); | ||||
|     return 1; | ||||
| } | ||||
| finally | ||||
| { | ||||
|     await Log.CloseAndFlushAsync(); | ||||
| } | ||||
| @ -1,38 +1,13 @@ | ||||
| { | ||||
|   "$schema": "http://json.schemastore.org/launchsettings.json", | ||||
|   "profiles": { | ||||
|     "IIS Express": { | ||||
|       "commandName": "IISExpress", | ||||
|       "launchBrowser": true, | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     }, | ||||
|     "KonSoft.Admin.HttpApi.Host": { | ||||
|     "http": { | ||||
|       "commandName": "Project", | ||||
|       "launchBrowser": true, | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       }, | ||||
|       "applicationUrl": "https://localhost:44354" | ||||
|     }, | ||||
|     "Container (Dockerfile)": { | ||||
|       "commandName": "Docker", | ||||
|       "launchBrowser": true, | ||||
|       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}", | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_HTTPS_PORTS": "8081", | ||||
|         "ASPNETCORE_HTTP_PORTS": "8080" | ||||
|       }, | ||||
|       "publishAllPorts": true, | ||||
|       "useSSL": true | ||||
|     } | ||||
|   }, | ||||
|   "iisSettings": { | ||||
|     "windowsAuthentication": false, | ||||
|     "anonymousAuthentication": true, | ||||
|     "iisExpress": { | ||||
|       "applicationUrl": "https://localhost:44354", | ||||
|       "sslPort": 44354 | ||||
|     } | ||||
|   } | ||||
| } | ||||
| @ -1,12 +1,12 @@ | ||||
| { | ||||
|   "App": { | ||||
|     "CorsOrigins": "https://*.Admin.com,https://localhost:44357" | ||||
|     "CorsOrigins": "https://*.KonSoft.top" | ||||
|   }, | ||||
|   "ConnectionStrings": { | ||||
|     "Default": "Host=localhost;Port=5432;Database=Admin;User ID=root;Password=myPassword;" | ||||
|     "Default": "Host=1.94.99.47;Port=26666;Database=Clean;User ID=postgres;Password=zzx7845zzx;" | ||||
|   }, | ||||
|   "Redis": { | ||||
|     "Configuration": "127.0.0.1" | ||||
|     "Configuration": "1.94.99.47:26668" | ||||
|   }, | ||||
|   "AuthServer": { | ||||
|     "Authority": "https://localhost:44397", | ||||
| @ -15,5 +15,15 @@ | ||||
|   }, | ||||
|   "StringEncryption": { | ||||
|     "DefaultPassPhrase": "g3NdNOyDR9oYj0gK" | ||||
|   }, | ||||
|   "RabbitMQ": { | ||||
|     "Connections": { | ||||
|       "Default": { | ||||
|         "HostName": "1.94.99.47", | ||||
|         "Port": 26667, | ||||
|         "UserName": "admin", | ||||
|         "Password": "zzx7845zzx" | ||||
|       } | ||||
|     } | ||||
|   } | ||||
| } | ||||
|  | ||||
| @ -1,18 +1,20 @@ | ||||
| <?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" /> | ||||
|     </system.webServer> | ||||
|   </location> | ||||
|   <system.webServer> | ||||
|     <httpProtocol> | ||||
|       <customHeaders> | ||||
|         <remove name="x-powered-by" /> | ||||
|       </customHeaders> | ||||
|     </httpProtocol> | ||||
|   </system.webServer> | ||||
| </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" /> | ||||
| 		</system.webServer> | ||||
| 	</location> | ||||
| 	<system.webServer> | ||||
| 		<httpProtocol> | ||||
| 			<customHeaders> | ||||
| 				<remove name="x-powered-by" /> | ||||
| 			</customHeaders> | ||||
| 		</httpProtocol> | ||||
| 	</system.webServer> | ||||
| </configuration> | ||||
| @ -9,4 +9,4 @@ public class HomeController : AbpController | ||||
|     { | ||||
|         return Redirect("~/swagger"); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,179 +1,37 @@ | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
| using System.IO; | ||||
| using System.Linq; | ||||
| using Medallion.Threading; | ||||
| using Medallion.Threading.Redis; | ||||
| using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||
| using KonSoft.Dispatch.EntityFrameworkCore; | ||||
| using KonSoft.Shared.Hosting.AspNetCore; | ||||
| using KonSoft.Shared.Hosting.Microservices; | ||||
| using Microsoft.AspNetCore.Builder; | ||||
| using Microsoft.AspNetCore.Cors; | ||||
| using Microsoft.AspNetCore.DataProtection; | ||||
| using Microsoft.AspNetCore.Hosting; | ||||
| using Microsoft.Extensions.Configuration; | ||||
| using Microsoft.Extensions.DependencyInjection; | ||||
| using Microsoft.Extensions.Hosting; | ||||
| using KonSoft.Dispatch.EntityFrameworkCore; | ||||
| using KonSoft.Dispatch.MultiTenancy; | ||||
| using StackExchange.Redis; | ||||
| using Microsoft.OpenApi.Models; | ||||
| using Volo.Abp; | ||||
| using Volo.Abp.AspNetCore.Authentication.JwtBearer; | ||||
| using Volo.Abp.AspNetCore.Mvc; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; | ||||
| using Volo.Abp.AspNetCore.Serilog; | ||||
| using Volo.Abp.Autofac; | ||||
| using Volo.Abp.Caching; | ||||
| using Volo.Abp.Caching.StackExchangeRedis; | ||||
| using Volo.Abp.DistributedLocking; | ||||
| using Volo.Abp.Identity; | ||||
| using Volo.Abp.Localization; | ||||
| using Volo.Abp.BackgroundJobs; | ||||
| using Volo.Abp.Modularity; | ||||
| using Volo.Abp.Security.Claims; | ||||
| using Volo.Abp.Swashbuckle; | ||||
| using Volo.Abp.VirtualFileSystem; | ||||
|  | ||||
| namespace KonSoft.Dispatch; | ||||
|  | ||||
| [DependsOn( | ||||
|     typeof(DispatchHttpApiModule), | ||||
|     typeof(AbpAutofacModule), | ||||
|     typeof(AbpCachingStackExchangeRedisModule), | ||||
|     typeof(AbpDistributedLockingModule), | ||||
|     typeof(AbpAspNetCoreMvcUiMultiTenancyModule), | ||||
|     typeof(AbpAspNetCoreAuthenticationJwtBearerModule), | ||||
|     typeof(DispatchApplicationModule), | ||||
|     typeof(DispatchEntityFrameworkCoreModule), | ||||
|     typeof(AbpAspNetCoreSerilogModule), | ||||
|     typeof(AbpSwashbuckleModule) | ||||
|     typeof(KonSoftSharedHostingMicroservicesModule) | ||||
| )] | ||||
| public class DispatchHttpApiHostModule : AbpModule | ||||
| { | ||||
|     public override void ConfigureServices(ServiceConfigurationContext context) | ||||
|     { | ||||
|         var configuration = context.Services.GetConfiguration(); | ||||
|         var hostingEnvironment = context.Services.GetHostingEnvironment(); | ||||
|  | ||||
|         ConfigureConventionalControllers(); | ||||
|         ConfigureAuthentication(context, configuration); | ||||
|         ConfigureCache(configuration); | ||||
|         ConfigureVirtualFileSystem(context); | ||||
|         ConfigureDataProtection(context, configuration, hostingEnvironment); | ||||
|         ConfigureDistributedLocking(context, configuration); | ||||
|         ConfigureCors(context, configuration); | ||||
|         ConfigureSwaggerServices(context, configuration); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureCache(IConfiguration configuration) | ||||
|     { | ||||
|         Configure<AbpDistributedCacheOptions>(options => { options.KeyPrefix = "Dispatch:"; }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureVirtualFileSystem(ServiceConfigurationContext context) | ||||
|     { | ||||
|         var hostingEnvironment = context.Services.GetHostingEnvironment(); | ||||
|  | ||||
|         if (hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             Configure<AbpVirtualFileSystemOptions>(options => | ||||
|             { | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<DispatchDomainSharedModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Dispatch.Domain.Shared")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<DispatchDomainModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Dispatch.Domain")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<DispatchApplicationContractsModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Dispatch.Application.Contracts")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<DispatchApplicationModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Dispatch.Application")); | ||||
|             }); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private void ConfigureConventionalControllers() | ||||
|     { | ||||
|         Configure<AbpAspNetCoreMvcOptions>(options => | ||||
|         { | ||||
|             options.ConventionalControllers.Create(typeof(DispatchApplicationModule).Assembly); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) | ||||
|             .AddAbpJwtBearer(options => | ||||
|             { | ||||
|                 options.Authority = configuration["AuthServer:Authority"]; | ||||
|                 options.RequireHttpsMetadata = configuration.GetValue<bool>("AuthServer:RequireHttpsMetadata"); | ||||
|                 options.Audience = "Dispatch"; | ||||
|             }); | ||||
|  | ||||
|         context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options => | ||||
|         { | ||||
|             options.IsDynamicClaimsEnabled = true; | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddAbpSwaggerGenWithOAuth( | ||||
|         SwaggerConfigurationHelper.ConfigureWithOidc( | ||||
|             context, | ||||
|             configuration["AuthServer:Authority"]!, | ||||
|             new Dictionary<string, string> | ||||
|             { | ||||
|                     {"Dispatch", "Dispatch API"} | ||||
|             }, | ||||
|             options => | ||||
|             { | ||||
|                 options.SwaggerDoc("v1", new OpenApiInfo { Title = "Dispatch API", Version = "v1" }); | ||||
|                 options.DocInclusionPredicate((docName, description) => true); | ||||
|                 options.CustomSchemaIds(type => type.FullName); | ||||
|             }); | ||||
|     } | ||||
|             ["DispatchService"], | ||||
|             discoveryEndpoint: configuration["AuthServer:MetadataAddress"], | ||||
|             apiTitle: "Dispatch Service API" | ||||
|         ); | ||||
|  | ||||
|     private void ConfigureDataProtection( | ||||
|         ServiceConfigurationContext context, | ||||
|         IConfiguration configuration, | ||||
|         IWebHostEnvironment hostingEnvironment) | ||||
|     { | ||||
|         var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Dispatch"); | ||||
|         if (!hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Dispatch-Protection-Keys"); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private void ConfigureDistributedLocking( | ||||
|         ServiceConfigurationContext context, | ||||
|         IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddSingleton<IDistributedLockProvider>(sp => | ||||
|         { | ||||
|             var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddCors(options => | ||||
|         { | ||||
|             options.AddDefaultPolicy(builder => | ||||
|             { | ||||
|                 builder | ||||
|                     .WithOrigins(configuration["App:CorsOrigins"]? | ||||
|                         .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                         .Select(o => o.RemovePostFix("/")) | ||||
|                         .ToArray() ?? []) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|                     .AllowAnyHeader() | ||||
|                     .AllowAnyMethod() | ||||
|                     .AllowCredentials(); | ||||
|             }); | ||||
|         }); | ||||
|         // ֻ<><D6BB><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD> | ||||
|         Configure<AbpBackgroundJobOptions>(options => options.IsJobExecutionEnabled = false); | ||||
|     } | ||||
|  | ||||
|     public override void OnApplicationInitialization(ApplicationInitializationContext context) | ||||
| @ -193,7 +51,7 @@ public class DispatchHttpApiHostModule : AbpModule | ||||
|         app.UseCors(); | ||||
|         app.UseAuthentication(); | ||||
|  | ||||
|         if (MultiTenancyConsts.IsEnabled) | ||||
|         if (KonSoftConsts.MultiTenancyEnabled) | ||||
|         { | ||||
|             app.UseMultiTenancy(); | ||||
|         } | ||||
| @ -216,4 +74,4 @@ public class DispatchHttpApiHostModule : AbpModule | ||||
|         app.UseAbpSerilogEnrichers(); | ||||
|         app.UseConfiguredEndpoints(); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,4 +1,4 @@ | ||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
|  | ||||
|   <PropertyGroup> | ||||
|     <TargetFramework>net8.0</TargetFramework> | ||||
| @ -8,21 +8,6 @@ | ||||
|     <UserSecretsId>KonSoft.Dispatch-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId> | ||||
|   </PropertyGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" /> | ||||
|     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" /> | ||||
|     <PackageReference Include="DistributedLock.Redis" Version="1.0.2" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Autofac" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.DistributedLocking" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Swashbuckle" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <Compile Remove="Logs\**" /> | ||||
|     <Content Remove="Logs\**" /> | ||||
| @ -34,6 +19,7 @@ | ||||
|     <ProjectReference Include="..\..\modules\dispatch\src\KonSoft.Dispatch.Application\KonSoft.Dispatch.Application.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\dispatch\src\KonSoft.Dispatch.EntityFrameworkCore\KonSoft.Dispatch.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\dispatch\src\KonSoft.Dispatch.HttpApi\KonSoft.Dispatch.HttpApi.csproj" /> | ||||
|     <ProjectReference Include="..\..\shared\KonSoft.Shared.Hosting.Microservices\KonSoft.Shared.Hosting.Microservices.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -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 | ||||
| @ -53,4 +53,4 @@ public class Program | ||||
|             Log.CloseAndFlush(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,27 +1,13 @@ | ||||
| { | ||||
|   "iisSettings": { | ||||
|     "windowsAuthentication": false,  | ||||
|     "anonymousAuthentication": true, | ||||
|     "iisExpress": { | ||||
|       "applicationUrl": "https://localhost:44331", | ||||
|       "sslPort": 44331 | ||||
|     } | ||||
|   }, | ||||
|   "$schema": "http://json.schemastore.org/launchsettings.json", | ||||
|   "profiles": { | ||||
|     "IIS Express": { | ||||
|       "commandName": "IISExpress", | ||||
|       "launchBrowser": true, | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     }, | ||||
|     "KonSoft.Dispatch.HttpApi.Host": { | ||||
|     "http": { | ||||
|       "commandName": "Project", | ||||
|       "launchBrowser": true, | ||||
|       "applicationUrl": "https://localhost:44331", | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|       }, | ||||
|       "applicationUrl": "https://localhost:44331" | ||||
|     } | ||||
|   } | ||||
| } | ||||
| @ -1,18 +1,20 @@ | ||||
| <?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" /> | ||||
|     </system.webServer> | ||||
|   </location> | ||||
|   <system.webServer> | ||||
|     <httpProtocol> | ||||
|       <customHeaders> | ||||
|         <remove name="x-powered-by" /> | ||||
|       </customHeaders> | ||||
|     </httpProtocol> | ||||
|   </system.webServer> | ||||
| </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" /> | ||||
| 		</system.webServer> | ||||
| 	</location> | ||||
| 	<system.webServer> | ||||
| 		<httpProtocol> | ||||
| 			<customHeaders> | ||||
| 				<remove name="x-powered-by" /> | ||||
| 			</customHeaders> | ||||
| 		</httpProtocol> | ||||
| 	</system.webServer> | ||||
| </configuration> | ||||
| @ -9,4 +9,4 @@ public class HomeController : AbpController | ||||
|     { | ||||
|         return Redirect("~/swagger"); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -8,21 +8,6 @@ | ||||
|     <UserSecretsId>KonSoft.Payment-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId> | ||||
|   </PropertyGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" /> | ||||
|     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" /> | ||||
|     <PackageReference Include="DistributedLock.Redis" Version="1.0.2" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Autofac" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.DistributedLocking" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Swashbuckle" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <Compile Remove="Logs\**" /> | ||||
|     <Content Remove="Logs\**" /> | ||||
| @ -34,6 +19,7 @@ | ||||
|     <ProjectReference Include="..\..\modules\payment\src\KonSoft.Payment.Application\KonSoft.Payment.Application.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\payment\src\KonSoft.Payment.EntityFrameworkCore\KonSoft.Payment.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\payment\src\KonSoft.Payment.HttpApi\KonSoft.Payment.HttpApi.csproj" /> | ||||
|     <ProjectReference Include="..\..\shared\KonSoft.Shared.Hosting.Microservices\KonSoft.Shared.Hosting.Microservices.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -1,179 +1,37 @@ | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
| using System.IO; | ||||
| using System.Linq; | ||||
| using Medallion.Threading; | ||||
| using Medallion.Threading.Redis; | ||||
| using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||
| using KonSoft.Payment.EntityFrameworkCore; | ||||
| using KonSoft.Shared.Hosting.AspNetCore; | ||||
| using KonSoft.Shared.Hosting.Microservices; | ||||
| using Microsoft.AspNetCore.Builder; | ||||
| using Microsoft.AspNetCore.Cors; | ||||
| using Microsoft.AspNetCore.DataProtection; | ||||
| using Microsoft.AspNetCore.Hosting; | ||||
| using Microsoft.Extensions.Configuration; | ||||
| using Microsoft.Extensions.DependencyInjection; | ||||
| using Microsoft.Extensions.Hosting; | ||||
| using KonSoft.Payment.EntityFrameworkCore; | ||||
| using KonSoft.Payment.MultiTenancy; | ||||
| using StackExchange.Redis; | ||||
| using Microsoft.OpenApi.Models; | ||||
| using Volo.Abp; | ||||
| using Volo.Abp.AspNetCore.Authentication.JwtBearer; | ||||
| using Volo.Abp.AspNetCore.Mvc; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; | ||||
| using Volo.Abp.AspNetCore.Serilog; | ||||
| using Volo.Abp.Autofac; | ||||
| using Volo.Abp.Caching; | ||||
| using Volo.Abp.Caching.StackExchangeRedis; | ||||
| using Volo.Abp.DistributedLocking; | ||||
| using Volo.Abp.Identity; | ||||
| using Volo.Abp.Localization; | ||||
| using Volo.Abp.BackgroundJobs; | ||||
| using Volo.Abp.Modularity; | ||||
| using Volo.Abp.Security.Claims; | ||||
| using Volo.Abp.Swashbuckle; | ||||
| using Volo.Abp.VirtualFileSystem; | ||||
|  | ||||
| namespace KonSoft.Payment; | ||||
|  | ||||
| [DependsOn( | ||||
|     typeof(PaymentHttpApiModule), | ||||
|     typeof(AbpAutofacModule), | ||||
|     typeof(AbpCachingStackExchangeRedisModule), | ||||
|     typeof(AbpDistributedLockingModule), | ||||
|     typeof(AbpAspNetCoreMvcUiMultiTenancyModule), | ||||
|     typeof(AbpAspNetCoreAuthenticationJwtBearerModule), | ||||
|     typeof(PaymentApplicationModule), | ||||
|     typeof(PaymentEntityFrameworkCoreModule), | ||||
|     typeof(AbpAspNetCoreSerilogModule), | ||||
|     typeof(AbpSwashbuckleModule) | ||||
|     typeof(KonSoftSharedHostingMicroservicesModule) | ||||
| )] | ||||
| public class PaymentHttpApiHostModule : AbpModule | ||||
| { | ||||
|     public override void ConfigureServices(ServiceConfigurationContext context) | ||||
|     { | ||||
|         var configuration = context.Services.GetConfiguration(); | ||||
|         var hostingEnvironment = context.Services.GetHostingEnvironment(); | ||||
|  | ||||
|         ConfigureConventionalControllers(); | ||||
|         ConfigureAuthentication(context, configuration); | ||||
|         ConfigureCache(configuration); | ||||
|         ConfigureVirtualFileSystem(context); | ||||
|         ConfigureDataProtection(context, configuration, hostingEnvironment); | ||||
|         ConfigureDistributedLocking(context, configuration); | ||||
|         ConfigureCors(context, configuration); | ||||
|         ConfigureSwaggerServices(context, configuration); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureCache(IConfiguration configuration) | ||||
|     { | ||||
|         Configure<AbpDistributedCacheOptions>(options => { options.KeyPrefix = "Payment:"; }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureVirtualFileSystem(ServiceConfigurationContext context) | ||||
|     { | ||||
|         var hostingEnvironment = context.Services.GetHostingEnvironment(); | ||||
|  | ||||
|         if (hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             Configure<AbpVirtualFileSystemOptions>(options => | ||||
|             { | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<PaymentDomainSharedModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Payment.Domain.Shared")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<PaymentDomainModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Payment.Domain")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<PaymentApplicationContractsModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Payment.Application.Contracts")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<PaymentApplicationModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Payment.Application")); | ||||
|             }); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private void ConfigureConventionalControllers() | ||||
|     { | ||||
|         Configure<AbpAspNetCoreMvcOptions>(options => | ||||
|         { | ||||
|             options.ConventionalControllers.Create(typeof(PaymentApplicationModule).Assembly); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) | ||||
|             .AddAbpJwtBearer(options => | ||||
|             { | ||||
|                 options.Authority = configuration["AuthServer:Authority"]; | ||||
|                 options.RequireHttpsMetadata = configuration.GetValue<bool>("AuthServer:RequireHttpsMetadata"); | ||||
|                 options.Audience = "Payment"; | ||||
|             }); | ||||
|  | ||||
|         context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options => | ||||
|         { | ||||
|             options.IsDynamicClaimsEnabled = true; | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddAbpSwaggerGenWithOAuth( | ||||
|         SwaggerConfigurationHelper.ConfigureWithOidc( | ||||
|             context, | ||||
|             configuration["AuthServer:Authority"]!, | ||||
|             new Dictionary<string, string> | ||||
|             { | ||||
|                     {"Payment", "Payment API"} | ||||
|             }, | ||||
|             options => | ||||
|             { | ||||
|                 options.SwaggerDoc("v1", new OpenApiInfo { Title = "Payment API", Version = "v1" }); | ||||
|                 options.DocInclusionPredicate((docName, description) => true); | ||||
|                 options.CustomSchemaIds(type => type.FullName); | ||||
|             }); | ||||
|     } | ||||
|             ["PaymentService"], | ||||
|             discoveryEndpoint: configuration["AuthServer:MetadataAddress"], | ||||
|             apiTitle: "Payment Service API" | ||||
|         ); | ||||
|  | ||||
|     private void ConfigureDataProtection( | ||||
|         ServiceConfigurationContext context, | ||||
|         IConfiguration configuration, | ||||
|         IWebHostEnvironment hostingEnvironment) | ||||
|     { | ||||
|         var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Payment"); | ||||
|         if (!hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Payment-Protection-Keys"); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private void ConfigureDistributedLocking( | ||||
|         ServiceConfigurationContext context, | ||||
|         IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddSingleton<IDistributedLockProvider>(sp => | ||||
|         { | ||||
|             var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddCors(options => | ||||
|         { | ||||
|             options.AddDefaultPolicy(builder => | ||||
|             { | ||||
|                 builder | ||||
|                     .WithOrigins(configuration["App:CorsOrigins"]? | ||||
|                         .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                         .Select(o => o.RemovePostFix("/")) | ||||
|                         .ToArray() ?? []) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|                     .AllowAnyHeader() | ||||
|                     .AllowAnyMethod() | ||||
|                     .AllowCredentials(); | ||||
|             }); | ||||
|         }); | ||||
|         // ֻ<><D6BB><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD> | ||||
|         Configure<AbpBackgroundJobOptions>(options => options.IsJobExecutionEnabled = false); | ||||
|     } | ||||
|  | ||||
|     public override void OnApplicationInitialization(ApplicationInitializationContext context) | ||||
| @ -193,7 +51,7 @@ public class PaymentHttpApiHostModule : AbpModule | ||||
|         app.UseCors(); | ||||
|         app.UseAuthentication(); | ||||
|  | ||||
|         if (MultiTenancyConsts.IsEnabled) | ||||
|         if (KonSoftConsts.MultiTenancyEnabled) | ||||
|         { | ||||
|             app.UseMultiTenancy(); | ||||
|         } | ||||
| @ -216,4 +74,4 @@ public class PaymentHttpApiHostModule : AbpModule | ||||
|         app.UseAbpSerilogEnrichers(); | ||||
|         app.UseConfiguredEndpoints(); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -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 | ||||
| @ -53,4 +53,4 @@ public class Program | ||||
|             Log.CloseAndFlush(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,27 +1,13 @@ | ||||
| { | ||||
|   "iisSettings": { | ||||
|     "windowsAuthentication": false,  | ||||
|     "anonymousAuthentication": true, | ||||
|     "iisExpress": { | ||||
|       "applicationUrl": "https://localhost:44326", | ||||
|       "sslPort": 44326 | ||||
|     } | ||||
|   }, | ||||
|   "$schema": "http://json.schemastore.org/launchsettings.json", | ||||
|   "profiles": { | ||||
|     "IIS Express": { | ||||
|       "commandName": "IISExpress", | ||||
|       "launchBrowser": true, | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     }, | ||||
|     "KonSoft.Payment.HttpApi.Host": { | ||||
|     "http": { | ||||
|       "commandName": "Project", | ||||
|       "launchBrowser": true, | ||||
|       "applicationUrl": "https://localhost:44326", | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|       }, | ||||
|       "applicationUrl": "https://localhost:44326" | ||||
|     } | ||||
|   } | ||||
| } | ||||
| @ -1,18 +1,20 @@ | ||||
| <?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" /> | ||||
|     </system.webServer> | ||||
|   </location> | ||||
|   <system.webServer> | ||||
|     <httpProtocol> | ||||
|       <customHeaders> | ||||
|         <remove name="x-powered-by" /> | ||||
|       </customHeaders> | ||||
|     </httpProtocol> | ||||
|   </system.webServer> | ||||
| </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" /> | ||||
| 		</system.webServer> | ||||
| 	</location> | ||||
| 	<system.webServer> | ||||
| 		<httpProtocol> | ||||
| 			<customHeaders> | ||||
| 				<remove name="x-powered-by" /> | ||||
| 			</customHeaders> | ||||
| 		</httpProtocol> | ||||
| 	</system.webServer> | ||||
| </configuration> | ||||
| @ -9,4 +9,4 @@ public class HomeController : AbpController | ||||
|     { | ||||
|         return Redirect("~/swagger"); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -8,21 +8,6 @@ | ||||
|     <UserSecretsId>KonSoft.Report-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId> | ||||
|   </PropertyGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" /> | ||||
|     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" /> | ||||
|     <PackageReference Include="DistributedLock.Redis" Version="1.0.2" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Autofac" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.DistributedLocking" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Swashbuckle" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <Compile Remove="Logs\**" /> | ||||
|     <Content Remove="Logs\**" /> | ||||
| @ -34,6 +19,7 @@ | ||||
|     <ProjectReference Include="..\..\modules\report\src\KonSoft.Report.Application\KonSoft.Report.Application.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\report\src\KonSoft.Report.EntityFrameworkCore\KonSoft.Report.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\report\src\KonSoft.Report.HttpApi\KonSoft.Report.HttpApi.csproj" /> | ||||
|     <ProjectReference Include="..\..\shared\KonSoft.Shared.Hosting.Microservices\KonSoft.Shared.Hosting.Microservices.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -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 | ||||
| @ -53,4 +53,4 @@ public class Program | ||||
|             Log.CloseAndFlush(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,27 +1,13 @@ | ||||
| { | ||||
|   "iisSettings": { | ||||
|     "windowsAuthentication": false,  | ||||
|     "anonymousAuthentication": true, | ||||
|     "iisExpress": { | ||||
|       "applicationUrl": "https://localhost:44320", | ||||
|       "sslPort": 44320 | ||||
|     } | ||||
|   }, | ||||
|   "$schema": "http://json.schemastore.org/launchsettings.json", | ||||
|   "profiles": { | ||||
|     "IIS Express": { | ||||
|       "commandName": "IISExpress", | ||||
|       "launchBrowser": true, | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     }, | ||||
|     "KonSoft.Report.HttpApi.Host": { | ||||
|     "http": { | ||||
|       "commandName": "Project", | ||||
|       "launchBrowser": true, | ||||
|       "applicationUrl": "https://localhost:44320", | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|       }, | ||||
|       "applicationUrl": "https://localhost:44320" | ||||
|     } | ||||
|   } | ||||
| } | ||||
| @ -1,179 +1,37 @@ | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
| using System.IO; | ||||
| using System.Linq; | ||||
| using Medallion.Threading; | ||||
| using Medallion.Threading.Redis; | ||||
| using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||
| using KonSoft.Report.EntityFrameworkCore; | ||||
| using KonSoft.Shared.Hosting.AspNetCore; | ||||
| using KonSoft.Shared.Hosting.Microservices; | ||||
| using Microsoft.AspNetCore.Builder; | ||||
| using Microsoft.AspNetCore.Cors; | ||||
| using Microsoft.AspNetCore.DataProtection; | ||||
| using Microsoft.AspNetCore.Hosting; | ||||
| using Microsoft.Extensions.Configuration; | ||||
| using Microsoft.Extensions.DependencyInjection; | ||||
| using Microsoft.Extensions.Hosting; | ||||
| using KonSoft.Report.EntityFrameworkCore; | ||||
| using KonSoft.Report.MultiTenancy; | ||||
| using StackExchange.Redis; | ||||
| using Microsoft.OpenApi.Models; | ||||
| using Volo.Abp; | ||||
| using Volo.Abp.AspNetCore.Authentication.JwtBearer; | ||||
| using Volo.Abp.AspNetCore.Mvc; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; | ||||
| using Volo.Abp.AspNetCore.Serilog; | ||||
| using Volo.Abp.Autofac; | ||||
| using Volo.Abp.Caching; | ||||
| using Volo.Abp.Caching.StackExchangeRedis; | ||||
| using Volo.Abp.DistributedLocking; | ||||
| using Volo.Abp.Identity; | ||||
| using Volo.Abp.Localization; | ||||
| using Volo.Abp.BackgroundJobs; | ||||
| using Volo.Abp.Modularity; | ||||
| using Volo.Abp.Security.Claims; | ||||
| using Volo.Abp.Swashbuckle; | ||||
| using Volo.Abp.VirtualFileSystem; | ||||
|  | ||||
| namespace KonSoft.Report; | ||||
|  | ||||
| [DependsOn( | ||||
|     typeof(ReportHttpApiModule), | ||||
|     typeof(AbpAutofacModule), | ||||
|     typeof(AbpCachingStackExchangeRedisModule), | ||||
|     typeof(AbpDistributedLockingModule), | ||||
|     typeof(AbpAspNetCoreMvcUiMultiTenancyModule), | ||||
|     typeof(AbpAspNetCoreAuthenticationJwtBearerModule), | ||||
|     typeof(ReportApplicationModule), | ||||
|     typeof(ReportEntityFrameworkCoreModule), | ||||
|     typeof(AbpAspNetCoreSerilogModule), | ||||
|     typeof(AbpSwashbuckleModule) | ||||
|     typeof(KonSoftSharedHostingMicroservicesModule) | ||||
| )] | ||||
| public class ReportHttpApiHostModule : AbpModule | ||||
| { | ||||
|     public override void ConfigureServices(ServiceConfigurationContext context) | ||||
|     { | ||||
|         var configuration = context.Services.GetConfiguration(); | ||||
|         var hostingEnvironment = context.Services.GetHostingEnvironment(); | ||||
|  | ||||
|         ConfigureConventionalControllers(); | ||||
|         ConfigureAuthentication(context, configuration); | ||||
|         ConfigureCache(configuration); | ||||
|         ConfigureVirtualFileSystem(context); | ||||
|         ConfigureDataProtection(context, configuration, hostingEnvironment); | ||||
|         ConfigureDistributedLocking(context, configuration); | ||||
|         ConfigureCors(context, configuration); | ||||
|         ConfigureSwaggerServices(context, configuration); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureCache(IConfiguration configuration) | ||||
|     { | ||||
|         Configure<AbpDistributedCacheOptions>(options => { options.KeyPrefix = "Report:"; }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureVirtualFileSystem(ServiceConfigurationContext context) | ||||
|     { | ||||
|         var hostingEnvironment = context.Services.GetHostingEnvironment(); | ||||
|  | ||||
|         if (hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             Configure<AbpVirtualFileSystemOptions>(options => | ||||
|             { | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<ReportDomainSharedModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Report.Domain.Shared")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<ReportDomainModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Report.Domain")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<ReportApplicationContractsModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Report.Application.Contracts")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<ReportApplicationModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.Report.Application")); | ||||
|             }); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private void ConfigureConventionalControllers() | ||||
|     { | ||||
|         Configure<AbpAspNetCoreMvcOptions>(options => | ||||
|         { | ||||
|             options.ConventionalControllers.Create(typeof(ReportApplicationModule).Assembly); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) | ||||
|             .AddAbpJwtBearer(options => | ||||
|             { | ||||
|                 options.Authority = configuration["AuthServer:Authority"]; | ||||
|                 options.RequireHttpsMetadata = configuration.GetValue<bool>("AuthServer:RequireHttpsMetadata"); | ||||
|                 options.Audience = "Report"; | ||||
|             }); | ||||
|  | ||||
|         context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options => | ||||
|         { | ||||
|             options.IsDynamicClaimsEnabled = true; | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddAbpSwaggerGenWithOAuth( | ||||
|         SwaggerConfigurationHelper.ConfigureWithOidc( | ||||
|             context, | ||||
|             configuration["AuthServer:Authority"]!, | ||||
|             new Dictionary<string, string> | ||||
|             { | ||||
|                     {"Report", "Report API"} | ||||
|             }, | ||||
|             options => | ||||
|             { | ||||
|                 options.SwaggerDoc("v1", new OpenApiInfo { Title = "Report API", Version = "v1" }); | ||||
|                 options.DocInclusionPredicate((docName, description) => true); | ||||
|                 options.CustomSchemaIds(type => type.FullName); | ||||
|             }); | ||||
|     } | ||||
|             ["ReportService"], | ||||
|             discoveryEndpoint: configuration["AuthServer:MetadataAddress"], | ||||
|             apiTitle: "Report Service API" | ||||
|         ); | ||||
|  | ||||
|     private void ConfigureDataProtection( | ||||
|         ServiceConfigurationContext context, | ||||
|         IConfiguration configuration, | ||||
|         IWebHostEnvironment hostingEnvironment) | ||||
|     { | ||||
|         var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Report"); | ||||
|         if (!hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Report-Protection-Keys"); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private void ConfigureDistributedLocking( | ||||
|         ServiceConfigurationContext context, | ||||
|         IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddSingleton<IDistributedLockProvider>(sp => | ||||
|         { | ||||
|             var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddCors(options => | ||||
|         { | ||||
|             options.AddDefaultPolicy(builder => | ||||
|             { | ||||
|                 builder | ||||
|                     .WithOrigins(configuration["App:CorsOrigins"]? | ||||
|                         .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                         .Select(o => o.RemovePostFix("/")) | ||||
|                         .ToArray() ?? []) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|                     .AllowAnyHeader() | ||||
|                     .AllowAnyMethod() | ||||
|                     .AllowCredentials(); | ||||
|             }); | ||||
|         }); | ||||
|         // ֻ<><D6BB><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD> | ||||
|         Configure<AbpBackgroundJobOptions>(options => options.IsJobExecutionEnabled = false); | ||||
|     } | ||||
|  | ||||
|     public override void OnApplicationInitialization(ApplicationInitializationContext context) | ||||
| @ -193,7 +51,7 @@ public class ReportHttpApiHostModule : AbpModule | ||||
|         app.UseCors(); | ||||
|         app.UseAuthentication(); | ||||
|  | ||||
|         if (MultiTenancyConsts.IsEnabled) | ||||
|         if (KonSoftConsts.MultiTenancyEnabled) | ||||
|         { | ||||
|             app.UseMultiTenancy(); | ||||
|         } | ||||
| @ -216,4 +74,4 @@ public class ReportHttpApiHostModule : AbpModule | ||||
|         app.UseAbpSerilogEnrichers(); | ||||
|         app.UseConfiguredEndpoints(); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,18 +1,20 @@ | ||||
| <?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" /> | ||||
|     </system.webServer> | ||||
|   </location> | ||||
|   <system.webServer> | ||||
|     <httpProtocol> | ||||
|       <customHeaders> | ||||
|         <remove name="x-powered-by" /> | ||||
|       </customHeaders> | ||||
|     </httpProtocol> | ||||
|   </system.webServer> | ||||
| </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" /> | ||||
| 		</system.webServer> | ||||
| 	</location> | ||||
| 	<system.webServer> | ||||
| 		<httpProtocol> | ||||
| 			<customHeaders> | ||||
| 				<remove name="x-powered-by" /> | ||||
| 			</customHeaders> | ||||
| 		</httpProtocol> | ||||
| 	</system.webServer> | ||||
| </configuration> | ||||
| @ -9,4 +9,4 @@ public class HomeController : AbpController | ||||
|     { | ||||
|         return Redirect("~/swagger"); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -8,21 +8,6 @@ | ||||
|     <UserSecretsId>KonSoft.TenantManagement-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId> | ||||
|   </PropertyGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" /> | ||||
|     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" /> | ||||
|     <PackageReference Include="DistributedLock.Redis" Version="1.0.2" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Autofac" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.DistributedLocking" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.4" /> | ||||
|     <PackageReference Include="Volo.Abp.Swashbuckle" Version="8.3.4" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <Compile Remove="Logs\**" /> | ||||
|     <Content Remove="Logs\**" /> | ||||
| @ -34,6 +19,7 @@ | ||||
|     <ProjectReference Include="..\..\modules\tenant-management\src\KonSoft.TenantManagement.Application\KonSoft.TenantManagement.Application.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\tenant-management\src\KonSoft.TenantManagement.EntityFrameworkCore\KonSoft.TenantManagement.EntityFrameworkCore.csproj" /> | ||||
|     <ProjectReference Include="..\..\modules\tenant-management\src\KonSoft.TenantManagement.HttpApi\KonSoft.TenantManagement.HttpApi.csproj" /> | ||||
|     <ProjectReference Include="..\..\shared\KonSoft.Shared.Hosting.Microservices\KonSoft.Shared.Hosting.Microservices.csproj" /> | ||||
|   </ItemGroup> | ||||
|  | ||||
| </Project> | ||||
|  | ||||
| @ -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 | ||||
| @ -53,4 +53,4 @@ public class Program | ||||
|             Log.CloseAndFlush(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,27 +1,13 @@ | ||||
| { | ||||
|   "iisSettings": { | ||||
|     "windowsAuthentication": false,  | ||||
|     "anonymousAuthentication": true, | ||||
|     "iisExpress": { | ||||
|       "applicationUrl": "https://localhost:44348", | ||||
|       "sslPort": 44348 | ||||
|     } | ||||
|   }, | ||||
|   "$schema": "http://json.schemastore.org/launchsettings.json", | ||||
|   "profiles": { | ||||
|     "IIS Express": { | ||||
|       "commandName": "IISExpress", | ||||
|       "launchBrowser": true, | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|     }, | ||||
|     "KonSoft.TenantManagement.HttpApi.Host": { | ||||
|     "http": { | ||||
|       "commandName": "Project", | ||||
|       "launchBrowser": true, | ||||
|       "applicationUrl": "https://localhost:44348", | ||||
|       "environmentVariables": { | ||||
|         "ASPNETCORE_ENVIRONMENT": "Development" | ||||
|       } | ||||
|       }, | ||||
|       "applicationUrl": "https://localhost:44348" | ||||
|     } | ||||
|   } | ||||
| } | ||||
| @ -1,179 +1,37 @@ | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
| using System.IO; | ||||
| using System.Linq; | ||||
| using Medallion.Threading; | ||||
| using Medallion.Threading.Redis; | ||||
| using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||
| using KonSoft.Shared.Hosting.AspNetCore; | ||||
| using KonSoft.Shared.Hosting.Microservices; | ||||
| using KonSoft.TenantManagement.EntityFrameworkCore; | ||||
| using Microsoft.AspNetCore.Builder; | ||||
| using Microsoft.AspNetCore.Cors; | ||||
| using Microsoft.AspNetCore.DataProtection; | ||||
| using Microsoft.AspNetCore.Hosting; | ||||
| using Microsoft.Extensions.Configuration; | ||||
| using Microsoft.Extensions.DependencyInjection; | ||||
| using Microsoft.Extensions.Hosting; | ||||
| using KonSoft.TenantManagement.EntityFrameworkCore; | ||||
| using KonSoft.TenantManagement.MultiTenancy; | ||||
| using StackExchange.Redis; | ||||
| using Microsoft.OpenApi.Models; | ||||
| using Volo.Abp; | ||||
| using Volo.Abp.AspNetCore.Authentication.JwtBearer; | ||||
| using Volo.Abp.AspNetCore.Mvc; | ||||
| using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; | ||||
| using Volo.Abp.AspNetCore.Serilog; | ||||
| using Volo.Abp.Autofac; | ||||
| using Volo.Abp.Caching; | ||||
| using Volo.Abp.Caching.StackExchangeRedis; | ||||
| using Volo.Abp.DistributedLocking; | ||||
| using Volo.Abp.Identity; | ||||
| using Volo.Abp.Localization; | ||||
| using Volo.Abp.BackgroundJobs; | ||||
| using Volo.Abp.Modularity; | ||||
| using Volo.Abp.Security.Claims; | ||||
| using Volo.Abp.Swashbuckle; | ||||
| using Volo.Abp.VirtualFileSystem; | ||||
|  | ||||
| namespace KonSoft.TenantManagement; | ||||
|  | ||||
| [DependsOn( | ||||
|     typeof(TenantManagementHttpApiModule), | ||||
|     typeof(AbpAutofacModule), | ||||
|     typeof(AbpCachingStackExchangeRedisModule), | ||||
|     typeof(AbpDistributedLockingModule), | ||||
|     typeof(AbpAspNetCoreMvcUiMultiTenancyModule), | ||||
|     typeof(AbpAspNetCoreAuthenticationJwtBearerModule), | ||||
|     typeof(TenantManagementApplicationModule), | ||||
|     typeof(TenantManagementEntityFrameworkCoreModule), | ||||
|     typeof(AbpAspNetCoreSerilogModule), | ||||
|     typeof(AbpSwashbuckleModule) | ||||
|     typeof(KonSoftSharedHostingMicroservicesModule) | ||||
| )] | ||||
| public class TenantManagementHttpApiHostModule : AbpModule | ||||
| { | ||||
|     public override void ConfigureServices(ServiceConfigurationContext context) | ||||
|     { | ||||
|         var configuration = context.Services.GetConfiguration(); | ||||
|         var hostingEnvironment = context.Services.GetHostingEnvironment(); | ||||
|  | ||||
|         ConfigureConventionalControllers(); | ||||
|         ConfigureAuthentication(context, configuration); | ||||
|         ConfigureCache(configuration); | ||||
|         ConfigureVirtualFileSystem(context); | ||||
|         ConfigureDataProtection(context, configuration, hostingEnvironment); | ||||
|         ConfigureDistributedLocking(context, configuration); | ||||
|         ConfigureCors(context, configuration); | ||||
|         ConfigureSwaggerServices(context, configuration); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureCache(IConfiguration configuration) | ||||
|     { | ||||
|         Configure<AbpDistributedCacheOptions>(options => { options.KeyPrefix = "TenantManagement:"; }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureVirtualFileSystem(ServiceConfigurationContext context) | ||||
|     { | ||||
|         var hostingEnvironment = context.Services.GetHostingEnvironment(); | ||||
|  | ||||
|         if (hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             Configure<AbpVirtualFileSystemOptions>(options => | ||||
|             { | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<TenantManagementDomainSharedModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.TenantManagement.Domain.Shared")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<TenantManagementDomainModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.TenantManagement.Domain")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<TenantManagementApplicationContractsModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.TenantManagement.Application.Contracts")); | ||||
|                 options.FileSets.ReplaceEmbeddedByPhysical<TenantManagementApplicationModule>( | ||||
|                     Path.Combine(hostingEnvironment.ContentRootPath, | ||||
|                         $"..{Path.DirectorySeparatorChar}KonSoft.TenantManagement.Application")); | ||||
|             }); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private void ConfigureConventionalControllers() | ||||
|     { | ||||
|         Configure<AbpAspNetCoreMvcOptions>(options => | ||||
|         { | ||||
|             options.ConventionalControllers.Create(typeof(TenantManagementApplicationModule).Assembly); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) | ||||
|             .AddAbpJwtBearer(options => | ||||
|             { | ||||
|                 options.Authority = configuration["AuthServer:Authority"]; | ||||
|                 options.RequireHttpsMetadata = configuration.GetValue<bool>("AuthServer:RequireHttpsMetadata"); | ||||
|                 options.Audience = "TenantManagement"; | ||||
|             }); | ||||
|  | ||||
|         context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options => | ||||
|         { | ||||
|             options.IsDynamicClaimsEnabled = true; | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddAbpSwaggerGenWithOAuth( | ||||
|         SwaggerConfigurationHelper.ConfigureWithOidc( | ||||
|             context, | ||||
|             configuration["AuthServer:Authority"]!, | ||||
|             new Dictionary<string, string> | ||||
|             { | ||||
|                     {"TenantManagement", "TenantManagement API"} | ||||
|             }, | ||||
|             options => | ||||
|             { | ||||
|                 options.SwaggerDoc("v1", new OpenApiInfo { Title = "TenantManagement API", Version = "v1" }); | ||||
|                 options.DocInclusionPredicate((docName, description) => true); | ||||
|                 options.CustomSchemaIds(type => type.FullName); | ||||
|             }); | ||||
|     } | ||||
|             ["TenantManagementService"], | ||||
|             discoveryEndpoint: configuration["AuthServer:MetadataAddress"], | ||||
|             apiTitle: "TenantManagement Service API" | ||||
|         ); | ||||
|  | ||||
|     private void ConfigureDataProtection( | ||||
|         ServiceConfigurationContext context, | ||||
|         IConfiguration configuration, | ||||
|         IWebHostEnvironment hostingEnvironment) | ||||
|     { | ||||
|         var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("TenantManagement"); | ||||
|         if (!hostingEnvironment.IsDevelopment()) | ||||
|         { | ||||
|             var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "TenantManagement-Protection-Keys"); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private void ConfigureDistributedLocking( | ||||
|         ServiceConfigurationContext context, | ||||
|         IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddSingleton<IDistributedLockProvider>(sp => | ||||
|         { | ||||
|             var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!); | ||||
|             return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) | ||||
|     { | ||||
|         context.Services.AddCors(options => | ||||
|         { | ||||
|             options.AddDefaultPolicy(builder => | ||||
|             { | ||||
|                 builder | ||||
|                     .WithOrigins(configuration["App:CorsOrigins"]? | ||||
|                         .Split(",", StringSplitOptions.RemoveEmptyEntries) | ||||
|                         .Select(o => o.RemovePostFix("/")) | ||||
|                         .ToArray() ?? []) | ||||
|                     .WithAbpExposedHeaders() | ||||
|                     .SetIsOriginAllowedToAllowWildcardSubdomains() | ||||
|                     .AllowAnyHeader() | ||||
|                     .AllowAnyMethod() | ||||
|                     .AllowCredentials(); | ||||
|             }); | ||||
|         }); | ||||
|         // ֻ<><D6BB><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD> | ||||
|         Configure<AbpBackgroundJobOptions>(options => options.IsJobExecutionEnabled = false); | ||||
|     } | ||||
|  | ||||
|     public override void OnApplicationInitialization(ApplicationInitializationContext context) | ||||
| @ -193,7 +51,7 @@ public class TenantManagementHttpApiHostModule : AbpModule | ||||
|         app.UseCors(); | ||||
|         app.UseAuthentication(); | ||||
|  | ||||
|         if (MultiTenancyConsts.IsEnabled) | ||||
|         if (KonSoftConsts.MultiTenancyEnabled) | ||||
|         { | ||||
|             app.UseMultiTenancy(); | ||||
|         } | ||||
| @ -216,4 +74,4 @@ public class TenantManagementHttpApiHostModule : AbpModule | ||||
|         app.UseAbpSerilogEnrichers(); | ||||
|         app.UseConfiguredEndpoints(); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,18 +1,20 @@ | ||||
| <?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" /> | ||||
|     </system.webServer> | ||||
|   </location> | ||||
|   <system.webServer> | ||||
|     <httpProtocol> | ||||
|       <customHeaders> | ||||
|         <remove name="x-powered-by" /> | ||||
|       </customHeaders> | ||||
|     </httpProtocol> | ||||
|   </system.webServer> | ||||
| </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" /> | ||||
| 		</system.webServer> | ||||
| 	</location> | ||||
| 	<system.webServer> | ||||
| 		<httpProtocol> | ||||
| 			<customHeaders> | ||||
| 				<remove name="x-powered-by" /> | ||||
| 			</customHeaders> | ||||
| 		</httpProtocol> | ||||
| 	</system.webServer> | ||||
| </configuration> | ||||
| @ -25,4 +25,4 @@ public class AdminApplicationContractsModule : AbpModule | ||||
|     { | ||||
|         AdminDtoExtensions.Configure(); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,28 +1,26 @@ | ||||
| using Volo.Abp.Identity; | ||||
| using Volo.Abp.ObjectExtending; | ||||
| using Volo.Abp.Threading; | ||||
| using Volo.Abp.Threading; | ||||
|  | ||||
| namespace KonSoft.Admin; | ||||
|  | ||||
| public static class AdminDtoExtensions | ||||
| { | ||||
|     private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); | ||||
|     private static readonly OneTimeRunner OneTimeRunner = new(); | ||||
|  | ||||
|     public static void Configure() | ||||
|     { | ||||
|         OneTimeRunner.Run(() => | ||||
|         { | ||||
|                 /* You can add extension properties to DTOs | ||||
|                  * defined in the depended modules. | ||||
|                  * | ||||
|                  * Example: | ||||
|                  * | ||||
|                  * ObjectExtensionManager.Instance | ||||
|                  *   .AddOrUpdateProperty<IdentityRoleDto, string>("Title"); | ||||
|                  * | ||||
|                  * See the documentation for more: | ||||
|                  * https://docs.abp.io/en/abp/latest/Object-Extensions | ||||
|                  */ | ||||
|             /* You can add extension properties to DTOs | ||||
|              * defined in the depended modules. | ||||
|              * | ||||
|              * Example: | ||||
|              * | ||||
|              * ObjectExtensionManager.Instance | ||||
|              *   .AddOrUpdateProperty<IdentityRoleDto, string>("Title"); | ||||
|              * | ||||
|              * See the documentation for more: | ||||
|              * https://docs.abp.io/en/abp/latest/Object-Extensions | ||||
|              */ | ||||
|         }); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -0,0 +1,10 @@ | ||||
| namespace KonSoft.Admin.Dtos; | ||||
|  | ||||
| public class AddressDto | ||||
| { | ||||
|     public string ContactName { get; set; } | ||||
|     public string ContactPhone { get; set; } | ||||
|     public string DetailAddress { get; set; } | ||||
|     public string City { get; set; } | ||||
|     public string District { get; set; } | ||||
| } | ||||
| @ -0,0 +1,19 @@ | ||||
| using System; | ||||
| using System.ComponentModel.DataAnnotations; | ||||
|  | ||||
| namespace KonSoft.Admin.Dtos; | ||||
|  | ||||
| public class CreateOrderDto | ||||
| { | ||||
|     [Required] public Guid CustomerId { get; set; } | ||||
|  | ||||
|     [Required] public Guid ServiceCategoryId { get; set; } | ||||
|  | ||||
|     [Required] public DateTime ServiceTime { get; set; } | ||||
|  | ||||
|     [Required] public decimal Amount { get; set; } | ||||
|  | ||||
|     [Required] public AddressDto Address { get; set; } | ||||
|  | ||||
|     public string Remark { get; set; } | ||||
| } | ||||
| @ -0,0 +1,9 @@ | ||||
| using System; | ||||
|  | ||||
| namespace KonSoft.Admin.Dtos; | ||||
|  | ||||
| public class CreateServiceCategoryDto | ||||
| { | ||||
|     public string Name { get; set; } | ||||
|     public Guid? ParentId { get; set; } | ||||
| } | ||||
| @ -0,0 +1,20 @@ | ||||
| using System; | ||||
| using KonSoft.Admin.Enums; | ||||
|  | ||||
| namespace KonSoft.Admin.Dtos; | ||||
|  | ||||
| public class OrderDto | ||||
| { | ||||
|     public Guid Id { get; set; } | ||||
|     public string OrderSN { get; set; } | ||||
|     public Guid CustomerId { get; set; } | ||||
|     public Guid? WorkerId { get; set; } | ||||
|     public ServiceCategoryDto? ServiceCategory { get; set; } | ||||
|     public DateTime ServiceTime { get; set; } | ||||
|     public OrderStatus Status { get; set; } | ||||
|     public decimal Amount { get; set; } | ||||
|     public decimal PaidAmount { get; set; } | ||||
|     public string PaymentMethod { get; set; } | ||||
|     public AddressDto Address { get; set; } | ||||
|     public string Remark { get; set; } | ||||
| } | ||||
| @ -0,0 +1,5 @@ | ||||
| namespace KonSoft.Admin.Dtos; | ||||
|  | ||||
| public class PayOrderDto | ||||
| { | ||||
| } | ||||
| @ -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; } | ||||
| } | ||||
| @ -0,0 +1,13 @@ | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
|  | ||||
| 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(); | ||||
| } | ||||
| @ -0,0 +1,12 @@ | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
| using Volo.Abp.Application.Dtos; | ||||
|  | ||||
| namespace KonSoft.Admin.Dtos; | ||||
|  | ||||
| public class WorkerDto : EntityDto<Guid> | ||||
| { | ||||
|     public string Name { get; set; } | ||||
|     public string Phone { get; set; } | ||||
|     public List<Guid> SkillCategoryIds { get; set; } = new(); // 擅长服务类型 | ||||
| } | ||||
| @ -0,0 +1,28 @@ | ||||
| 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 IOrderAppService : IApplicationService | ||||
| { | ||||
|     /// <summary> | ||||
|     ///     创建订单 | ||||
|     /// </summary> | ||||
|     /// <param name="input"></param> | ||||
|     /// <returns></returns> | ||||
|     Task<OrderDto> CreateAsync(CreateOrderDto input); | ||||
|  | ||||
|     Task<OrderDto> PayAsync(Guid orderId, PayOrderDto input); | ||||
|     Task AssignAsync(Guid orderId, Guid workerId); | ||||
|     Task StartServiceAsync(Guid orderId); | ||||
|     Task CompleteServiceAsync(Guid orderId); | ||||
|     Task ConfirmAsync(Guid orderId); | ||||
|     Task CancelAsync(Guid orderId, string reason); | ||||
|     Task DeleteAsync(params Guid[] ids); | ||||
|     Task EditAsync(OrderDto input); | ||||
|     Task<OrderDto> GetAsync(Guid id); | ||||
|     Task<PagedResultDto<OrderDto>> GetListAsync(PagedResultRequestDto input); | ||||
| } | ||||
| @ -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); | ||||
| } | ||||
| @ -0,0 +1,13 @@ | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
| using System.Threading.Tasks; | ||||
| using KonSoft.Admin.Dtos; | ||||
|  | ||||
| namespace KonSoft.Admin.IApplicationServices; | ||||
|  | ||||
| public interface IServiceCategoryAppService | ||||
| { | ||||
|     Task<ServiceCategoryDto> CreateAsync(CreateServiceCategoryDto input); | ||||
|     Task DeleteAsync(Guid id); | ||||
|     Task<List<ServiceCategoryDto>> GetTreeAsync(); | ||||
| } | ||||
| @ -0,0 +1,7 @@ | ||||
| using Volo.Abp.Application.Services; | ||||
|  | ||||
| namespace KonSoft.Admin.IApplicationServices; | ||||
|  | ||||
| public interface IWorkerAppService : IApplicationService | ||||
| { | ||||
| } | ||||
| @ -0,0 +1,5 @@ | ||||
| namespace KonSoft.Admin.IApplicationServices; | ||||
|  | ||||
| public interface IWorkerAssignmentService | ||||
| { | ||||
| } | ||||
| @ -17,4 +17,4 @@ public class AdminPermissionDefinitionProvider : PermissionDefinitionProvider | ||||
|     { | ||||
|         return LocalizableString.Create<AdminResource>(name); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -6,4 +6,4 @@ public static class AdminPermissions | ||||
|  | ||||
|     //Add your own permission names. Example: | ||||
|     //public const string MyPermission1 = GroupName + ".MyPermission1"; | ||||
| } | ||||
| } | ||||
| @ -1,7 +1,4 @@ | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
| using System.Text; | ||||
| using KonSoft.Admin.Localization; | ||||
| using KonSoft.Admin.Localization; | ||||
| using Volo.Abp.Application.Services; | ||||
|  | ||||
| namespace KonSoft.Admin; | ||||
| @ -14,4 +11,4 @@ public abstract class AdminAppService : ApplicationService | ||||
|     { | ||||
|         LocalizationResource = typeof(AdminResource); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,4 +1,7 @@ | ||||
| using AutoMapper; | ||||
| using KonSoft.Admin.Dtos; | ||||
| using KonSoft.Admin.Entities; | ||||
| using KonSoft.Admin.ValueObjects; | ||||
|  | ||||
| namespace KonSoft.Admin; | ||||
|  | ||||
| @ -9,5 +12,10 @@ public class AdminApplicationAutoMapperProfile : Profile | ||||
|         /* You can configure your AutoMapper mapping configuration here. | ||||
|          * Alternatively, you can split your mapping configurations | ||||
|          * into multiple profile classes for a better organization. */ | ||||
|  | ||||
|         CreateMap<Order, OrderDto>(); | ||||
|         //CreateMap<CreateOrderDto, Order>(); | ||||
|         CreateMap<AddressDto, AddressInfo>(); | ||||
|         CreateMap<ServiceCategoryDto, ServiceCategory>(); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -18,14 +18,11 @@ namespace KonSoft.Admin; | ||||
|     typeof(AbpTenantManagementApplicationModule), | ||||
|     typeof(AbpFeatureManagementApplicationModule), | ||||
|     typeof(AbpSettingManagementApplicationModule) | ||||
|     )] | ||||
| )] | ||||
| public class AdminApplicationModule : AbpModule | ||||
| { | ||||
|     public override void ConfigureServices(ServiceConfigurationContext context) | ||||
|     { | ||||
|         Configure<AbpAutoMapperOptions>(options => | ||||
|         { | ||||
|             options.AddMaps<AdminApplicationModule>(); | ||||
|         }); | ||||
|         Configure<AbpAutoMapperOptions>(options => { options.AddMaps<AdminApplicationModule>(); }); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -0,0 +1,167 @@ | ||||
| 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 KonSoft.Admin.ValueObjects; | ||||
| using Volo.Abp; | ||||
| using Volo.Abp.Application.Dtos; | ||||
| using Volo.Abp.Application.Services; | ||||
| using Volo.Abp.Domain.Repositories; | ||||
|  | ||||
| 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> | ||||
|     ///     取消订单 | ||||
|     /// </summary> | ||||
|     /// <param name="orderId"></param> | ||||
|     /// <param name="reason"></param> | ||||
|     /// <returns></returns> | ||||
|     /// <exception cref="NotImplementedException"></exception> | ||||
|     public async Task CancelAsync(Guid orderId, string reason) | ||||
|     { | ||||
|         var order = await _orderRepository.GetAsync(o => o.Id == orderId); | ||||
|         order.Cancel(reason); | ||||
|     } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     完成订单 | ||||
|     /// </summary> | ||||
|     /// <param name="orderId"></param> | ||||
|     /// <returns></returns> | ||||
|     /// <exception cref="NotImplementedException"></exception> | ||||
|     public async Task CompleteServiceAsync(Guid orderId) | ||||
|     { | ||||
|         var order = await _orderRepository.GetAsync(o => o.Id == orderId); | ||||
|         order.CompleteService(); | ||||
|     } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     确认订单 | ||||
|     /// </summary> | ||||
|     /// <param name="orderId"></param> | ||||
|     /// <returns></returns> | ||||
|     /// <exception cref="NotImplementedException"></exception> | ||||
|     public async Task ConfirmAsync(Guid orderId) | ||||
|     { | ||||
|         var order = await _orderRepository.GetAsync(o => o.Id == orderId); | ||||
|         order.ConfirmCompletion(); | ||||
|     } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     创建订单 | ||||
|     /// </summary> | ||||
|     /// <param name="input"></param> | ||||
|     /// <returns></returns> | ||||
|     /// <exception cref="NotImplementedException"></exception> | ||||
|     public async Task<OrderDto> CreateAsync(CreateOrderDto input) | ||||
|     { | ||||
|         // 生成订单号 TODO | ||||
|         var orderSN = "SN001"; | ||||
|         var address = ObjectMapper.Map<AddressDto, AddressInfo>(input.Address); | ||||
|         var order = new Order(input.CustomerId, input.ServiceCategoryId, input.ServiceTime, | ||||
|             input.Amount, address, input.Remark); | ||||
|  | ||||
|         await _orderRepository.InsertAsync(order); | ||||
|         return ObjectMapper.Map<Order, OrderDto>(order); | ||||
|     } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     根据订单ID删除订单 | ||||
|     /// </summary> | ||||
|     /// <param name="id">订单ID</param> | ||||
|     public async Task DeleteAsync(params Guid[] ids) | ||||
|     { | ||||
|         // 根据ID删除订单 | ||||
|         await _orderRepository.DeleteAsync(x => ids.Contains(x.Id)); | ||||
|     } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     修改订单信息 | ||||
|     /// </summary> | ||||
|     /// <param name="input">订单DTO对象</param> | ||||
|     /// s | ||||
|     public async Task EditAsync(OrderDto input) | ||||
|     { | ||||
|         // 根据ID查询订单,如果不存在则抛出异常【修改前端必然看到了,数据若查不到提示自定义异常信息】 | ||||
|         var order = await _orderRepository.FindAsync(o => o.Id == input.Id) ?? | ||||
|                     throw new BusinessException("订单找不到").WithData("Id", input.Id); | ||||
|  | ||||
|         // 将输入的DTO字段映射到订单实体 | ||||
|         ObjectMapper.Map(input, order); | ||||
|  | ||||
|         // 更新订单 | ||||
|         await _orderRepository.UpdateAsync(order); | ||||
|     } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     支付 | ||||
|     /// </summary> | ||||
|     /// <param name="orderId"></param> | ||||
|     /// <param name="input"></param> | ||||
|     /// <returns></returns> | ||||
|     /// <exception cref="NotImplementedException"></exception> | ||||
|     public Task<OrderDto> PayAsync(Guid orderId, PayOrderDto input) | ||||
|     { | ||||
|         throw new NotImplementedException(); | ||||
|     } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     开始订单 | ||||
|     /// </summary> | ||||
|     /// <param name="orderId"></param> | ||||
|     /// <returns></returns> | ||||
|     /// <exception cref="NotImplementedException"></exception> | ||||
|     public async Task StartServiceAsync(Guid orderId) | ||||
|     { | ||||
|         var order = await _orderRepository.GetAsync(o => o.Id == orderId); | ||||
|         order.StartService(); | ||||
|     } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     根据订单ID获取单个订单 | ||||
|     /// </summary> | ||||
|     public async Task<OrderDto> GetAsync(Guid id) | ||||
|     { | ||||
|         // 根据ID从数据库查询订单 | ||||
|         var order = await _orderRepository.GetAsync(o => o.Id == id); | ||||
|  | ||||
|         // 转换为OrderDto返回 | ||||
|         return ObjectMapper.Map<Order, OrderDto>(order); | ||||
|     } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     获取所有订单列表 | ||||
|     /// </summary> | ||||
|     public async Task<PagedResultDto<OrderDto>> GetListAsync(PagedResultRequestDto input) | ||||
|     { | ||||
|         // 查询所有订单 | ||||
|         var orders = await _orderRepository.GetPagedListAsync(input.SkipCount, input.MaxResultCount, "Id"); | ||||
|  | ||||
|         var totalCount = await _orderRepository.CountAsync(); | ||||
|  | ||||
|         var orderDtos = ObjectMapper.Map<List<Order>, List<OrderDto>>(orders); | ||||
|  | ||||
|         return new PagedResultDto<OrderDto>(totalCount, orderDtos); | ||||
|     } | ||||
| } | ||||
| @ -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); // 递归 | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @ -0,0 +1,77 @@ | ||||
| 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 Volo.Abp.Application.Services; | ||||
| using Volo.Abp.Domain.Repositories; | ||||
|  | ||||
| namespace KonSoft.Admin.ApplicationServices; | ||||
|  | ||||
| public class ServiceCategoryAppService : ApplicationService, IServiceCategoryAppService | ||||
| { | ||||
|     private readonly IRepository<ServiceCategory, Guid> _repository; | ||||
|  | ||||
|  | ||||
|     public ServiceCategoryAppService(IRepository<ServiceCategory, Guid> repository) | ||||
|     { | ||||
|         _repository = repository; | ||||
|     } | ||||
|  | ||||
|     public async Task<ServiceCategoryDto> CreateAsync(CreateServiceCategoryDto input) | ||||
|     { | ||||
|         ServiceCategory parent = null; | ||||
|         if (input.ParentId.HasValue) | ||||
|         { | ||||
|             parent = await _repository.GetAsync(input.ParentId.Value); | ||||
|         } | ||||
|  | ||||
|         var category = new ServiceCategory(Guid.NewGuid(), input.Name); | ||||
|         category.SetParent(parent); | ||||
|  | ||||
|  | ||||
|         await _repository.InsertAsync(category); | ||||
|  | ||||
|  | ||||
|         return ObjectMapper.Map<ServiceCategory, ServiceCategoryDto>(category); | ||||
|     } | ||||
|  | ||||
|     public async Task DeleteAsync(Guid id) | ||||
|     { | ||||
|         var hasChildren = await _repository.AnyAsync(c => c.ParentId == id); | ||||
|         if (hasChildren) | ||||
|         { | ||||
|             throw new InvalidOperationException("存在子节点无法删除!"); | ||||
|         } | ||||
|  | ||||
|  | ||||
|         await _repository.DeleteAsync(o => o.Id == id); | ||||
|     } | ||||
|  | ||||
|     public async Task<List<ServiceCategoryDto>> GetTreeAsync() | ||||
|     { | ||||
|         var allCategories = await _repository.GetListAsync(); | ||||
|  | ||||
|         // 构建树 | ||||
|         var lookup = | ||||
|             allCategories.ToDictionary(c => c.Id, c => ObjectMapper.Map<ServiceCategory, ServiceCategoryDto>(c)); | ||||
|         var rootList = new List<ServiceCategoryDto>(); | ||||
|  | ||||
|  | ||||
|         foreach (var dto in lookup.Values) | ||||
|         { | ||||
|             if (dto.ParentId.HasValue && lookup.ContainsKey(dto.ParentId.Value)) | ||||
|             { | ||||
|                 lookup[dto.ParentId.Value].Children.Add(dto); | ||||
|             } | ||||
|             else | ||||
|             { | ||||
|                 rootList.Add(dto); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         return rootList.OrderBy(c => c.Name).ToList(); | ||||
|     } | ||||
| } | ||||
| @ -6,8 +6,8 @@ | ||||
|     <RootNamespace>KonSoft.Admin</RootNamespace> | ||||
|   </PropertyGroup> | ||||
|   <ItemGroup> | ||||
|     <ProjectReference Include="..\KonSoft.Admin.Domain\KonSoft.Admin.Domain.csproj"/> | ||||
|     <ProjectReference Include="..\KonSoft.Admin.Application.Contracts\KonSoft.Admin.Application.Contracts.csproj"/> | ||||
|     <ProjectReference Include="..\KonSoft.Admin.Domain\KonSoft.Admin.Domain.csproj" /> | ||||
|     <ProjectReference Include="..\KonSoft.Admin.Application.Contracts\KonSoft.Admin.Application.Contracts.csproj" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Volo.Abp.Account.Application" Version="8.3.4" /> | ||||
|  | ||||
| @ -1,2 +1,3 @@ | ||||
| using System.Runtime.CompilerServices; | ||||
| [assembly:InternalsVisibleToAttribute("KonSoft.Admin.Application.Tests")] | ||||
|  | ||||
| [assembly: InternalsVisibleToAttribute("KonSoft.Admin.Application.Tests")] | ||||
| @ -3,4 +3,4 @@ | ||||
| public static class AdminDomainErrorCodes | ||||
| { | ||||
|     /* You can add your business exception error codes here, as constants */ | ||||
| } | ||||
| } | ||||
| @ -23,8 +23,8 @@ namespace KonSoft.Admin; | ||||
|     typeof(AbpOpenIddictDomainSharedModule), | ||||
|     typeof(AbpPermissionManagementDomainSharedModule), | ||||
|     typeof(AbpSettingManagementDomainSharedModule), | ||||
|     typeof(AbpTenantManagementDomainSharedModule)     | ||||
|     )] | ||||
|     typeof(AbpTenantManagementDomainSharedModule) | ||||
| )] | ||||
| public class AdminDomainSharedModule : AbpModule | ||||
| { | ||||
|     public override void PreConfigureServices(ServiceConfigurationContext context) | ||||
| @ -35,10 +35,7 @@ public class AdminDomainSharedModule : AbpModule | ||||
|  | ||||
|     public override void ConfigureServices(ServiceConfigurationContext context) | ||||
|     { | ||||
|         Configure<AbpVirtualFileSystemOptions>(options => | ||||
|         { | ||||
|             options.FileSets.AddEmbedded<AdminDomainSharedModule>(); | ||||
|         }); | ||||
|         Configure<AbpVirtualFileSystemOptions>(options => { options.FileSets.AddEmbedded<AdminDomainSharedModule>(); }); | ||||
|  | ||||
|         Configure<AbpLocalizationOptions>(options => | ||||
|         { | ||||
| @ -55,4 +52,4 @@ public class AdminDomainSharedModule : AbpModule | ||||
|             options.MapCodeNamespace("Admin", typeof(AdminResource)); | ||||
|         }); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -4,19 +4,19 @@ namespace KonSoft.Admin; | ||||
|  | ||||
| public static class AdminGlobalFeatureConfigurator | ||||
| { | ||||
|     private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); | ||||
|     private static readonly OneTimeRunner OneTimeRunner = new(); | ||||
|  | ||||
|     public static void Configure() | ||||
|     { | ||||
|         OneTimeRunner.Run(() => | ||||
|         { | ||||
|                 /* You can configure (enable/disable) global features of the used modules here. | ||||
|                  * | ||||
|                  * YOU CAN SAFELY DELETE THIS CLASS AND REMOVE ITS USAGES IF YOU DON'T NEED TO IT! | ||||
|                  * | ||||
|                  * Please refer to the documentation to lear more about the Global Features System: | ||||
|                  * https://docs.abp.io/en/abp/latest/Global-Features | ||||
|                  */ | ||||
|             /* You can configure (enable/disable) global features of the used modules here. | ||||
|              * | ||||
|              * YOU CAN SAFELY DELETE THIS CLASS AND REMOVE ITS USAGES IF YOU DON'T NEED TO IT! | ||||
|              * | ||||
|              * Please refer to the documentation to lear more about the Global Features System: | ||||
|              * https://docs.abp.io/en/abp/latest/Global-Features | ||||
|              */ | ||||
|         }); | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -1,13 +1,10 @@ | ||||
| using System.ComponentModel.DataAnnotations; | ||||
| using Volo.Abp.Identity; | ||||
| using Volo.Abp.ObjectExtending; | ||||
| using Volo.Abp.Threading; | ||||
| using Volo.Abp.Threading; | ||||
|  | ||||
| namespace KonSoft.Admin; | ||||
|  | ||||
| public static class AdminModuleExtensionConfigurator | ||||
| { | ||||
|     private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); | ||||
|     private static readonly OneTimeRunner OneTimeRunner = new(); | ||||
|  | ||||
|     public static void Configure() | ||||
|     { | ||||
| @ -57,7 +54,7 @@ public static class AdminModuleExtensionConfigurator | ||||
|                               //validation rules | ||||
|                               property.Attributes.Add(new RequiredAttribute()); | ||||
|                               property.Attributes.Add(new StringLengthAttribute(64) {MinimumLength = 4}); | ||||
|                                | ||||
|  | ||||
|                               property.Configuration[IdentityModuleExtensionConsts.ConfigurationNames.AllowUserToEdit] = true; | ||||
|  | ||||
|                               //...other configurations for this property | ||||
| @ -70,4 +67,4 @@ public static class AdminModuleExtensionConfigurator | ||||
|          * https://docs.abp.io/en/abp/latest/Module-Entity-Extensions | ||||
|          */ | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -0,0 +1,14 @@ | ||||
| namespace KonSoft.Admin.Enums; | ||||
|  | ||||
| public enum OrderStatus | ||||
| { | ||||
|     PendingPayment, // 待支付 | ||||
|     PaidWaitingAssign, // 已支付待派单 | ||||
|     AssignedWaitingService, // 已派单待服务 | ||||
|     InService, // 服务中 | ||||
|     WaitingConfirm, // 待用户确认 | ||||
|     Completed, // 已完成 | ||||
|     Canceled, // 已取消 | ||||
|     Refunding, // 退款中 | ||||
|     Refunded // 已退款 | ||||
| } | ||||
| @ -5,5 +5,4 @@ namespace KonSoft.Admin.Localization; | ||||
| [LocalizationResourceName("Admin")] | ||||
| public class AdminResource | ||||
| { | ||||
|  | ||||
| } | ||||
| } | ||||
| @ -1,10 +0,0 @@ | ||||
| namespace KonSoft.Admin.MultiTenancy; | ||||
|  | ||||
| public static class MultiTenancyConsts | ||||
| { | ||||
|     /* Enable/disable multi-tenancy easily in a single point. | ||||
|      * If you will never need to multi-tenancy, you can remove | ||||
|      * related modules and code parts, including this file. | ||||
|      */ | ||||
|     public const bool IsEnabled = true; | ||||
| } | ||||
| @ -5,4 +5,4 @@ public static class AdminConsts | ||||
|     public const string DbTablePrefix = "App"; | ||||
|  | ||||
|     public const string DbSchema = null; | ||||
| } | ||||
| } | ||||
| @ -1,6 +1,5 @@ | ||||
| using Microsoft.Extensions.DependencyInjection; | ||||
| using Microsoft.Extensions.DependencyInjection.Extensions; | ||||
| using KonSoft.Admin.MultiTenancy; | ||||
| using Volo.Abp.AuditLogging; | ||||
| using Volo.Abp.BackgroundJobs; | ||||
| using Volo.Abp.Emailing; | ||||
| @ -8,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; | ||||
| @ -56,13 +54,9 @@ public class AdminDomainModule : AbpModule | ||||
|             options.Languages.Add(new LanguageInfo("es", "es", "Español")); | ||||
|         }); | ||||
|  | ||||
|         Configure<AbpMultiTenancyOptions>(options => | ||||
|         { | ||||
|             options.IsEnabled = MultiTenancyConsts.IsEnabled; | ||||
|         }); | ||||
|  | ||||
| #if DEBUG | ||||
|         context.Services.Replace(ServiceDescriptor.Singleton<IEmailSender, NullEmailSender>()); | ||||
| #endif | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -17,12 +17,11 @@ namespace KonSoft.Admin.Data; | ||||
|  | ||||
| public class AdminDbMigrationService : ITransientDependency | ||||
| { | ||||
|     public ILogger<AdminDbMigrationService> Logger { get; set; } | ||||
|     private readonly ICurrentTenant _currentTenant; | ||||
|  | ||||
|     private readonly IDataSeeder _dataSeeder; | ||||
|     private readonly IEnumerable<IAdminDbSchemaMigrator> _dbSchemaMigrators; | ||||
|     private readonly ITenantRepository _tenantRepository; | ||||
|     private readonly ICurrentTenant _currentTenant; | ||||
|  | ||||
|     public AdminDbMigrationService( | ||||
|         IDataSeeder dataSeeder, | ||||
| @ -38,6 +37,8 @@ public class AdminDbMigrationService : ITransientDependency | ||||
|         Logger = NullLogger<AdminDbMigrationService>.Instance; | ||||
|     } | ||||
|  | ||||
|     public ILogger<AdminDbMigrationService> Logger { get; set; } | ||||
|  | ||||
|     public async Task MigrateAsync() | ||||
|     { | ||||
|         var initialMigrationAdded = AddInitialMigrationIfNotExist(); | ||||
| @ -52,7 +53,7 @@ public class AdminDbMigrationService : ITransientDependency | ||||
|         await MigrateDatabaseSchemaAsync(); | ||||
|         await SeedDataAsync(); | ||||
|  | ||||
|         Logger.LogInformation($"Successfully completed host database migrations."); | ||||
|         Logger.LogInformation("Successfully completed host database migrations."); | ||||
|  | ||||
|         var tenants = await _tenantRepository.GetListAsync(includeDetails: true); | ||||
|  | ||||
| @ -101,8 +102,10 @@ public class AdminDbMigrationService : ITransientDependency | ||||
|         Logger.LogInformation($"Executing {(tenant == null ? "host" : tenant.Name + " tenant")} database seed..."); | ||||
|  | ||||
|         await _dataSeeder.SeedAsync(new DataSeedContext(tenant?.Id) | ||||
|             .WithProperty(IdentityDataSeedContributor.AdminEmailPropertyName, IdentityDataSeedContributor.AdminEmailDefaultValue) | ||||
|             .WithProperty(IdentityDataSeedContributor.AdminPasswordPropertyName, IdentityDataSeedContributor.AdminPasswordDefaultValue) | ||||
|             .WithProperty(IdentityDataSeedContributor.AdminEmailPropertyName, | ||||
|                 IdentityDataSeedContributor.AdminEmailDefaultValue) | ||||
|             .WithProperty(IdentityDataSeedContributor.AdminPasswordPropertyName, | ||||
|                 IdentityDataSeedContributor.AdminPasswordDefaultValue) | ||||
|         ); | ||||
|     } | ||||
|  | ||||
| @ -127,10 +130,8 @@ public class AdminDbMigrationService : ITransientDependency | ||||
|                 AddInitialMigration(); | ||||
|                 return true; | ||||
|             } | ||||
|             else | ||||
|             { | ||||
|                 return false; | ||||
|             } | ||||
|  | ||||
|             return false; | ||||
|         } | ||||
|         catch (Exception e) | ||||
|         { | ||||
| @ -149,7 +150,8 @@ public class AdminDbMigrationService : ITransientDependency | ||||
|     private bool MigrationsFolderExists() | ||||
|     { | ||||
|         var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath(); | ||||
|         return dbMigrationsProjectFolder != null && Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations")); | ||||
|         return dbMigrationsProjectFolder != null && | ||||
|                Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations")); | ||||
|     } | ||||
|  | ||||
|     private void AddInitialMigration() | ||||
| @ -207,7 +209,8 @@ public class AdminDbMigrationService : ITransientDependency | ||||
|         { | ||||
|             currentDirectory = Directory.GetParent(currentDirectory.FullName); | ||||
|  | ||||
|             if (currentDirectory != null && Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null) | ||||
|             if (currentDirectory != null && | ||||
|                 Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null) | ||||
|             { | ||||
|                 return currentDirectory.FullName; | ||||
|             } | ||||
| @ -215,4 +218,4 @@ public class AdminDbMigrationService : ITransientDependency | ||||
|  | ||||
|         return null; | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -5,4 +5,4 @@ namespace KonSoft.Admin.Data; | ||||
| public interface IAdminDbSchemaMigrator | ||||
| { | ||||
|     Task MigrateAsync(); | ||||
| } | ||||
| } | ||||
| @ -12,4 +12,4 @@ public class NullAdminDbSchemaMigrator : IAdminDbSchemaMigrator, ITransientDepen | ||||
|     { | ||||
|         return Task.CompletedTask; | ||||
|     } | ||||
| } | ||||
| } | ||||
| @ -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; } | ||||
| } | ||||
							
								
								
									
										158
									
								
								modules/admin/src/KonSoft.Admin.Domain/Entities/Order.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										158
									
								
								modules/admin/src/KonSoft.Admin.Domain/Entities/Order.cs
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,158 @@ | ||||
| using System; | ||||
| using KonSoft.Admin.Enums; | ||||
| using KonSoft.Admin.ValueObjects; | ||||
| using Volo.Abp.Domain.Entities.Auditing; | ||||
|  | ||||
| namespace KonSoft.Admin.Entities; | ||||
|  | ||||
| public class Order : FullAuditedAggregateRoot<Guid> | ||||
| { | ||||
|     private Order() | ||||
|     { | ||||
|     } | ||||
|  | ||||
|  | ||||
|     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.PendingPayment; | ||||
|     } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     用户ID | ||||
|     /// </summary> | ||||
|     public Guid CustomerId { get; private set; } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     家政人员ID | ||||
|     /// </summary> | ||||
|     public Guid? WorkerId { get; private set; } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     服务项目ID | ||||
|     /// </summary> | ||||
|     public Guid ServiceCategoryId { 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> | ||||
|     public AddressInfo Address { get; private set; } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     备注 | ||||
|     /// </summary> | ||||
|     public string? Remark { get; private set; } | ||||
|  | ||||
|     /// <summary> | ||||
|     ///     取消原因 | ||||
|     /// </summary> | ||||
|     public string? CancelReason { get; private set; } | ||||
|  | ||||
|  | ||||
|     public void MarkPaid(decimal paidAmount, string method) | ||||
|     { | ||||
|         if (Status != OrderStatus.PendingPayment) | ||||
|         { | ||||
|             throw new InvalidOperationException("订单不在待付款状态"); | ||||
|         } | ||||
|  | ||||
|  | ||||
|         PaidAmount = paidAmount; | ||||
|         PaymentMethod = method; | ||||
|         Status = OrderStatus.PaidWaitingAssign; | ||||
|     } | ||||
|  | ||||
|  | ||||
|     public void AssignWorker(Guid workerId) | ||||
|     { | ||||
|         if (Status != OrderStatus.PaidWaitingAssign) | ||||
|         { | ||||
|             throw new InvalidOperationException("订单无法分配师傅"); | ||||
|         } | ||||
|  | ||||
|  | ||||
|         WorkerId = workerId; | ||||
|         Status = OrderStatus.AssignedWaitingService; | ||||
|     } | ||||
|  | ||||
|  | ||||
|     public void StartService() | ||||
|     { | ||||
|         if (Status != OrderStatus.AssignedWaitingService) | ||||
|         { | ||||
|             throw new InvalidOperationException("订单无法开始"); | ||||
|         } | ||||
|  | ||||
|  | ||||
|         Status = OrderStatus.InService; | ||||
|     } | ||||
|  | ||||
|  | ||||
|     public void CompleteService() | ||||
|     { | ||||
|         if (Status != OrderStatus.InService) | ||||
|         { | ||||
|             throw new InvalidOperationException("订单未开始服务,无法完成"); | ||||
|         } | ||||
|  | ||||
|  | ||||
|         Status = OrderStatus.WaitingConfirm; | ||||
|     } | ||||
|  | ||||
|  | ||||
|     public void ConfirmCompletion() | ||||
|     { | ||||
|         if (Status != OrderStatus.WaitingConfirm) | ||||
|         { | ||||
|             throw new InvalidOperationException("订单无法确认"); | ||||
|         } | ||||
|  | ||||
|  | ||||
|         Status = OrderStatus.Completed; | ||||
|     } | ||||
|  | ||||
|  | ||||
|     public void Cancel(string reason) | ||||
|     { | ||||
|         // 若已完成或退款中则不可取消 | ||||
|         if (Status == OrderStatus.Completed || Status == OrderStatus.Refunding || Status == OrderStatus.Refunded) | ||||
|         { | ||||
|             throw new InvalidOperationException("订单无法被取消"); | ||||
|         } | ||||
|  | ||||
|  | ||||
|         CancelReason = reason; | ||||
|         Status = OrderStatus.Canceled; | ||||
|     } | ||||
| } | ||||
							
								
								
									
										105
									
								
								modules/admin/src/KonSoft.Admin.Domain/Entities/Product.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										105
									
								
								modules/admin/src/KonSoft.Admin.Domain/Entities/Product.cs
									
									
									
									
									
										Normal file
									
								
							| @ -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; | ||||
|     } | ||||
| } | ||||
| @ -0,0 +1,44 @@ | ||||
| using System; | ||||
| using Volo.Abp.Domain.Entities.Auditing; | ||||
|  | ||||
| namespace KonSoft.Admin.Entities; | ||||
|  | ||||
| public class ServiceCategory : FullAuditedAggregateRoot<Guid> | ||||
| { | ||||
|     protected ServiceCategory() | ||||
|     { | ||||
|     } | ||||
|  | ||||
|     public ServiceCategory(Guid id, string name) | ||||
|         : base(id) | ||||
|     { | ||||
|         Name = name; | ||||
|     } | ||||
|  | ||||
|     public ServiceCategory(Guid id, string name, Guid? parentId = null, string path = null, int level = 0) : base(id) | ||||
|     { | ||||
|         Name = name; | ||||
|         ParentId = parentId; | ||||
|         Path = path ?? id.ToString(); | ||||
|         Level = level; | ||||
|     } | ||||
|  | ||||
|     public string Name { get; private set; } | ||||
|     public Guid? ParentId { get; private set; } | ||||
|     public string Path { get; private set; } | ||||
|     public int Level { get; private set; } | ||||
|  | ||||
|  | ||||
|     public void UpdateName(string name) | ||||
|     { | ||||
|         Name = name; | ||||
|     } | ||||
|  | ||||
|  | ||||
|     public void SetParent(ServiceCategory parent) | ||||
|     { | ||||
|         ParentId = parent?.Id; | ||||
|         Level = (parent?.Level ?? 0) + 1; | ||||
|         Path = parent != null ? $"{parent.Path}/{Id}" : Id.ToString(); | ||||
|     } | ||||
| } | ||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user
	