manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚀 升级 orion-kit 版本.

Browse Source
This commit is contained in:
lijiahangmax
2025-07-02 23:35:46 +08:00
parent 58d54f7bf5
commit 2e98060573
6 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java
View File

@@ -51,9 +51,6 @@ public interface Const extends cn.orionsec.kit.lang.constant.Const, FieldConst,
String SYSTEM_USERNAME = "system"; String SYSTEM_USERNAME = "system";
// FIXME KIT
String ADMINISTRATOR = "Administrator";
Long ALL_HOST_ID = -1L; Long ALL_HOST_ID = -1L;
int BATCH_COUNT = 500; int BATCH_COUNT = 500;

6
orion-visor-common/src/main/java/org/dromara/visor/common/constant/HttpHeaderConst.java → orion-visor-common/src/main/java/org/dromara/visor/common/constant/CustomHeaderConst.java
View File

@@ -22,16 +22,14 @@
*/ */
package org.dromara.visor.common.constant; package org.dromara.visor.common.constant;
import cn.orionsec.kit.lang.constant.StandardHttpHeader;
/** /**
* http 请求头 * 自定义请求头
* *
* @author Jiahang Li * @author Jiahang Li
* @version 1.0.0 * @version 1.0.0
* @since 2025/7/1 1:02 * @since 2025/7/1 1:02
*/ */
public interface HttpHeaderConst extends StandardHttpHeader { public interface CustomHeaderConst {
String APP_VERSION = "X-App-Version"; String APP_VERSION = "X-App-Version";

2
orion-visor-dependencies/pom.xml
View File

@@ -18,7 +18,7 @@
<spring.boot.version>2.7.17</spring.boot.version> <spring.boot.version>2.7.17</spring.boot.version>
<spring.boot.admin.version>2.7.15</spring.boot.admin.version> <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version> <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
<orion.kit.version>2.0.1</orion.kit.version> <orion.kit.version>2.0.2</orion.kit.version>
<aspectj.version>1.9.7</aspectj.version> <aspectj.version>1.9.7</aspectj.version>
<lombok.version>1.18.26</lombok.version> <lombok.version>1.18.26</lombok.version>
<springdoc.version>1.6.15</springdoc.version> <springdoc.version>1.6.15</springdoc.version>

7
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java
View File

@@ -22,11 +22,12 @@
*/ */
package org.dromara.visor.module.infra.controller; 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.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.AppConst; 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.annotation.IgnoreLog;
import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.dromara.visor.framework.log.core.enums.IgnoreLogMode;
import org.dromara.visor.framework.web.core.annotation.RestWrapper; import org.dromara.visor.framework.web.core.annotation.RestWrapper;
@@ -71,10 +72,8 @@ public class UserAggregateController {
@GetMapping("/user") @GetMapping("/user")
@Operation(summary = "获取用户权限聚合信息") @Operation(summary = "获取用户权限聚合信息")
public UserAggregateVO getUserAggregateInfo(HttpServletResponse response) { public UserAggregateVO getUserAggregateInfo(HttpServletResponse response) {
// FIXME KIT
// 设置版本号请求头 // 设置版本号请求头
response.setHeader(HttpHeaderConst.ACCESS_CONTROL_EXPOSE_HEADERS, HttpHeaderConst.APP_VERSION); Servlets.addCustomHeader(response, CustomHeaderConst.APP_VERSION, AppConst.VERSION);
response.setHeader(HttpHeaderConst.APP_VERSION, AppConst.VERSION);
// 获取用户信息 // 获取用户信息
return userAggregateService.getUserAggregateInfo(); return userAggregateService.getUserAggregateInfo();
} }

2
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java vendored
View File

@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
public interface PreferenceCacheKeyDefine { public interface PreferenceCacheKeyDefine {
CacheKeyDefine PREFERENCE = new CacheKeyBuilder() CacheKeyDefine PREFERENCE = new CacheKeyBuilder()
.key("v1:user:prefer:{}:{}") .key("user:prefer:{}:{}")
.desc("用户偏好 ${userId} ${type}") .desc("用户偏好 ${userId} ${type}")
.type(JSONObject.class) .type(JSONObject.class)
.struct(RedisCacheStruct.STRING) .struct(RedisCacheStruct.STRING)

2
orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/utils/SftpFileUtils.java
View File

@@ -79,7 +79,7 @@ public class SftpFileUtils {
SftpFileVO vo = new SftpFileVO(); SftpFileVO vo = new SftpFileVO();
vo.setName(file.getName()); vo.setName(file.getName());
vo.setPath(file.getPath()); vo.setPath(file.getPath());
vo.setSuffix(Files1.getSuffix(file.getName())); vo.setSuffix(Files1.getFileNameSuffix(file.getName()));
vo.setSize(file.getSize()); vo.setSize(file.getSize());
vo.setPermission(file.getPermission()); vo.setPermission(file.getPermission());
vo.setUid(file.getUid()); vo.setUid(file.getUid());