diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh index c697e552..5dae54b3 100644 --- a/docker/adminer/build.sh +++ b/docker/adminer/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.3.2 +version=2.3.3 docker build -t orion-visor-adminer:${version} . docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version} docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:latest diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh index bce2b2de..51a26763 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.3.2 +version=2.3.3 cp -r ../../sql ./sql docker build -t orion-visor-mysql:${version} . rm -rf ./sql diff --git a/docker/push.sh b/docker/push.sh index a17cff11..56a439fd 100644 --- a/docker/push.sh +++ b/docker/push.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.3.2 +version=2.3.3 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version} docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${version} docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version} diff --git a/docker/redis/build.sh b/docker/redis/build.sh index e22bf882..d669b75e 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.3.2 +version=2.3.3 docker build -t orion-visor-redis:${version} . docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version} docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest diff --git a/docker/service/build.sh b/docker/service/build.sh index 24d2170e..3626de1e 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,8 +1,8 @@ #/bin/bash -version=2.3.2 +version=2.3.3 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar mv ../../orion-visor-ui/dist ./dist -docker build --no-cache -t orion-visor-service:${version} . +docker build -t orion-visor-service:${version} . rm -rf ./orion-visor-launch.jar rm -rf ./dist docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:${version} diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java index fac0147b..f351d98e 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java @@ -36,7 +36,7 @@ public interface AppConst extends OrionConst { /** * 同 ${orion.version} 迭代时候需要手动更改 */ - String VERSION = "2.3.2"; + String VERSION = "2.3.3"; /** * 同 ${spring.application.name} diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index a3401873..8088f981 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/dromara/orion-visor - 2.3.2 + 2.3.3 2.7.17 2.7.15 1.5.0 diff --git a/orion-visor-launch/src/main/resources/application.yaml b/orion-visor-launch/src/main/resources/application.yaml index 2fe71f43..b7e571ec 100644 --- a/orion-visor-launch/src/main/resources/application.yaml +++ b/orion-visor-launch/src/main/resources/application.yaml @@ -157,51 +157,6 @@ logging: level: org.dromara.visor.launch.controller.BootstrapController: INFO -# 应用配置 -app: - # 认证配置 - authentication: - # 是否允许多端登录 - allow-multi-device: true - # 是否允许凭证续签 - allow-refresh: true - # 凭证续签最大次数 - max-refresh-count: 3 - # 登录失败发送站内信阈值 - login-failed-send-threshold: 3 - # 登录失败锁定次数 - login-failed-lock-count: 5 - # 登录失败锁定时间 (分) - login-failed-lock-time: 30 - # tracker 配置 - tracker: - # 加载偏移量 (行) - offset: 300 - # 延迟时间 (ms) - delay: 100 - # 文件未找到等待次数 - wait-times: 100 - # sftp 配置 - sftp: - # 上传文件时 文件存在是否备份 - upload-present-backup: true - # 备份文件名称 - backup-file-name: bk_${fileName}_${timestamp} - # 执行日志 - exec-log: - # 是否拼接 ansi 执行状态日志 - append-ansi: true - # 自动清理配置 - auto-clear: - # 批量执行日志 - exec-log: - enabled: false - keep-period: 30 - # 终端连接日志 - terminal-connect-log: - enabled: false - keep-period: 30 - # orion framework config orion: # 版本 diff --git a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java index 9918fa23..2aabd296 100644 --- a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java +++ b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java @@ -39,9 +39,9 @@ */ public class ReplaceVersion { - private static final String TARGET_VERSION = "2.3.1"; + private static final String TARGET_VERSION = "2.3.2"; - private static final String REPLACE_VERSION = "2.3.2"; + private static final String REPLACE_VERSION = "2.3.3"; private static final String PATH = new File("").getAbsolutePath(); diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java index 6c1ab7c6..5c892498 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java @@ -94,7 +94,7 @@ public ExecLogVO getExecJobLog(@RequestParam("id") Long id) { @IgnoreLog(IgnoreLogMode.RET) @GetMapping("/get-host") @Operation(summary = "查询执行主机日志") - @PreAuthorize("@ss.hasPermission('exec:exec-job-log:query')") + @PreAuthorize("@ss.hasPermission('asset:exec-job-log:query')") public ExecHostLogVO getExecJobHostLog(@RequestParam("id") Long id) { return execHostLogService.getExecHostLog(id); } @@ -163,7 +163,7 @@ public Integer clearExecJobLog(@Validated @RequestBody ExecLogClearRequest reque @GetMapping("/tail") @Operation(summary = "查看计划任务日志") @Parameter(name = "id", description = "id", required = true) - @PreAuthorize("@ss.hasPermission('exec:exec-job-log:query')") + @PreAuthorize("@ss.hasPermission('asset:exec-job-log:query')") public String getExecJobLogTailToken(@RequestParam("id") Long id) { return execLogService.getExecLogTailToken(id); } diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development index 32429245..80746b77 100644 --- a/orion-visor-ui/.env.development +++ b/orion-visor-ui/.env.development @@ -3,4 +3,4 @@ VITE_API_BASE_URL=http://127.0.0.1:9200/orion-visor/api # websocket 路径 VITE_WS_BASE_URL=ws://127.0.0.1:9200/orion-visor/keep-alive # 版本号 -VITE_APP_VERSION=2.3.2 +VITE_APP_VERSION=2.3.3 diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production index 6a37e4ef..02ac4a76 100644 --- a/orion-visor-ui/.env.production +++ b/orion-visor-ui/.env.production @@ -3,4 +3,4 @@ VITE_API_BASE_URL=/orion-visor/api # websocket 路径 VITE_WS_BASE_URL=/orion-visor/keep-alive # 版本号 -VITE_APP_VERSION=2.3.2 +VITE_APP_VERSION=2.3.3 diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json index 29319e39..3214fa68 100644 --- a/orion-visor-ui/package.json +++ b/orion-visor-ui/package.json @@ -1,7 +1,7 @@ { "name": "orion-visor-ui", "description": "Orion Visor UI", - "version": "2.3.2", + "version": "2.3.3", "private": true, "author": "Jiahang Li", "license": "Apache 2.0", diff --git a/pom.xml b/pom.xml index 74ace999..055c6c8f 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - 2.3.2 + 2.3.3 8 8 3.0.0-M5