diff --git a/projects/Infrastructure/Extensions/HttpContextExtensions.cs b/projects/Infrastructure/Extensions/HttpContextExtensions.cs index 0da880ae..aaeb3ab0 100644 --- a/projects/Infrastructure/Extensions/HttpContextExtensions.cs +++ b/projects/Infrastructure/Extensions/HttpContextExtensions.cs @@ -24,7 +24,7 @@ namespace Infrastructure.Extensions public static void SignIn(this HttpContext httpContext, string userName, bool rememberMe, IConfiguration cfg) { - var token = httpContext.GetToken(userName, rememberMe, cfg, DateTime.Now.AddYears(1)); + var token = httpContext.GetToken(userName, cfg, DateTime.Now.AddYears(1)); var cookieOptions = new CookieOptions { HttpOnly = true @@ -37,7 +37,7 @@ namespace Infrastructure.Extensions httpContext.Response.Cookies.Append("jwt", token, cookieOptions); } - public static string GetToken(this HttpContext httpContext, string userName, bool rememberMe, IConfiguration cfg, DateTime expires) + public static string GetToken(this HttpContext httpContext, string userName, IConfiguration cfg, DateTime expires) { var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(cfg["jwt:key"])); var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); diff --git a/projects/UserCenter/Controllers/TokenController.cs b/projects/UserCenter/Controllers/TokenController.cs index a8399802..c506a603 100644 --- a/projects/UserCenter/Controllers/TokenController.cs +++ b/projects/UserCenter/Controllers/TokenController.cs @@ -99,13 +99,13 @@ namespace UserCenter.Controllers { return Ok(new { - AccessToken = Request.HttpContext.GetToken(model.UserName, false, _cfg, DateTime.Now.AddHours(_cfg.GetValue("AccessTokenHours", 0.5))), - RefreshToken = Request.HttpContext.GetToken(model.UserName, false, _cfg, DateTime.Now.AddHours(_cfg.GetValue("AccessTokenHours", 720))), + AccessToken = Request.HttpContext.GetToken(model.UserName, _cfg, DateTime.Now.AddHours(_cfg.GetValue("AccessTokenHours", 0.5))), + RefreshToken = Request.HttpContext.GetToken(model.UserName, _cfg, DateTime.Now.AddHours(_cfg.GetValue("AccessTokenHours", 720))), }); } else { - return BadRequest(ModelState); + return Unauthorized(ModelState); } } catch (Exception ex) @@ -124,13 +124,13 @@ namespace UserCenter.Controllers if (DateTime.UtcNow > token.ValidTo) { ModelState.AddModelError("", "已过期"); - return BadRequest(ModelState); + return Unauthorized(ModelState); } var userName = token.Claims.FirstOrDefault(o => o.Type == ClaimTypes.Name).Value; return Ok(new { - AccessToken = Request.HttpContext.GetToken(userName, false, _cfg, DateTime.Now.AddHours(_cfg.GetValue("AccessTokenHours", 0.5))), - RefreshToken = Request.HttpContext.GetToken(userName, false, _cfg, DateTime.Now.AddHours(_cfg.GetValue("AccessTokenHours", 720))), + AccessToken = Request.HttpContext.GetToken(userName, _cfg, DateTime.Now.AddHours(_cfg.GetValue("AccessTokenHours", 0.5))), + RefreshToken = Request.HttpContext.GetToken(userName, _cfg, DateTime.Now.AddHours(_cfg.GetValue("AccessTokenHours", 720))), }); } catch (Exception ex)