Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

升级到net6.0

Browse Source
This commit is contained in:
不做码农
2022-03-06 14:26:05 +08:00
parent 013b6ea4db
commit 7fe07b104c
50 changed files with 306 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ZR.Admin.WebApi/Framework/CookieUtil.cs
View File

@@ -1,17 +0,0 @@
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Cookies;
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
{
}
}

12
ZR.Admin.WebApi/Framework/JwtUtil.cs
View File

@@ -1,12 +1,8 @@
using Infrastructure;
using Infrastructure.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IdentityModel.Tokens.Jwt;
using System.Linq;
using System.Security.Claims;
using System.Text;
using ZR.Admin.WebApi.Extensions;
@@ -99,7 +95,7 @@ namespace ZR.Admin.WebApi.Framework
/// </summary>
/// <param name="token">令牌</param>
/// <returns></returns>
public static IEnumerable<Claim> ParseToken(string token)
public static IEnumerable<Claim>? ParseToken(string token)
{
var tokenHandler = new JwtSecurityTokenHandler();
var validateParameter = ValidParameters();
@@ -124,13 +120,13 @@ namespace ZR.Admin.WebApi.Framework
/// </summary>
/// <param name="jwtToken"></param>
/// <returns></returns>
public static LoginUser ValidateJwtToken(IEnumerable<Claim> jwtToken)
public static LoginUser? ValidateJwtToken(IEnumerable<Claim> jwtToken)
{
try
{
var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData).Value;
var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData);
LoginUser loginUser = JsonConvert.DeserializeObject<LoginUser>(userData);
LoginUser loginUser = JsonConvert.DeserializeObject<LoginUser>(value: userData?.Value);
return loginUser;
}
catch (Exception ex)