From 4b060a864a40ca72e325bb899df352ca9f4aa721 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Tue, 11 Jun 2024 12:28:24 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E7=99=BB=E5=BD=95=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8C=96.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 13 +++++++------ .../visor/framework/common/constant/Const.java | 2 -- .../module/infra/controller/MineController.java | 4 ++-- .../infra/controller/SystemUserController.java | 5 +++-- .../visor/module/infra/service/MineService.java | 3 ++- .../module/infra/service/OperatorLogService.java | 3 ++- .../module/infra/service/impl/MineServiceImpl.java | 4 ++-- .../infra/service/impl/OperatorLogServiceImpl.java | 8 +++++--- orion-visor-ui/src/api/user/mine.ts | 4 ++-- orion-visor-ui/src/api/user/user.ts | 4 ++-- .../views/user/info/components/login-history.vue | 10 +++++----- orion-visor-ui/src/views/user/info/types/const.ts | 3 +++ 12 files changed, 35 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 9a50c424..acd3e7e5 100644 --- a/README.md +++ b/README.md @@ -51,12 +51,13 @@ ## 演示环境 -演示地址: http://101.43.254.243:1081/ -演示账号: admin/admin - -⭐ 体验后可以点一下 `star` 这对我很重要! -🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目! -[github](https://github.com/lijiahangmax/orion-visor) [gitee](https://gitee.com/lijiahangmax/orion-visor) +* 🔗 演示地址: http://101.43.254.243:1081/ +* 🔏 演示账号: admin/admin +* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/lijiahangmax/orion-visor) [gitee](https://gitee.com/lijiahangmax/orion-visor) +* 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目! +* 🎭 演示环境部分功能不可用, 完整功能请本地部署! +* 📛 演示环境请不要随便删除数据! +* 📧 如果演示环境不可用请联系我! ## 快速开始 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java index d91c838c..6e2c0e8e 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java @@ -25,8 +25,6 @@ public interface Const extends com.orion.lang.constant.Const, FieldConst, CnCons Integer DEFAULT_SORT = 10; - int LOGIN_HISTORY_COUNT = 30; - Long NONE_ID = -1L; Integer DEFAULT_VERSION = 1; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java index a320a149..153fdf1b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java @@ -70,8 +70,8 @@ public class MineController { @IgnoreLog(IgnoreLogMode.RET) @GetMapping("/login-history") @Operation(summary = "查询当前用户登录日志") - public List getCurrentLoginHistory() { - return mineService.getCurrentLoginHistory(); + public List getCurrentLoginHistory(@RequestParam("count") Integer count) { + return mineService.getCurrentLoginHistory(count); } @IgnoreLog(IgnoreLogMode.RET) diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java index 30ed137d..c386b044 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java @@ -182,8 +182,9 @@ public class SystemUserController { @GetMapping("/login-history") @Operation(summary = "查询用户登录日志") @PreAuthorize("@ss.hasPermission('infra:system-user:login-history')") - public List getLoginHistory(@RequestParam("username") String username) { - return operatorLogService.getLoginHistory(username); + public List getLoginHistory(@RequestParam("username") String username, + @RequestParam("count") Integer count) { + return operatorLogService.getLoginHistory(username, count); } } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/MineService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/MineService.java index d744f570..3286e261 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/MineService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/MineService.java @@ -46,9 +46,10 @@ public interface MineService { /** * 获取当前用户登录日志 * + * @param count count * @return 登录日志 */ - List getCurrentLoginHistory(); + List getCurrentLoginHistory(Integer count); /** * 获取当前用户会话列表 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/OperatorLogService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/OperatorLogService.java index 78a6d5c7..e60827b3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/OperatorLogService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/OperatorLogService.java @@ -60,8 +60,9 @@ public interface OperatorLogService { * 查询用户登录日志 * * @param username username + * @param count count * @return rows */ - List getLoginHistory(String username); + List getLoginHistory(String username, Integer count); } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/MineServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/MineServiceImpl.java index 1bea7dfd..9fde8a95 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/MineServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/MineServiceImpl.java @@ -77,9 +77,9 @@ public class MineServiceImpl implements MineService { } @Override - public List getCurrentLoginHistory() { + public List getCurrentLoginHistory(Integer count) { String username = SecurityUtils.getLoginUsername(); - return operatorLogService.getLoginHistory(username); + return operatorLogService.getLoginHistory(username, count); } @Override diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/OperatorLogServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/OperatorLogServiceImpl.java index e2ac7db6..37fe8062 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/OperatorLogServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/OperatorLogServiceImpl.java @@ -4,9 +4,10 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Arrays1; +import com.orion.lang.utils.Valid; import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; +import com.orion.visor.framework.common.constant.ErrorMessage; import com.orion.visor.module.infra.convert.OperatorLogConvert; import com.orion.visor.module.infra.dao.OperatorLogDAO; import com.orion.visor.module.infra.define.operator.AuthenticationOperatorType; @@ -81,7 +82,8 @@ public class OperatorLogServiceImpl implements OperatorLogService { } @Override - public List getLoginHistory(String username) { + public List getLoginHistory(String username, Integer count) { + Valid.gt(count, 0, ErrorMessage.PARAM_ERROR); // 条件 OperatorLogQueryRequest request = new OperatorLogQueryRequest(); request.setUsername(username); @@ -89,7 +91,7 @@ public class OperatorLogServiceImpl implements OperatorLogService { LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 return operatorLogDAO.of(wrapper) - .limit(Const.LOGIN_HISTORY_COUNT) + .limit(count) .list(OperatorLogConvert.MAPPER::toLoginHistory); } diff --git a/orion-visor-ui/src/api/user/mine.ts b/orion-visor-ui/src/api/user/mine.ts index 0192299e..b768ba55 100644 --- a/orion-visor-ui/src/api/user/mine.ts +++ b/orion-visor-ui/src/api/user/mine.ts @@ -35,8 +35,8 @@ export function updateCurrentUser(request: UserUpdateRequest) { /** * 查询当前用户登录日志 */ -export function getCurrentLoginHistory() { - return axios.get('/infra/mine/login-history'); +export function getCurrentLoginHistory(count: number) { + return axios.get('/infra/mine/login-history', { params: { count } }); } /** diff --git a/orion-visor-ui/src/api/user/user.ts b/orion-visor-ui/src/api/user/user.ts index 819502bb..00a81eaf 100644 --- a/orion-visor-ui/src/api/user/user.ts +++ b/orion-visor-ui/src/api/user/user.ts @@ -192,6 +192,6 @@ export function offlineUserSession(request: UserSessionOfflineRequest) { /** * 查询登录日志 */ -export function getLoginHistory(username: string) { - return axios.get('/infra/system-user/login-history', { params: { username } }); +export function getLoginHistory(username: string, count: number) { + return axios.get('/infra/system-user/login-history', { params: { username, count } }); } diff --git a/orion-visor-ui/src/views/user/info/components/login-history.vue b/orion-visor-ui/src/views/user/info/components/login-history.vue index 10f1ef85..9aa38597 100644 --- a/orion-visor-ui/src/views/user/info/components/login-history.vue +++ b/orion-visor-ui/src/views/user/info/components/login-history.vue @@ -2,10 +2,10 @@
@@ -62,7 +62,7 @@ import type { UserQueryResponse, LoginHistoryQueryResponse } from '@/api/user/user'; import { ref, onBeforeMount } from 'vue'; import useLoading from '@/hooks/loading'; - import { ResultStatus } from '../types/const'; + import { historyCount, ResultStatus } from '../types/const'; import { getCurrentLoginHistory } from '@/api/user/mine'; import { getLoginHistory } from '@/api/user/user'; import { dateFormat } from '@/utils'; @@ -82,11 +82,11 @@ setLoading(true); if (props.user) { // 查询其他用户 - const { data } = await getLoginHistory(props.user.username); + const { data } = await getLoginHistory(props.user.username, historyCount); list.value = data; } else { // 查询当前用户 - const { data } = await getCurrentLoginHistory(); + const { data } = await getCurrentLoginHistory(historyCount); list.value = data; } } catch (e) { diff --git a/orion-visor-ui/src/views/user/info/types/const.ts b/orion-visor-ui/src/views/user/info/types/const.ts index 7ad76c5c..d76e60ec 100644 --- a/orion-visor-ui/src/views/user/info/types/const.ts +++ b/orion-visor-ui/src/views/user/info/types/const.ts @@ -5,3 +5,6 @@ export const ResultStatus = { // 成功 SUCCESS: 1, }; + +// 历史数量 +export const historyCount = 30;