diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj index 218ac720c..e34e27aae 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj @@ -14,7 +14,7 @@ true Win_in.Sfs.Auth-4681b4fd-151f-4221-84a4-929d86723e4c 1.yyyy.Mdd.Hmm - 1.2023.406.2008 + 1.2023.407.1105 True diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/PdaHttpApiHostModule.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/PdaHttpApiHostModule.cs index cdb6f497f..94688112d 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/PdaHttpApiHostModule.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/PdaHttpApiHostModule.cs @@ -1,33 +1,16 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Microsoft.AspNetCore.Authentication.JwtBearer; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Cors; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.OpenApi.Models; -using Polly; -using Volo.Abp; using Volo.Abp.Account; -using Volo.Abp.AspNetCore.Mvc.AntiForgery; using Volo.Abp.AspNetCore.Mvc.Client; using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Autofac; using Volo.Abp.AutoMapper; -using Volo.Abp.Domain; using Volo.Abp.Http.Client; -using Volo.Abp.Http.Client.Authentication; using Volo.Abp.Http.Client.IdentityModel.Web; using Volo.Abp.Identity; -using Volo.Abp.Localization; using Volo.Abp.Modularity; -using Volo.Abp.MultiTenancy; +using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.Swashbuckle; -using Volo.Abp.Users; using Win_in.Sfs.Auth; using Win_in.Sfs.Basedata.Application.Contracts; using Win_in.Sfs.FileStorage; @@ -48,7 +31,8 @@ namespace Win_in.Sfs.Wms.Pda; typeof(AbpIdentityHttpApiClientModule), typeof(AbpAspNetCoreMvcClientModule), typeof(AbpHttpClientIdentityModelWebModule), - typeof(SharedHostModule) + typeof(SharedHostModule), + typeof(AbpSettingManagementEntityFrameworkCoreModule) )] [DependsOn( typeof(AbpAspNetCoreSerilogModule), @@ -70,84 +54,10 @@ namespace Win_in.Sfs.Wms.Pda; )] public class PdaHttpApiHostModule : ModuleBase { - private bool _isMultiTenancy = true; - - ///// - ///// 预配置服务 - ///// - ///// - //public override void PreConfigureServices(ServiceConfigurationContext context) - //{ - // context.Services.AddAutoMapperObjectMapper(); - // Configure(options => { options.AddMaps(validate: true); }); - - // PreConfigure(options => - // { - // //Polly 重试3次 - // options.ProxyClientBuildActions.Add((remoteServiceName, clientBuilder) => - // { - // clientBuilder.AddTransientHttpErrorPolicy(policyBuilder => - // policyBuilder.WaitAndRetryAsync( - // 3, - // i => TimeSpan.FromSeconds(Math.Pow(2, i)) - // ) - // ); - // }); - // }); - //} - - /// - /// - /// - /// - public override void PostConfigureServices(ServiceConfigurationContext context) - { - // 这里必须手动替换一下 - context.Services.Replace(ServiceDescriptor.Transient(typeof(IExternalUserLookupServiceProvider), typeof(HttpClientExternalUserLookupServiceProvider))); - context.Services.Replace(ServiceDescriptor.Transient()); - } - - /// - /// 配置服务 - /// - /// - public override void ConfigureServices(ServiceConfigurationContext context) - { - //_ = context.Services.GetHostingEnvironment(); - //var configuration = context.Services.GetConfiguration(); - - //context.SetConsoleTitleOfWebApp("Pda.Host"); - - //_isMultiTenancy = Convert.ToBoolean(configuration["IsMultiTenancy"]); - - //ConfigureHttpClientProxies(context); - - //ConfigureMultiTenancy(); - - base.ConfigureServices(context); - GetXmlFiles(); - - //ConfigureLocalization(); - - //ConfigureAuthentication(context, configuration); - - //ConfigureCors(context, configuration); - - //ConfigureAntiForgery(); - } - - private void ConfigureAntiForgery() - { - Configure(options => - { - options.TokenCookie.SameSite = Microsoft.AspNetCore.Http.SameSiteMode.Lax; - options.TokenCookie.Expiration = TimeSpan.FromDays(365); - options.AutoValidateIgnoredHttpMethods.Add("POST"); - }); - } - - private static void ConfigureHttpClientProxies(ServiceConfigurationContext context) + /// + protected override void ConfigureHttpClientProxies() { + var context = this.ServiceConfigurationContext; context.Services.AddHttpClientProxies( typeof(AuthApplicationContractsModule).Assembly, "Auth" @@ -185,128 +95,4 @@ public class PdaHttpApiHostModule : ModuleBase "FileStorage" ); } - - private void ConfigureMultiTenancy() - { - Configure(options => { options.IsEnabled = _isMultiTenancy; }); - } - - private static void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) - { - var origins = configuration.GetSection("App:CorsOrigins").Get(); - - context.Services.AddCors(options => - { - options.AddDefaultPolicy(builder => - { - builder - .WithOrigins( - origins.Select(o => o.RemovePostFix("/")) - .ToArray() - ) - .WithAbpExposedHeaders() - .SetIsOriginAllowedToAllowWildcardSubdomains() - .AllowAnyHeader() - .AllowAnyMethod() - .AllowCredentials(); - }); - }); - } - - private static void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) - { - context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) - .AddJwtBearer(options => - { - options.Authority = configuration["IdentityClients:Default:Authority"]; - options.RequireHttpsMetadata = Convert.ToBoolean(configuration["IdentityClients:Default:RequireHttps"]); - options.Audience = configuration["IdentityClients:Default:Scope"]; - }); - } - - private void ConfigureLocalization() - { - Configure(options => - { - options.Languages.Add(new LanguageInfo("en", "en", "English")); - options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文")); - }); - } - - /// - /// 应用初始化 - /// - /// - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - var app = context.GetApplicationBuilder(); - var env = context.GetEnvironment(); - var configuration = context.GetConfiguration(); - - app.UseDeveloperExceptionPage(); - //if (env.IsDevelopment()) - //{ - // app.UseDeveloperExceptionPage(); - //} - //else - //{ - // //app.UseErrorPage(); - // app.UseHsts(); - //} - - app.UseHttpsRedirection(); - app.UseCorrelationId(); - app.UseStaticFiles(); - app.UseRouting(); - app.UseCors(); - app.UseAuthentication(); - if (_isMultiTenancy) - { - app.UseMultiTenancy(); - } - app.UseAbpRequestLocalization(); - app.UseAuthorization(); - app.UseSwagger(); - app.UseAbpSwaggerUI(options => - { - options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - options.OAuthClientId(configuration["IdentityClients:Default:ClientId"]); - options.OAuthClientSecret(configuration["IdentityClients:Default:ClientSecret"]); - options.OAuthScopes(configuration["IdentityClients:Default:Scope"]); - }); - app.UseAuditing(); - app.UseAbpSerilogEnrichers(); - app.UseConfiguredEndpoints(); - } - - private void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration) - { - context.Services.AddAbpSwaggerGenWithOAuth( - configuration["IdentityClients:Default:Authority"], - new Dictionary - { - {"Pda", "Pda API"} - }, - options => - { - options.SwaggerDoc("v1", new OpenApiInfo { Title = "Pda API", Version = "v1" }); - options.DocInclusionPredicate((docName, description) => true); - options.CustomSchemaIds(type => type.FullName); - - GetXmlFiles().ForEach(file => - { - options.IncludeXmlComments(file); - }); - }); - } - /// - /// 获取当前目录下的xml文档 - /// - /// - private List GetXmlFiles() - { - var basePath = Path.GetDirectoryName(typeof(Program).Assembly.Location); - var docXmlFiles = Directory.GetFiles(basePath, "*.xml"); - return docXmlFiles.ToList(); - } } diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Development.json b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Development.json index d0b1693c4..aa423658a 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Development.json +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Development.json @@ -1,36 +1,4 @@ { - //"AgileConfig": { - // "appId": "sfs", - // "secret": "sfs", - // "nodes": "http://localhost:21092", - // "env": "dev" - //}, - "Urls": "http://localhost:59096", - //"IdentityClients": { - // "Default": { - // "GrantType": "client_credentials", - // "ClientId": "Auth_App", - // "ClientSecret": "1q2w3e*", - // "RequireHttps": "false", - // "Authority": "http://dev.ccwin-in.com:59093", - // "Scope": "Auth" - // } - //}, - //"RemoteServices": { - // "Default": { "BaseUrl": "http://localhost:59093" }, - // "Auth": { "BaseUrl": "http://localhost:59093/" } - //} - //"RemoteServices": { - // //"Default": { "BaseUrl": "http://dev.ccwin-in.com:59093" }, - // //"BaseData": { "BaseUrl": "http://localhost:59094/" }, - // "Store": { "BaseUrl": "http://localhost:59096/" }, - // "Job": { "BaseUrl": "http://localhost:59096/" }, - // "Inventory": { "BaseUrl": "http://localhost:59096/" } - // //"FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, - // //"Message": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, - // // "Label": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, - // //"Auth": { "BaseUrl": "http://dev.ccwin-in.com:59093/" } - //} "RemoteServices": { "Default": { "BaseUrl": "http://dev.ccwin-in.com:21293/" }, "BaseData": { "BaseUrl": "http://dev.ccwin-in.com:21294/" }, diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json index 520c2c060..5795dff80 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json @@ -1,47 +1,4 @@ { "ConfigServer": "http://localhost:21093", - "ConfigServer.Docker": "http://gateway:21093", - //"AgileConfig": { - // "appId": "sfs", - // "secret": "sfs", - // "nodes": "http://localhost:21092", - // "env": "dev" - //}, - "Urls": "http://localhost:59096", - //"IdentityClients": { - // "Default": { - // "GrantType": "client_credentials", - // "ClientId": "Auth_App", - // "ClientSecret": "1q2w3e*", - // "RequireHttps": "false", - // "Authority": "http://dev.ccwin-in.com:59093", - // "Scope": "Auth" - // } - //}, - //"RemoteServices": { - // "Default": { "BaseUrl": "http://localhost:59093" }, - // "Auth": { "BaseUrl": "http://localhost:59093/" } - //} - //"RemoteServices": { - // //"Default": { "BaseUrl": "http://dev.ccwin-in.com:59093" }, - // //"BaseData": { "BaseUrl": "http://localhost:59094/" }, - // "Store": { "BaseUrl": "http://localhost:59096/" }, - // "Job": { "BaseUrl": "http://localhost:59096/" }, - // "Inventory": { "BaseUrl": "http://localhost:59096/" } - // //"FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, - // //"Message": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, - // // "Label": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, - // //"Auth": { "BaseUrl": "http://dev.ccwin-in.com:59093/" } - //} - "RemoteServices": { - "Default": { "BaseUrl": "http://dev.ccwin-in.com:21293/" }, - "BaseData": { "BaseUrl": "http://dev.ccwin-in.com:21294/" }, - "Store": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, - "Job": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, - "Inventory": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, - "FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, - "Message": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, - "Label": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, - "Auth": { "BaseUrl": "http://dev.ccwin-in.com:21293/" } - } + "ConfigServer.Docker": "http://gateway:21093" }