添加登录日志功能

2022-10-02 14:02:21 +08:00
parent 2b02194a18
commit e963a4051f
12 changed files with 165 additions and 37 deletions
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
@@ -297,6 +297,14 @@
            </summary>
            <returns></returns>
        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.LoginLogController.PageList(Yi.Framework.Model.Models.LoginLogEntity,Yi.Framework.Common.Models.PageParModel)">
+            <summary>
+            动态条件分页查询
+            </summary>
+            <param name="loginLog"></param>
+            <param name="page"></param>
+            <returns></returns>
+        </member>
        <member name="T:Yi.Framework.ApiMicroservice.Controllers.MenuController">
            <summary>
            菜单管理
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
@@ -33,12 +33,14 @@ namespace Yi.Framework.ApiMicroservice.Controllers
        private JwtInvoker _jwtInvoker;
        private ILogger _logger;
        private SecurityCodeHelper _securityCode;
+        private IRepository<UserEntity> _repository;
        public AccountController(ILogger<UserEntity> logger, IUserService iUserService, JwtInvoker jwtInvoker, SecurityCodeHelper securityCode)
        {
            _iUserService = iUserService;
            _jwtInvoker = jwtInvoker;
            _logger = logger;
            _securityCode = securityCode;
+            _repository = iUserService._repository;
        }

        /// <summary>
@@ -67,13 +69,22 @@ namespace Yi.Framework.ApiMicroservice.Controllers
        {
            //跳过，需要redis缓存获取uuid与code的关系，进行比较即可
            //先效验验证码和UUID
+            //登录还需要进行登录日志的落库
+
+            var loginInfo = HttpContext.GetLoginLogInfo();
+            loginInfo.LoginUser = loginDto.UserName;
+            loginInfo.LogMsg = "登录成功！";
+            var loginLogRepository = _repository.ChangeRepository<Repository<LoginLogEntity>>();
            UserEntity user = new();
            if (await _iUserService.Login(loginDto.UserName, loginDto.Password, o => user = o))
            {
                var userRoleMenu = await _iUserService.GetUserAllInfo(user.Id);
-                return Result.Success("登录成功！").SetData(new { token = _jwtInvoker.GetAccessToken(userRoleMenu.User, userRoleMenu.Menus) });
+                await loginLogRepository.InsertReturnSnowflakeIdAsync(loginInfo);
+                return Result.Success(loginInfo.LogMsg).SetData(new { token = _jwtInvoker.GetAccessToken(userRoleMenu.User, userRoleMenu.Menus) });
            }
-            return Result.Error("登录失败！用户名或者密码错误！");
+            loginInfo.LogMsg = "登录失败！用户名或者密码错误！";
+            await loginLogRepository.InsertReturnSnowflakeIdAsync(loginInfo);
+            return Result.Error(loginInfo.LogMsg);
        }


--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/LoginLogController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/LoginLogController.cs
@@ -17,12 +17,25 @@ namespace Yi.Framework.ApiMicroservice.Controllers
 {
    [ApiController]
    [Route("api/[controller]/[action]")]
-    public class LoginLogController : BaseCrudController<LoginLogEntity>
+    public class LoginLogController : BaseSimpleCrudController<LoginLogEntity>
    {
        private ILoginLogService _iLoginLogService;
        public LoginLogController(ILogger<LoginLogEntity> logger, ILoginLogService iLoginLogService) : base(logger, iLoginLogService)
        {
            _iLoginLogService = iLoginLogService;
        }
+
+        /// <summary>
+        /// 动态条件分页查询
+        /// </summary>
+        /// <param name="loginLog"></param>
+        /// <param name="page"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Result> PageList([FromQuery] LoginLogEntity loginLog, [FromQuery] PageParModel page)
+        {
+            return Result.Success().SetData(await _iLoginLogService.SelctPageList(loginLog, page));
+        }
+
    }
 }
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
--- a/Yi.Framework.Net6/Yi.Framework.Common/Yi.Framework.Common.csproj
+++ b/Yi.Framework.Net6/Yi.Framework.Common/Yi.Framework.Common.csproj
@@ -11,6 +11,7 @@
    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="6.0.3" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
    <PackageReference Include="SharpZipLib" Version="1.3.3" />
+    <PackageReference Include="UAParser" Version="3.1.47" />
  </ItemGroup>

  <ItemGroup>
--- a/Yi.Framework.Net6/Yi.Framework.Interface/ILoginLogService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/ILoginLogService.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Interface
+{
+   public partial interface ILoginLogService:IBaseService<LoginLogEntity>
+    {
+        Task<PageModel<List<LoginLogEntity>>> SelctPageList(LoginLogEntity loginLog, PageParModel page);
+    }
+}
--- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILoginLogService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILoginLogService.cs
@@ -1,9 +1,13 @@
-using Yi.Framework.Model.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Model.Models;
 using Yi.Framework.Repository;

 namespace Yi.Framework.Interface
 {
-   public partial interface ILoginLogService:IBaseService<LoginLogEntity>
-    {   
+    public partial interface ILoginLogService : IBaseService<LoginLogEntity>
+    {
+      
    }
 }
--- a/Yi.Framework.Net6/Yi.Framework.Service/LoginLogService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/LoginLogService.cs
@@ -0,0 +1,27 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Service
+{
+    public partial class LoginLogService : BaseService<LoginLogEntity>, ILoginLogService
+    {
+        public async Task<PageModel<List<LoginLogEntity>>> SelctPageList(LoginLogEntity loginLog, PageParModel page)
+        {
+            RefAsync<int> total = 0;
+            var data = await _repository._DbQueryable
+                    .WhereIF(!string.IsNullOrEmpty(loginLog.LoginIp), u => u.LoginIp.Contains(loginLog.LoginIp))
+                        .WhereIF(!string.IsNullOrEmpty(loginLog.LoginUser), u => u.LoginUser.Contains(loginLog.LoginUser))
+                     .WhereIF(loginLog.IsDeleted.IsNotNull(), u => u.IsDeleted == loginLog.IsDeleted)
+                     .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime)
+                    .OrderBy(u => u.OrderNum, OrderByType.Desc)
+                    .ToPageListAsync(page.PageNum, page.PageSize, total);
+            return new PageModel<List<LoginLogEntity>>(data, total);
+        }
+    }
+}
--- a/Yi.Framework.Net6/Yi.Framework.Service/OperationLogService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/OperationLogService.cs
@@ -19,7 +19,7 @@ namespace Yi.Framework.Service
                        .WhereIF(!string.IsNullOrEmpty(operationLog.OperUser), u => u.OperUser.Contains(operationLog.OperUser))
                        .WhereIF(operationLog.OperType is not null, u => u.OperType==operationLog.OperType.GetHashCode())
                     .WhereIF(operationLog.IsDeleted.IsNotNull(), u => u.IsDeleted == operationLog.IsDeleted)
-
+                     .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime)
                    .OrderBy(u => u.OrderNum, OrderByType.Desc)
                    .ToPageListAsync(page.PageNum, page.PageSize, total);

--- a/Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/HttpContextExtend.cs
+++ b/Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/HttpContextExtend.cs
@@ -11,6 +11,7 @@ using Yi.Framework.Model.Models;
 using System.IdentityModel.Tokens.Jwt;
 using System.IO;
 using System.Text.RegularExpressions;
+using UAParser;

 namespace Yi.Framework.WebCore
 {
@@ -165,6 +166,19 @@ namespace Yi.Framework.WebCore
            return param;
        }

+        /// <summary>
+        /// 获取客户端信息
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public static ClientInfo GetClientInfo(this HttpContext context)
+        {
+            var str = GetUserAgent(context);
+            var uaParser = Parser.GetDefault();
+            ClientInfo c = uaParser.Parse(str);
+            return c;
+        }
+

        /// <summary>
        /// 获取客户端IP
@@ -191,5 +205,41 @@ namespace Yi.Framework.WebCore
            return result;
        }

+        /// <summary>
+        /// 获取浏览器标识
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public static string GetUserAgent(this HttpContext context)
+        {
+            return context.Request.Headers["User-Agent"];
+        }
+
+
+        /// <summary>
+        /// 记录用户登陆信息
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public static LoginLogEntity GetLoginLogInfo(this HttpContext context)
+        {
+            var ipAddr = context.GetClientIp();
+            //var ip_info = IpTool.Search(ipAddr);
+            //var location = "广州" + "-" + "深圳";
+            ClientInfo clientInfo = context.GetClientInfo();
+            LoginLogEntity entity = new()
+            {
+                Browser = clientInfo.Device.Family,
+                Os = clientInfo.OS.ToString(),
+                LoginIp = ipAddr,
+                //登录是没有token的，所有是获取不到用户名，需要在控制器赋值
+                //LoginUser = context.GetUserNameInfo(),
+                LoginLocation = "广州" + "-" + "深圳",
+                IsDeleted = false
+            };
+
+            return entity;
+        }
+
    }
 }
--- a/Yi.Vue3.X.RuoYi/src/api/monitor/logininfor.js
+++ b/Yi.Vue3.X.RuoYi/src/api/monitor/logininfor.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询登录日志列表
 export function list(query) {
  return request({
-    url: '/monitor/logininfor/list',
+    url: '/loginLog/pageList',
    method: 'get',
    params: query
  })
@@ -12,8 +12,9 @@ export function list(query) {
 // 删除登录日志
 export function delLogininfor(infoId) {
  return request({
-    url: '/monitor/logininfor/' + infoId,
-    method: 'delete'
+    url: '/loginLog/delList',
+    method: 'delete',
+    data:"string"==typeof(infoId)?[infoId]:infoId
  })
 }

--- a/Yi.Vue3.X.RuoYi/src/views/monitor/logininfor/index.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/monitor/logininfor/index.vue
@@ -1,27 +1,27 @@
 <template>
   <div class="app-container">
      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-         <el-form-item label="登录地址" prop="ipaddr">
+         <el-form-item label="登录Ip" prop="loginIp">
            <el-input
-               v-model="queryParams.ipaddr"
-               placeholder="请输入登录地址"
+               v-model="queryParams.loginIp"
+               placeholder="请输入登录Ip"
               clearable
               style="width: 240px;"
               @keyup.enter="handleQuery"
            />
         </el-form-item>
-         <el-form-item label="用户名称" prop="userName">
+         <el-form-item label="用户名称" prop="loginUser">
            <el-input
-               v-model="queryParams.userName"
+               v-model="queryParams.loginUser"
               placeholder="请输入用户名称"
               clearable
               style="width: 240px;"
               @keyup.enter="handleQuery"
            />
         </el-form-item>
-         <el-form-item label="状态" prop="status">
+         <el-form-item label="状态" prop="isDeleted">
            <el-select
-               v-model="queryParams.status"
+               v-model="queryParams.isDeleted"
               placeholder="登录状态"
               clearable
               style="width: 240px"
@@ -94,21 +94,21 @@

      <el-table ref="logininforRef" v-loading="loading" :data="logininforList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="访问编号" align="center" prop="infoId" />
-         <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
-         <el-table-column label="地址" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
+         <el-table-column label="访问编号" align="center" prop="id" />
+         <el-table-column label="用户名称" align="center" prop="loginUser" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
+         <el-table-column label="地址" align="center" prop="loginIp" :show-overflow-tooltip="true" />
         <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
         <el-table-column label="操作系统" align="center" prop="os" :show-overflow-tooltip="true" />
         <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
-         <el-table-column label="登录状态" align="center" prop="status">
+         <el-table-column label="登录状态" align="center" prop="isDeleted">
            <template #default="scope">
-               <dict-tag :options="sys_common_status" :value="scope.row.status" />
+               <dict-tag :options="sys_common_status" :value="scope.row.isDeleted" />
            </template>
         </el-table-column>
         <el-table-column label="描述" align="center" prop="msg" />
-         <el-table-column label="访问时间" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+         <el-table-column label="访问时间" align="center" prop="createTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
            <template #default="scope">
-               <span>{{ parseTime(scope.row.loginTime) }}</span>
+               <span>{{ parseTime(scope.row.createTime) }}</span>
            </template>
         </el-table-column>
      </el-table>
@@ -138,15 +138,15 @@ const multiple = ref(true);
 const selectName = ref("");
 const total = ref(0);
 const dateRange = ref([]);
-const defaultSort = ref({ prop: "loginTime", order: "descending" });
+const defaultSort = ref({ prop: "createTime", order: "descending" });

 // 查询参数
 const queryParams = ref({
  pageNum: 1,
  pageSize: 10,
-  ipaddr: undefined,
-  userName: undefined,
-  status: undefined,
+  loginIp: undefined,
+  loginUser: undefined,
+  isDeleted: undefined,
  orderByColumn: undefined,
  isAsc: undefined
 });
@@ -155,8 +155,8 @@ const queryParams = ref({
 function getList() {
  loading.value = true;
  list(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
-    logininforList.value = response.rows;
-    total.value = response.total;
+    logininforList.value = response.data.data;
+    total.value = response.data.total;
    loading.value = false;
  });
 }
@@ -174,10 +174,10 @@ function resetQuery() {
 }
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.infoId);
+  ids.value = selection.map(item => item.id);
  multiple.value = !selection.length;
  single.value = selection.length != 1;
-  selectName.value = selection.map(item => item.userName);
+  selectName.value = selection.map(item => item.loginUser);
 }
 /** 排序触发事件 */
 function handleSortChange(column, prop, order) {
@@ -187,7 +187,7 @@ function handleSortChange(column, prop, order) {
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const infoIds = row.infoId || ids.value;
+  const infoIds = row.id || ids.value;
  proxy.$modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?').then(function () {
    return delLogininfor(infoIds);
  }).then(() => {
@@ -206,11 +206,11 @@ function handleClean() {
 }
 /** 解锁按钮操作 */
 function handleUnlock() {
-  const username = selectName.value;
-  proxy.$modal.confirm('是否确认解锁用户"' + username + '"数据项?').then(function () {
-    return unlockLogininfor(username);
+  const loginUser = selectName.value;
+  proxy.$modal.confirm('是否确认解锁用户"' + loginUser + '"数据项?').then(function () {
+    return unlockLogininfor(loginUser);
  }).then(() => {
-    proxy.$modal.msgSuccess("用户" + username + "解锁成功");
+    proxy.$modal.msgSuccess("用户" + loginUser + "解锁成功");
  }).catch(() => {});
 }
 /** 导出按钮操作 */