Merge branch 'master' into net6.0

ZR.Admin.WebApi/Framework/CookieUtil.cs

@@ -0,0 +1,34 @@
+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<Claim> 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();
+        }
+    }
+}

ZR.Admin.WebApi/Framework/JwtUtil.cs

@@ -6,8 +6,8 @@ using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text;
 using ZR.Admin.WebApi.Extensions;
-using ZR.Common;
 using ZR.Model.System;
+using ZR.Service.System;
 
 namespace ZR.Admin.WebApi.Framework
 {
@@ -127,7 +127,7 @@ namespace ZR.Admin.WebApi.Framework
             {
                 var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData).Value;
                 var loginUser = JsonConvert.DeserializeObject<LoginUser>(userData);
-                var permissions = (List<string>)CacheHelper.GetCache(GlobalConstant.UserPermKEY + loginUser?.UserId);
+                var permissions = CacheService.GetUserPerms(GlobalConstant.UserPermKEY + loginUser?.UserId);
                 if (loginUser?.UserName == "admin")
                 {
                     permissions = new List<string>() { GlobalConstant.AdminPerm };