From 226dfb2c25b7364463b08c637046d1275b88c9e2 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Sun, 23 Mar 2025 11:41:13 +0800 Subject: [PATCH] =?UTF-8?q?:bookmark:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/adminer/build.sh | 2 +- docker/mysql/build.sh | 2 +- docker/push.sh | 2 +- docker/redis/build.sh | 2 +- docker/service/build.sh | 2 +- docker/ui/build.sh | 2 +- .../visor/common/constant/AppConst.java | 2 +- .../visor/common/entity/IOrderRequest.java | 22 +++++++++++++++++++ .../visor/common/entity/IPageRequest.java | 22 +++++++++++++++++++ orion-visor-dependencies/pom.xml | 2 +- .../request/host/HostCreateRequest.java | 8 ++----- .../request/host/HostUpdateRequest.java | 3 +-- orion-visor-ui/.env.development | 2 +- orion-visor-ui/.env.production | 2 +- orion-visor-ui/package.json | 2 +- pom.xml | 2 +- 16 files changed, 59 insertions(+), 20 deletions(-) diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh index 1fc8f212..911d7982 100644 --- a/docker/adminer/build.sh +++ b/docker/adminer/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.3.5 +version=2.3.6 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 2e0f0b5b..83afac05 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.3.5 +version=2.3.6 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 00dc505b..74d7e1a0 100644 --- a/docker/push.sh +++ b/docker/push.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.3.5 +version=2.3.6 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 e9a121ec..beb0ccd7 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.3.5 +version=2.3.6 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 dbbf4c37..b863653a 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.3.5 +version=2.3.6 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar docker build -t orion-visor-service:${version} . rm -rf ./orion-visor-launch.jar diff --git a/docker/ui/build.sh b/docker/ui/build.sh index 4edb2751..1e3e306a 100644 --- a/docker/ui/build.sh +++ b/docker/ui/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.3.5 +version=2.3.6 mv ../../orion-visor-ui/dist ./dist docker build -t orion-visor-ui:${version} . rm -rf ./orion-visor-launch.jar 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 6399a32d..c139a629 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.5"; + String VERSION = "2.3.6"; /** * 同 ${spring.application.name} diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IOrderRequest.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IOrderRequest.java index 07ad3a43..b8efe8cc 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IOrderRequest.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IOrderRequest.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.dromara.visor.common.entity; /** diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IPageRequest.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IPageRequest.java index 2aa76059..e9f0eddf 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IPageRequest.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/IPageRequest.java @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.dromara.visor.common.entity; /** diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index 2f4470f0..8b403dd1 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.5 + 2.3.6 2.7.17 2.7.15 1.5.0 diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java index 2c49abce..dd0c77a2 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java @@ -28,10 +28,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import javax.validation.constraints.*; import java.io.Serializable; import java.util.List; @@ -78,8 +75,7 @@ public class HostCreateRequest implements Serializable { @Schema(description = "主机端口") private Integer port; - // TODO - // @NotEmpty + @NotEmpty @Schema(description = "主机分组") private List groupIdList; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java index db417385..2494db6b 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java @@ -76,8 +76,7 @@ public class HostUpdateRequest implements Serializable { @Schema(description = "主机端口") private Integer port; - // TODO - // @NotEmpty + @NotEmpty @Schema(description = "主机分组") private List groupIdList; diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development index f5a12468..99fc672c 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.5 +VITE_APP_VERSION=2.3.6 diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production index a495e0c3..e3d00ba1 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.5 +VITE_APP_VERSION=2.3.6 diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json index 028ad537..a77b5360 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.5", + "version": "2.3.6", "private": true, "author": "Jiahang Li", "license": "Apache 2.0", diff --git a/pom.xml b/pom.xml index ed671591..d300f11c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - 2.3.5 + 2.3.6 8 8 3.0.0-M5