diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs index 13902a5d..dadaa9ce 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs @@ -38,7 +38,7 @@ public record Sys_RequestLog : ImmutableEntity, IFieldCreatedClient #if DBTYPE_SQLITE [Column(Position = -1, DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #else - [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_MAX)] + [Column(Position = -1, DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif [JsonIgnore] public string CreatedReferer { get; init; } @@ -49,7 +49,7 @@ public record Sys_RequestLog : ImmutableEntity, IFieldCreatedClient #if DBTYPE_SQLITE [Column(Position = -1, DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #else - [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_MAX)] + [Column(Position = -1, DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_1022)] #endif [JsonIgnore] public virtual string CreatedUserAgent { get; init; } @@ -110,7 +110,7 @@ public record Sys_RequestLog : ImmutableEntity, IFieldCreatedClient #if DBTYPE_SQLITE [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #else - [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_MAX)] + [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif [JsonIgnore] public virtual string ReferUrl { get; init; } diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs index 12f2aa59..6e3ee237 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs @@ -88,7 +88,7 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister #if DBTYPE_SQLITE [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #else - [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_MAX)] + [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] #endif [JsonIgnore] public virtual string Summary { get; init; } diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginRsp.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginRsp.cs index c0dec41a..81f99b75 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginRsp.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/LoginRsp.cs @@ -21,7 +21,7 @@ public sealed record LoginRsp : DataAbstraction public void SetToRspHeader() { // 设置响应报文头 - App.HttpContext.Response.Headers[Chars.FLG_HTTP_HEADER_VALUE_ACCESS_TOKEN] = AccessToken; + App.HttpContext.Response.Headers[Chars.FLG_HTTP_HEADER_KEY_ACCESS_TOKEN] = AccessToken; App.HttpContext.Response.Headers[Chars.FLG_HTTP_HEADER_KEY_X_ACCESS_TOKEN] = RefreshToken; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Infrastructure/Constant/Chars.cs b/src/backend/NetAdmin.Infrastructure/Constant/Chars.cs index 46e0ce5b..c63044b7 100644 --- a/src/backend/NetAdmin.Infrastructure/Constant/Chars.cs +++ b/src/backend/NetAdmin.Infrastructure/Constant/Chars.cs @@ -47,6 +47,7 @@ public static class Chars public const string FLG_FREE_SQL_GLOBAL_FILTER_MEMBER = nameof(FLG_FREE_SQL_GLOBAL_FILTER_MEMBER); public const string FLG_FREE_SQL_GLOBAL_FILTER_SELF = nameof(FLG_FREE_SQL_GLOBAL_FILTER_SELF); public const string FLG_FREE_SQL_GLOBAL_FILTER_TENANT = nameof(FLG_FREE_SQL_GLOBAL_FILTER_TENANT); + public const string FLG_HTTP_HEADER_KEY_ACCESS_TOKEN = "ACCESS-TOKEN"; public const string FLG_HTTP_HEADER_KEY_AUTHORIZATION = "Authorization"; public const string FLG_HTTP_HEADER_KEY_REFERER = "Referer"; public const string FLG_HTTP_HEADER_KEY_USER_AGENT = "User-Agent"; @@ -54,7 +55,6 @@ public static class Chars public const string FLG_HTTP_HEADER_KEY_X_ACCESS_TOKEN_HEADER_KEY = "X-Authorization"; public const string FLG_HTTP_HEADER_KEY_X_FORWARDED_FOR = "X-Forwarded-For"; public const string FLG_HTTP_HEADER_KEY_X_REAL_IP = "X-Real-IP"; - public const string FLG_HTTP_HEADER_VALUE_ACCESS_TOKEN = "ACCESS-TOKEN"; public const string FLG_HTTP_HEADER_VALUE_APPLICATION_JSON = "application/json"; public const string FLG_HTTP_HEADER_VALUE_APPLICATION_URLENCODED = "application/x-www-form-urlencoded"; public const string FLG_HTTP_HEADER_VALUE_AUTH_SCHEMA = "Bearer"; diff --git a/src/backend/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs b/src/backend/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs index 2d804c54..c3627b55 100644 --- a/src/backend/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs +++ b/src/backend/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs @@ -132,7 +132,7 @@ public sealed class ScheduledJob : WorkBase, IJob ret = ret.SetBody(job.RequestBody); } - return ret.OnResponsing(GetRequestHeader).OnException(GetRequestHeader); + return ret.SetLog(_logger).OnResponsing(GetRequestHeader).OnException(GetRequestHeader); } private void GetRequestHeader(HttpClient _, HttpResponseMessage rsp, string __)