From 9dddbd874b9cda564fab8a60ce1ee24c1c39d0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 2 Mar 2022 21:55:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/SysLoginController.cs      |  7 +++----
 ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs | 15 ++++++++++-----
 ZR.Admin.WebApi/Filters/LogActionFilter.cs        |  2 +-
 ZR.Admin.WebApi/Filters/VerifyAttribute.cs        |  2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
index 72f72ce..2adb986 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
@@ -66,7 +66,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <returns></returns>
         [Route("login")]
         [HttpPost]
-        [Log(Title = "登录")]
+        //[Log(Title = "登录")]
         public IActionResult Login([FromBody] LoginBodyDto loginBody)
         {
             if (loginBody == null) { throw new CustomException("请求参数错误"); }
@@ -79,11 +79,9 @@ namespace ZR.Admin.WebApi.Controllers.System
 
             var user = sysLoginService.Login(loginBody, AsyncFactory.RecordLogInfo(httpContextAccessor.HttpContext, "0", "login"));
             
-            #region 存入cookie Action校验权限使用
             List<SysRole> roles = roleService.SelectUserRoleListByUserId(user.UserId);
             //权限集合 eg *:*:*,system:user:list
             List<string> permissions = permissionService.GetMenuPermission(user);
-            #endregion
 
             LoginUser loginUser = new(user, roles, permissions);
             CacheHelper.SetCache(GlobalConstant.UserPermKEY + user.UserId, loginUser);
@@ -104,9 +102,10 @@ namespace ZR.Admin.WebApi.Controllers.System
             //    await HttpContext.SignOutAsync();
             //}).Wait();
             var id = HttpContext.GetUId();
+            var name = HttpContext.GetName();
 
             CacheHelper.Remove(GlobalConstant.UserPermKEY + id);
-            return SUCCESS(1);
+            return SUCCESS(name);
         }
 
         /// <summary>
diff --git a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs
index 83d0981..aaf0de4 100644
--- a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs
+++ b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs
@@ -1,4 +1,5 @@
 using Infrastructure;
+using Infrastructure.Model;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using System.Collections.Generic;
@@ -68,12 +69,16 @@ namespace ZR.Admin.WebApi.Filters
                 if (!HasPermi && !Permission.Equals("common"))
                 {
                     logger.Info($"用户{info.UserName}没有权限访问{url}，当前权限[{Permission}]");
-                    context.Result = new JsonResult(new
+                    JsonResult result = new(new ApiResult()
                     {
-                        code = ResultCode.FORBIDDEN,
-                        msg = $"你当前没有权限[{Permission}]访问,请联系管理员",
-                        data = url
-                    });
+                        Code = (int)ResultCode.FORBIDDEN,
+                        Msg = $"你当前没有权限[{Permission}]访问,请联系管理员",
+                        Data = url
+                    })
+                    {
+                        ContentType = "text/json",
+                    };
+                    context.Result = result;
                 }
             }
 
diff --git a/ZR.Admin.WebApi/Filters/LogActionFilter.cs b/ZR.Admin.WebApi/Filters/LogActionFilter.cs
index 12ca295..82f0931 100644
--- a/ZR.Admin.WebApi/Filters/LogActionFilter.cs
+++ b/ZR.Admin.WebApi/Filters/LogActionFilter.cs
@@ -56,7 +56,7 @@ namespace ZR.Admin.WebApi.Filters
                 string ip = HttpContextExtension.GetClientUserIp(context.HttpContext);
                 var ip_info = IpTool.Search(ip);
 
-                SysOperLog sysOperLog = new SysOperLog
+                SysOperLog sysOperLog = new()
                 {
                     status = 0,
                     operName = userName,
diff --git a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs
index 8051b80..6391046 100644
--- a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs
+++ b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs
@@ -52,7 +52,7 @@ namespace ZR.Admin.WebApi.Filters
 
             if (info != null && info.UserId > 0)
             {
-                logger.Info($"[{info.UserId}-{userName}-{ip}]用户登录校验成功");
+                //logger.Info($"[{info.UserId}-{userName}-{ip}]用户登录校验成功");
             }
             else
             {