diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java index 1fcd64f8..e0b5ba56 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java @@ -51,9 +51,6 @@ public interface Const extends cn.orionsec.kit.lang.constant.Const, FieldConst, String SYSTEM_USERNAME = "system"; - // FIXME KIT - String ADMINISTRATOR = "Administrator"; - Long ALL_HOST_ID = -1L; int BATCH_COUNT = 500; diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/HttpHeaderConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/CustomHeaderConst.java similarity index 87% rename from orion-visor-common/src/main/java/org/dromara/visor/common/constant/HttpHeaderConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/CustomHeaderConst.java index 3e87a5ea..3f1017cc 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/HttpHeaderConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/CustomHeaderConst.java @@ -22,16 +22,14 @@ */ package org.dromara.visor.common.constant; -import cn.orionsec.kit.lang.constant.StandardHttpHeader; - /** - * http 请求头 + * 自定义请求头 * * @author Jiahang Li * @version 1.0.0 * @since 2025/7/1 1:02 */ -public interface HttpHeaderConst extends StandardHttpHeader { +public interface CustomHeaderConst { String APP_VERSION = "X-App-Version"; diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index 7dc53199..96526559 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -18,7 +18,7 @@ 2.7.17 2.7.15 1.5.0 - 2.0.1 + 2.0.2 1.9.7 1.18.26 1.6.15 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java index c43678d2..71dc5b99 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java @@ -22,11 +22,12 @@ */ package org.dromara.visor.module.infra.controller; +import cn.orionsec.kit.web.servlet.web.Servlets; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.AppConst; -import org.dromara.visor.common.constant.HttpHeaderConst; +import org.dromara.visor.common.constant.CustomHeaderConst; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.web.core.annotation.RestWrapper; @@ -71,10 +72,8 @@ public class UserAggregateController { @GetMapping("/user") @Operation(summary = "获取用户权限聚合信息") public UserAggregateVO getUserAggregateInfo(HttpServletResponse response) { - // FIXME KIT // 设置版本号请求头 - response.setHeader(HttpHeaderConst.ACCESS_CONTROL_EXPOSE_HEADERS, HttpHeaderConst.APP_VERSION); - response.setHeader(HttpHeaderConst.APP_VERSION, AppConst.VERSION); + Servlets.addCustomHeader(response, CustomHeaderConst.APP_VERSION, AppConst.VERSION); // 获取用户信息 return userAggregateService.getUserAggregateInfo(); } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java index 2075a57d..5f6a1d89 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit; public interface PreferenceCacheKeyDefine { CacheKeyDefine PREFERENCE = new CacheKeyBuilder() - .key("v1:user:prefer:{}:{}") + .key("user:prefer:{}:{}") .desc("用户偏好 ${userId} ${type}") .type(JSONObject.class) .struct(RedisCacheStruct.STRING) diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java index 8c97c447..2ffe54cb 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java @@ -79,7 +79,7 @@ public class SftpFileUtils { SftpFileVO vo = new SftpFileVO(); vo.setName(file.getName()); vo.setPath(file.getPath()); - vo.setSuffix(Files1.getSuffix(file.getName())); + vo.setSuffix(Files1.getFileNameSuffix(file.getName())); vo.setSize(file.getSize()); vo.setPermission(file.getPermission()); vo.setUid(file.getUid());