From 69ef0f820799fcc7e371cb88681baf6a09e8a782 Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Thu, 30 Mar 2023 09:27:47 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E7=99=BB=E9=99=86=E2=80=9D=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TaskManagePlat/TaskManageService.cs        |  2 +-
 Myshipping.Core/Enum/LoginType.cs                      | 10 +++++-----
 Myshipping.Core/Myshipping.Core.xml                    |  4 ++--
 Myshipping.Core/Service/Auth/Dto/LoginOutput.cs        | 10 +++++-----
 Myshipping.Core/Service/Log/SysOpLogService.cs         |  6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
index 745a7b7b..bf41c6d5 100644
--- a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
@@ -730,7 +730,7 @@ namespace Myshipping.Application
             }
             catch (Exception ex)
             {
-                throw Oops.Bah("获取登陆人相关的任务统计信息异常,{0}", ex.Message);
+                throw Oops.Bah("获取登录人相关的任务统计信息异常,{0}", ex.Message);
             }
 
             return resultInfo;
diff --git a/Myshipping.Core/Enum/LoginType.cs b/Myshipping.Core/Enum/LoginType.cs
index 65f76a78..f1670d22 100644
--- a/Myshipping.Core/Enum/LoginType.cs
+++ b/Myshipping.Core/Enum/LoginType.cs
@@ -3,14 +3,14 @@
 namespace Myshipping.Core;
 
 /// <summary>
-/// 登陆类型
+/// 登录类型
 /// </summary>
 public enum LoginType
 {
     /// <summary>
-    /// 登陆
+    /// 登录
     /// </summary>
-    [Description("登陆")]
+    [Description("登录")]
     LOGIN = 0,
 
     /// <summary>
@@ -32,8 +32,8 @@ public enum LoginType
     CHANGEPASSWORD = 3,
 
     /// <summary>
-    /// 三方授权登陆
+    /// 三方授权登录
     /// </summary>
-    [Description("授权登陆")]
+    [Description("授权登录")]
     AUTHORIZEDLOGIN = 4
 }
diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index 23a7ed79..786176b9 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -12788,7 +12788,7 @@
         </member>
         <member name="P:Myshipping.Core.Service.OpLogInput.Name">
             <summary>
-            名称
+            操作人名称
             </summary>
         </member>
         <member name="P:Myshipping.Core.Service.OpLogInput.Success">
@@ -12863,7 +12863,7 @@
         </member>
         <member name="P:Myshipping.Core.Service.OpLogInput.Account">
             <summary>
-            操作人
+            操作人账号
             </summary>
         </member>
         <member name="T:Myshipping.Core.Service.OpLogOutput">
diff --git a/Myshipping.Core/Service/Auth/Dto/LoginOutput.cs b/Myshipping.Core/Service/Auth/Dto/LoginOutput.cs
index 6395c390..2f1a78bb 100644
--- a/Myshipping.Core/Service/Auth/Dto/LoginOutput.cs
+++ b/Myshipping.Core/Service/Auth/Dto/LoginOutput.cs
@@ -66,27 +66,27 @@ public class LoginOutput
     public int AdminType { get; set; }
 
     /// <summary>
-    /// 最后登陆IP
+    /// 最后登录IP
     /// </summary>
     public string LastLoginIp { get; set; }
 
     /// <summary>
-    /// 最后登陆时间
+    /// 最后登录时间
     /// </summary>
     public DateTime LastLoginTime { get; set; }
 
     /// <summary>
-    /// 最后登陆地址
+    /// 最后登录地址
     /// </summary>
     public string LastLoginAddress { get; set; }
 
     /// <summary>
-    /// 最后登陆所用浏览器
+    /// 最后登录所用浏览器
     /// </summary>
     public string LastLoginBrowser { get; set; }
 
     /// <summary>
-    /// 最后登陆所用系统
+    /// 最后登录所用系统
     /// </summary>
     public string LastLoginOs { get; set; }
 
diff --git a/Myshipping.Core/Service/Log/SysOpLogService.cs b/Myshipping.Core/Service/Log/SysOpLogService.cs
index 4a6047ae..a7d60100 100644
--- a/Myshipping.Core/Service/Log/SysOpLogService.cs
+++ b/Myshipping.Core/Service/Log/SysOpLogService.cs
@@ -34,10 +34,10 @@ public class SysOpLogService : ISysOpLogService, IDynamicApiController, ITransie
     {
         var opLogs = await _sysOpLogRep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.Name), u => u.Name.Contains(input.Name.Trim()))
-           .WhereIF(!string.IsNullOrWhiteSpace(input.Account), u => u.Name.Contains(input.Account.Trim()))
-           .WhereIF(!string.IsNullOrWhiteSpace(input.Ip), u => u.Name.Contains(input.Ip.Trim()))
+           .WhereIF(!string.IsNullOrWhiteSpace(input.Account), u => u.Account == input.Account.Trim())
+           .WhereIF(!string.IsNullOrWhiteSpace(input.Ip), u => u.Ip == input.Ip.Trim())
            .WhereIF(!string.IsNullOrWhiteSpace(input.Url), u => u.Name.Contains(input.Url.Trim()))
-           .WhereIF(Enum.IsDefined(typeof(YesOrNot),input.Success), u => u.Success == input.Success)
+           .WhereIF(Enum.IsDefined(typeof(YesOrNot), input.Success), u => u.Success == input.Success)
            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchBeginTime), u => u.OpTime >= DateTime.Parse(input.SearchBeginTime.Trim()) && u.OpTime <= DateTime.Parse(input.SearchEndTime.Trim()))
            .OrderBy(u => u.Id, OrderByType.Desc)
            .Select<OpLogOutput>()