xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改可空类型

Browse Source
This commit is contained in:
陈淳
2023-01-06 10:15:37 +08:00
parent b7c9b84449
commit 576397a042
29 changed files with 82 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/LocalizerExtend.cs
View File

@@ -22,7 +22,7 @@ namespace Yi.Framework.WebCore.AspNetCoreExtensions
public static void UseLocalizerService(this IApplicationBuilder app)
{
Result._local = app.ApplicationServices.GetService<IStringLocalizer<LocalLanguage>>();
Result._local = app.ApplicationServices.GetRequiredService<IStringLocalizer<LocalLanguage>>();
var support = new[] { "zh", "en" };
var local = new RequestLocalizationOptions().SetDefaultCulture(support[0])

2
Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbFiterExtend.cs
View File

@@ -42,7 +42,7 @@ namespace Yi.Framework.WebCore.DbExtend
var roles = userRoleMenu?.Roles;
if (roles.IsNull())
if (roles!.IsNull())
{
roles = new();
}

2
Yi.Framework.Net6/Yi.Framework.WebCore/FilterExtend/CustomExceptionFilterAttribute.cs
View File

@@ -33,7 +33,7 @@ namespace Yi.Framework.WebCore.FilterExtend
var logModel = new LogModel()
{
OriginalClassName = "",
OriginalMethodName = actionName,
OriginalMethodName = actionName??"",
Remark = $"来源于{nameof(CustomExceptionFilterAttribute)}.{nameof(OnException)}"
};
this._logger.LogError(context.Exception, $"{url}----->actionName={actionName} Message={context.Exception.Message}", JsonConvert.SerializeObject(logModel));

4
Yi.Framework.Net6/Yi.Framework.WebCore/FilterExtend/LogActionFilterAttribute.cs
View File

@@ -30,8 +30,8 @@ namespace Yi.Framework.WebCore.FilterExtend
LogModel logModel = new LogModel()
{
OriginalClassName = controllerName,
OriginalMethodName = actionName,
OriginalClassName = controllerName??"",
OriginalMethodName = actionName ?? "",
Remark = $"来源于{nameof(LogActionFilterAttribute)}.{nameof(OnActionExecuting)}"
};

2
Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CurrentUserExrension.cs
View File

@@ -53,7 +53,7 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
//通过鉴权之后，开始赋值
_currentUser.IsAuthenticated = true;
_currentUser.Id = claims.GetClaim(JwtRegisteredClaimNames.Sid) is null ? 0 : Convert.ToInt64(claims.GetClaim(JwtRegisteredClaimNames.Sid));
_currentUser.UserName = claims.GetClaim(SystemConst.UserName);
_currentUser.UserName = claims.GetClaim(SystemConst.UserName)??"";
_currentUser.Permission = claims.GetClaims(SystemConst.PermissionClaim);
_currentUser.TenantId = claims.GetClaim(SystemConst.TenantId) is null ? null : Guid.Parse(claims.GetClaim(SystemConst.TenantId)!);
await _next(context);