From 5afbad87ba25e4e8194a2ef3611ec78328d5b2b0 Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 17 May 2025 13:21:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(account):=20=E4=BF=AE=E5=A4=8D=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E7=99=BB=E5=BD=95=E6=97=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthServerModule.Configure.cs | 31 ++++++++++++++++++ .../AuthServerModule.cs | 5 +++ .../LY.MicroService.AuthServer.csproj | 7 ++++ .../LY.MicroService.AuthServer/openiddict.pfx | Bin 2660 -> 2652 bytes 4 files changed, 43 insertions(+) diff --git a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs index 8db74d0ad..e5c3fb178 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs @@ -1,4 +1,5 @@ using DotNetCore.CAP; +using LINGYUN.Abp.BlobStoring.OssManagement; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.LocalizationManagement; using LINGYUN.Abp.OpenIddict.AspNetCore.Session; @@ -9,6 +10,7 @@ using LINGYUN.Abp.OpenIddict.WeChat; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; using LINGYUN.Abp.WeChat.Work; +using LINGYUN.Abp.Wrapper; using Medallion.Threading; using Medallion.Threading.Redis; using Microsoft.AspNetCore.Authentication; @@ -34,9 +36,11 @@ using System.Text.Unicode; using Volo.Abp.Account.Localization; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.Auditing; +using Volo.Abp.BlobStoring; using Volo.Abp.Caching; using Volo.Abp.FeatureManagement; using Volo.Abp.GlobalFeatures; +using Volo.Abp.Http.Client; using Volo.Abp.Json; using Volo.Abp.Json.SystemTextJson; using Volo.Abp.Localization; @@ -212,6 +216,20 @@ public partial class AuthServerModule } } + private void ConfigureBlobStoring(IConfiguration configuration) + { + Configure(options => + { + options.Containers.ConfigureAll((containerName, containerConfiguration) => + { + containerConfiguration.UseOssManagement(config => + { + configuration.GetSection("OssManagement").Bind(config); + }); + }); + }); + } + private void ConfigureCaching(IConfiguration configuration) { Configure(options => @@ -399,4 +417,17 @@ public partial class AuthServerModule }); }); } + + private void PreConfigureWrapper() + { + PreConfigure(options => + { + // http服务间调用发送不需要包装结果的请求头 + options.ProxyClientActions.Add( + (_, _, client) => + { + client.DefaultRequestHeaders.TryAddWithoutValidation(AbpHttpWrapConsts.AbpDontWrapResult, "true"); + }); + }); + } } diff --git a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs index 0fe58bfb3..cb6e71092 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.cs @@ -5,6 +5,7 @@ using LINGYUN.Abp.AspNetCore.Mvc.Wrapper; using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.Authentication.QQ; using LINGYUN.Abp.Authentication.WeChat; +using LINGYUN.Abp.BlobStoring.OssManagement; using LINGYUN.Abp.Data.DbMigrator; using LINGYUN.Abp.Emailing.Platform; using LINGYUN.Abp.EventBus.CAP; @@ -15,6 +16,7 @@ using LINGYUN.Abp.Identity.AspNetCore.Session; using LINGYUN.Abp.Identity.OrganizaztionUnits; using LINGYUN.Abp.Identity.Session.AspNetCore; using LINGYUN.Abp.Localization.CultureMap; +using LINGYUN.Abp.OpenIddict.AspNetCore; using LINGYUN.Abp.OpenIddict.AspNetCore.Session; using LINGYUN.Abp.OpenIddict.LinkUser; using LINGYUN.Abp.OpenIddict.Portal; @@ -48,6 +50,7 @@ namespace LY.MicroService.AuthServer; typeof(AbpAccountApplicationModule), typeof(AbpAccountHttpApiModule), typeof(AbpAccountWebOpenIddictModule), + typeof(AbpBlobStoringOssManagementModule), typeof(AbpGdprApplicationModule), typeof(AbpGdprHttpApiModule), typeof(AbpGdprWebModule), @@ -87,6 +90,7 @@ public partial class AuthServerModule : AbpModule var hostingEnvironment = context.Services.GetHostingEnvironment(); PreConfigureAuth(); + PreConfigureWrapper(); PreConfigureFeature(); PreForwardedHeaders(); PreConfigureApp(configuration); @@ -99,6 +103,7 @@ public partial class AuthServerModule : AbpModule var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); + ConfigureBlobStoring(configuration); ConfigureCaching(configuration); ConfigureIdentity(configuration); ConfigureVirtualFileSystem(); diff --git a/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj b/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj index 6966dca54..adf0bca71 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj +++ b/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj @@ -80,6 +80,7 @@ + @@ -88,4 +89,10 @@ + + + PreserveNewest + + + diff --git a/aspnet-core/services/LY.MicroService.AuthServer/openiddict.pfx b/aspnet-core/services/LY.MicroService.AuthServer/openiddict.pfx index 9843cc189518aaad073ac8d1b64c742fe3d995e6..52ec5f902b2a8f2521ee115e84709af21f828c04 100644 GIT binary patch delta 2474 zcmV;b303yw6xMP}w19@{#0RawI!oiAXZ!eKh!cERQEI}(s-}W2-)g^Wa!IHo9!PMp`ifSN-pfh*5LZTGSwsG& zz$U$8Y4nepVG%GE#=|6|rA8;%)PHjlcKP`+$k@5(MKI}0_vX-YSoVm)t6zhMouYZH);NPTo z?q*b@!8b2(fKxP#sVjCUmac$x*IFvIV-kH~+NrVsi1pjw{qlN!$WTlP#BP1sqV>lu zdO;JnCz=eo+|{z&s02tIPO4(&%K~D|&_7m?!RIT!IQ1ElcKWexDZ7yz=EEXn|FOHe zo1zI~`7zSDnua)OlMulczL<2wkp|=Y^`R)u z7D`xeY|zDQBH}Km2F>>AO=n-=sfi~t7MVFE|H6rJU2VfBLfL(deDlqMKhd^%g0v~*%TKgGHcN)ICck9~yZR~t{ zvy%bn^Za=d@L@X7QJ^lI? z-S!ZF7EHL*m^=7a)0$c*P6u|j=6hd%8U|LU4pFv}{fXMzXlEdq=m#{Y3zl)9?6GMKJkqyC~p=L;6QRTBB!tFHg|*j#AY5 zO0AC$B+?fqKSm5~xXe9R<2_RCaw#lXeU{LR1G=(^SAEKVT4VS{;q$|~@tj{}c{1@e zjIx6jN@2^y@AYa@!0QAv^96lGzAymz4D*SVN#Yp)9a+VaK>$JkEdWLUH~>TdLjWxRGypLGG5|pUEdV(HF#tjUHUKRE zFaSaTGypjOGXO>aF#t0FK>#@bGXOG^vjt>-2L=f$hDe6@4FLxRpn?PVFoFa00s#Op zf&=Xa2`Yw2hW8Bt2LUh~1_~;MNQU|6SCWYn_plnwl;0jEqZ_Q1+!n;5vQwFx=zn+mzzSDr#FmON=ji3>}L0W znpl$3?Q=0hNL%6Td=9)8OQJp>4Ad5GsR<}}TQ_Proze78{RH6aiUp|hrx zfOP!xiEI8LJk1|M3%vdv5#zFd_*YskHCdBCz(e8%qQ6z((ys6-UNZ1IoCrUUBjM=mnIuh*_UAAB@W$_D;WyUQX!R%3048t zg6t`0`iHq30%+Wgs?3{Bv#`gY`4$#WY`%yafL42&68d~Y$;`5J{Jo$&1Iaijb-425 z-l1_*pBRdEF5fXWowHFIZzi>4kYrYPl)EDcymFk&Ib-(70Gs|Im7qO^N+G^~9JQ_N zG@?L}iRz16TE+6>x5#rW{Q@r6s-G84D>fc2xB||Bg)uxzkm_Uo(Z%uAPOf2zsu#{ zp7Sr63|A!-r=MWV8x@HKXzL1p9e5J2Tt7tTX@U>~&uk2;%CF5VJ^=h?fF9~`#_|=z-Y|BTINx=fqIS8 zy?&N7x}JlfLEX9eN+-}61;~-(2y3|a;fdKGVfVG{>fInkKYBnkxt|7q#sYa25rCpQ z|F$Bn)2U+D5;H8s;I3zgE)g(`lm+4YH_Jq`OvhSvEsEM;UlWyw{66H}8= zPwtFuBN~SrHD8qQ{8Sb=s2sKf==I$er$(x7ouLM9Sb(|aGqju=xI~jeJ@;CsnfM!6 z=@=hWa?Y0~bLuz|4Zb_)@Q?blHE5ntGz+!Q3l2Wo5D@%aP7cg}R}Tq#K1Mynv=9r3hC+XQF4NP`zXMT3zu@Mk!g1rkm-~Iaw{5PlC!?#NtGW;jl)cme|ZOJ z{mQnYT0oId+MlnENW|WdKD%Nn4%kEz5D=@tpJz|c!eKHVQ03fE% z=)Iy?C^iLq;%!n*$1VZS*(#oJ!#={qhw&#gFgq|GFb4(&D-Ht!8Uz$xUQwldi~E*V oY$J9KWOaZQbduWy6kM>wJwmW2Q!nYxgBt<8 delta 2482 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