From 86a5e4ab19937003d26984283f878e0d2cb7f807 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期五, 29 八月 2025 10:17:49 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.CommonServer.Application/LogRecords/Commands/ResendResourceCommandHandler.cs | 17 ++++++++++++++++- FlexJobApi.Core/Utils/ResourceUtils/ResourceHttpProvider/DefaultResourceHttpProvider.cs | 8 ++++---- FlexJobApi.Core/FlexJobApi.Core.xml | 10 ++++++++++ FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml | 2 +- FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs | 1 + 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/FlexJobApi.CommonServer.Application/LogRecords/Commands/ResendResourceCommandHandler.cs b/FlexJobApi.CommonServer.Application/LogRecords/Commands/ResendResourceCommandHandler.cs index 80a8d77..396b1bb 100644 --- a/FlexJobApi.CommonServer.Application/LogRecords/Commands/ResendResourceCommandHandler.cs +++ b/FlexJobApi.CommonServer.Application/LogRecords/Commands/ResendResourceCommandHandler.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Net; using System.Text; using System.Threading.Tasks; @@ -38,6 +39,7 @@ { it.Method, it.Path, + it.RequestHeaders, it.Request, it.CreatedUserId }) @@ -60,7 +62,20 @@ }) .request .ToJson(); - var result = await paramters.SendHttpAsync(resource.ServiceName, resource.Route, resource.Method); + string? accessToken = null, refreshToken = null; + if (log.RequestHeaders.IsNotNull()) + { + var headers = log.RequestHeaders.JsonTo<Dictionary<string, List<string>>>(); + if (headers.ContainsKey("Authorization")) + { + accessToken = headers["Authorization"].FirstOrDefault(); + } + if (headers.ContainsKey("X-Authorization")) + { + refreshToken = headers["X-Authorization"].FirstOrDefault(); + } + } + var result = await paramters.SendHttpAsync(resource.ServiceName, resource.Route, resource.Method, accessToken: accessToken, refreshToken: refreshToken); return result; } } diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml index 10c11d2..9b24df1 100644 --- a/FlexJobApi.Core/FlexJobApi.Core.xml +++ b/FlexJobApi.Core/FlexJobApi.Core.xml @@ -5865,6 +5865,11 @@ 浜哄憳淇℃伅 </summary> </member> + <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQueryResult.Date"> + <summary> + 楠屾敹鏃堕棿 + </summary> + </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQueryResult.CreatedTime"> <summary> 鎻愪氦鏃堕棿 @@ -6006,6 +6011,11 @@ 鎻愪氦Id </summary> </member> + <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultItem.Date"> + <summary> + 楠屾敹鏃堕棿 + </summary> + </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResultItem.CreatedTime"> <summary> 鎻愪氦鏃堕棿 diff --git a/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs b/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs index 813c6d3..c0835dc 100644 --- a/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs +++ b/FlexJobApi.Core/Utils/JwtUtils/JwtUtils.cs @@ -90,6 +90,7 @@ { if (accessToken.IsNotNull()) { + accessToken = accessToken.Replace("Bearer ", null); var claims = JWTEncryption.ReadJwtToken(accessToken)?.Claims; if (claims != null) { diff --git a/FlexJobApi.Core/Utils/ResourceUtils/ResourceHttpProvider/DefaultResourceHttpProvider.cs b/FlexJobApi.Core/Utils/ResourceUtils/ResourceHttpProvider/DefaultResourceHttpProvider.cs index 6072b2a..08a3ec5 100644 --- a/FlexJobApi.Core/Utils/ResourceUtils/ResourceHttpProvider/DefaultResourceHttpProvider.cs +++ b/FlexJobApi.Core/Utils/ResourceUtils/ResourceHttpProvider/DefaultResourceHttpProvider.cs @@ -36,8 +36,8 @@ var logier = await accessToken.GetCurrentLogier(); if (logier != null) { - builder = WithHeader(builder, "Authorization", logier.AccessToken); - builder = WithHeader(builder, "X-Authorization", logier.RefreshToken); + builder = WithHeader(builder, "Authorization", $"Bearer {logier.AccessToken}"); + builder = WithHeader(builder, "X-Authorization", $"Bearer {logier.RefreshToken}"); response = await httpRemoteService.SendAsStringAsync(builder); } } @@ -51,7 +51,7 @@ string value = null; if (builder.Headers?.ContainsKey(name) ?? false) { - value = builder.Headers[name].ToString(); + value = builder.Headers[name].FirstOrDefault(); } else if (App.HttpContext.Request.Headers.ContainsKey(name)) { @@ -65,7 +65,7 @@ value ??= GetHeaderValue(builder, name); if (value.IsNotNull()) { - builder = builder.WithHeader(name, value); + builder = builder.WithHeader(name, value, replace: true); } return builder; } diff --git a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml index e23b688..00800d5 100644 --- a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml +++ b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml @@ -374,7 +374,7 @@ 鐏靛伐鍛戒护澶勭悊鍣� </summary> </member> - <member name="M:FlexJobApi.UserServer.Application.EnterpriseEmployeesCommandHandler.#ctor(MediatR.IMediator,Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseEmployee},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.User},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.Enterprise},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseEmployeeContract},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.ElectronSignSetting},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.ContractTemplate},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseCost})"> + <member name="M:FlexJobApi.UserServer.Application.EnterpriseEmployeesCommandHandler.#ctor(MediatR.IMediator,Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseEmployee},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.User},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.Enterprise},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseEmployeeContract},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.ElectronSignSetting},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.ContractTemplate},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseCost},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.TaskInfoUser})"> <summary> 鐏靛伐鍛戒护澶勭悊鍣� </summary> -- Gitblit v1.9.1