From dd79d5e6f8e427453774243d650748d265debee2 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 7 Jan 2020 08:45:17 +0800
Subject: [PATCH] update

Former-commit-id: a4adcbac5443655ce869307da0a2ed0fb59b09b7
---
 .../Extensions/HttpContextExtensions.cs              |  4 ++--
 projects/UserCenter/Controllers/TokenController.cs   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

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<double>("AccessTokenHours", 0.5))),
-                        RefreshToken = Request.HttpContext.GetToken(model.UserName, false, _cfg, DateTime.Now.AddHours(_cfg.GetValue<double>("AccessTokenHours", 720))),
+                        AccessToken = Request.HttpContext.GetToken(model.UserName, _cfg, DateTime.Now.AddHours(_cfg.GetValue<double>("AccessTokenHours", 0.5))),
+                        RefreshToken = Request.HttpContext.GetToken(model.UserName, _cfg, DateTime.Now.AddHours(_cfg.GetValue<double>("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<double>("AccessTokenHours", 0.5))),
-                    RefreshToken = Request.HttpContext.GetToken(userName, false, _cfg, DateTime.Now.AddHours(_cfg.GetValue<double>("AccessTokenHours", 720))),
+                    AccessToken = Request.HttpContext.GetToken(userName, _cfg, DateTime.Now.AddHours(_cfg.GetValue<double>("AccessTokenHours", 0.5))),
+                    RefreshToken = Request.HttpContext.GetToken(userName, _cfg, DateTime.Now.AddHours(_cfg.GetValue<double>("AccessTokenHours", 720))),
                 });
             }
             catch (Exception ex)