From 0842d1b4ec68a2810b28ec4a75cb177443d082b9 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, 31 May 2023 22:31:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E8=84=B1?=
 =?UTF-8?q?=E6=95=8F=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extensions/HttpContextExtension.cs        | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs b/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs
index 52f98d4..8940c00 100644
--- a/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs
@@ -1,10 +1,5 @@
 using Infrastructure;
 using Infrastructure.Extensions;
-using Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Security.Claims;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -16,7 +11,7 @@ namespace ZR.Admin.WebApi.Extensions
     /// <summary>
     /// HttpContext扩展类
     /// </summary>
-    public static class HttpContextExtension
+    public static partial class HttpContextExtension
     {
         /// <summary>
         /// 是否是ajax请求
@@ -33,7 +28,7 @@ namespace ZR.Admin.WebApi.Extensions
             //return request.Headers.ContainsKey("X-Requested-With") &&
             //       request.Headers["X-Requested-With"].Equals("XMLHttpRequest");
 
-            return request.Headers["X-Requested-With"] == "XMLHttpRequest" || (request.Headers != null && request.Headers["X-Requested-With"] == "XMLHttpRequest");
+            return request.Headers["X-Requested-With"] == "XMLHttpRequest" || request.Headers != null && request.Headers["X-Requested-With"] == "XMLHttpRequest";
         }
 
         /// <summary>
@@ -101,7 +96,7 @@ namespace ZR.Admin.WebApi.Extensions
         /// <returns></returns>
         public static bool IsAdmin(this HttpContext context)
         {
-            var userName = GetName(context);
+            var userName = context.GetName();
             return userName == GlobalConstant.AdminRole;
         }
 
@@ -143,7 +138,7 @@ namespace ZR.Admin.WebApi.Extensions
         /// <returns></returns>
         public static ClientInfo GetClientInfo(this HttpContext context)
         {
-            var str = GetUserAgent(context);
+            var str = context.GetUserAgent();
             var uaParser = Parser.GetDefault();
             ClientInfo c = uaParser.Parse(str);
 
@@ -187,16 +182,19 @@ namespace ZR.Admin.WebApi.Extensions
                 param = reader.ReadToEndAsync().Result;
                 if (param.IsEmpty())
                 {
-                    param = GetQueryString(context);
+                    param = context.GetQueryString();
                 }
+                param = PwdRep().Replace(param, "***");
             }
             else
             {
-                param = GetQueryString(context);
+                param = context.GetQueryString();
             }
             operLog.OperParam = param;
         }
 
+        [GeneratedRegex("(?<=\"password\":\")[^\",]*")]
+        private static partial Regex PwdRep();
     }
 
 }