From 41a9bebe06f0076499e1de6dbe007fa70eb0daaa Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Mon, 23 Dec 2024 23:23:42 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/common/entity/AutoClearConfig.java | 10 ++++------ .../visor/framework/common/entity/PageRequest.java | 2 +- .../common/entity/RequestIdentityModel.java | 14 +++++--------- .../dromara/visor/module/asset/dao/ExecLogDAO.java | 6 +++--- .../asset/service/impl/ExecLogServiceImpl.java | 2 +- .../src/main/resources/mapper/ExecLogMapper.xml | 2 +- 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java index 8c94c79a..4ad1f5d4 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java @@ -15,6 +15,7 @@ */ package org.dromara.visor.framework.common.entity; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -25,16 +26,13 @@ import lombok.Data; * @since 2024/6/24 15:03 */ @Data +@Schema(name = "AutoClearConfig", description = "自动清理配置") public class AutoClearConfig { - /** - * 是否开启 - */ + @Schema(description = "是否开启") private Boolean enabled; - /** - * 保留周期 (天) - */ + @Schema(description = "保留周期 (天)") private Integer keepPeriod; } diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java index f52f7322..91c55701 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java @@ -31,7 +31,7 @@ import javax.validation.constraints.NotNull; * @since 2023/7/12 23:14 */ @Data -@Schema(description = "公共页码请求") +@Schema(name = "PageRequest", description = "公共页码请求") public class PageRequest { @NotNull(groups = Page.class) diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java index d49229d2..284389bd 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java @@ -15,6 +15,7 @@ */ package org.dromara.visor.framework.common.entity; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -25,21 +26,16 @@ import lombok.Data; * @since 2023/12/29 11:57 */ @Data +@Schema(name = "RequestIdentityModel", description = "请求留痕模型") public class RequestIdentityModel implements RequestIdentity { - /** - * 请求地址 - */ + @Schema(description = "请求地址") private String address; - /** - * 请求位置 - */ + @Schema(description = "请求位置") private String location; - /** - * userAgent - */ + @Schema(description = "userAgent") private String userAgent; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecLogDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecLogDAO.java index 22359fd3..0edadb65 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecLogDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecLogDAO.java @@ -56,8 +56,8 @@ public interface ExecLogDAO extends IMapper { * @param limit limit * @return rows */ - List getExecHistory(@Param("source") String source, - @Param("userId") Long userId, - @Param("limit") Integer limit); + List selectExecHistory(@Param("source") String source, + @Param("userId") Long userId, + @Param("limit") Integer limit); } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java index 628bb423..608df37e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java @@ -132,7 +132,7 @@ public class ExecLogServiceImpl implements ExecLogService { @Override public List getExecHistory(ExecLogQueryRequest request) { // 查询执行记录 - List rows = execLogDAO.getExecHistory(request.getSource(), request.getUserId(), request.getLimit()); + List rows = execLogDAO.selectExecHistory(request.getSource(), request.getUserId(), request.getLimit()); if (rows.isEmpty()) { return Lists.empty(); } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml index ab7845e5..6a57be14 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml @@ -31,7 +31,7 @@ id, user_id, username, source, source_id, exec_mode, description, exec_seq, command, parameter_schema, timeout, script_exec, status, start_time, finish_time, create_time, update_time, creator, updater, deleted - SELECT FROM exec_log e