diff --git a/ZR.Admin.WebApi/Framework/JsonConverterUtil.cs b/Infrastructure/JsonConverterUtil.cs similarity index 89% rename from ZR.Admin.WebApi/Framework/JsonConverterUtil.cs rename to Infrastructure/JsonConverterUtil.cs index e66783e..8897a67 100644 --- a/ZR.Admin.WebApi/Framework/JsonConverterUtil.cs +++ b/Infrastructure/JsonConverterUtil.cs @@ -2,7 +2,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace ZR.Admin.WebApi.Framework +namespace Infrastructure { public class JsonConverterUtil { @@ -29,7 +29,7 @@ namespace ZR.Admin.WebApi.Framework public static DateTime? ParseDateTime(string dateStr) { - if (System.Text.RegularExpressions.Regex.IsMatch(dateStr, @"^\d{4}[/-]") && DateTime.TryParse(dateStr, null,System.Globalization.DateTimeStyles.AssumeLocal, out var dateVal)) + if (System.Text.RegularExpressions.Regex.IsMatch(dateStr, @"^\d{4}[/-]") && DateTime.TryParse(dateStr, null, System.Globalization.DateTimeStyles.AssumeLocal, out var dateVal)) return dateVal; return null; } diff --git a/ZR.Admin.WebApi/Framework/CookieUtil.cs b/ZR.Admin.WebApi/Framework/CookieUtil.cs deleted file mode 100644 index 82081fd..0000000 --- a/ZR.Admin.WebApi/Framework/CookieUtil.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.AspNetCore.Authentication.JwtBearer; -using Microsoft.AspNetCore.Http; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Claims; -using System.Threading.Tasks; - -namespace ZR.Admin.WebApi.Framework -{ - public class CookieUtil - { - public static void WhiteCookie(HttpContext context, List claims) - { - //2.创建声明主题 指定认证方式 这里使用cookie - var claimsIdentity = new ClaimsIdentity(claims, "Login"); - - Task.Run(async () => - { - await context.SignInAsync( - JwtBearerDefaults.AuthenticationScheme,//这里要注意的是HttpContext.SignInAsync(AuthenticationType,…) 所设置的Scheme一定要与前面的配置一样,这样对应的登录授权才会生效。 - new ClaimsPrincipal(claimsIdentity), - new AuthenticationProperties() - { - IsPersistent = true, - AllowRefresh = true, - ExpiresUtc = DateTimeOffset.Now.AddDays(1),//有效时间 - }); - }).Wait(); - } - } -}