diff --git a/docker-compose.yaml b/docker-compose.yaml index f3311ac2..ca509a87 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,6 @@ version: '3.3' -# latest = 2.5.3 +# latest = 2.5.4 # 支持以下源 # lijiahangmax/* diff --git a/docker/docker-build.sh b/docker/docker-build.sh index f08e6efc..470bc549 100644 --- a/docker/docker-build.sh +++ b/docker/docker-build.sh @@ -7,7 +7,7 @@ set -e source ./project-build.sh "$@" # 版本号 -version=2.5.3 +version=2.5.4 # 是否推送镜像 push_image=false # 是否构建 latest diff --git a/docker/project-build.sh b/docker/project-build.sh index ef744e40..c61564ca 100644 --- a/docker/project-build.sh +++ b/docker/project-build.sh @@ -4,7 +4,7 @@ set -e # DockerContext: orion-visor # 版本号 -version=2.5.3 +version=2.5.4 # 是否构建 service export build_service=false # 是否构建 ui 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 0ecc1929..fd3caa18 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.5.3"; + String VERSION = "2.5.4"; /** * 同 ${spring.application.name} diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index bbd0dd7f..5561109a 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,11 +14,11 @@ https://github.com/dromara/orion-visor - 2.5.3 + 2.5.4 2.7.17 2.7.15 1.5.0 - 2.0.4 + 2.0.5 1.9.7 1.18.26 1.6.15 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 ad97dbbe..65a87ad6 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 @@ import java.util.function.Function; */ public class ReplaceVersion { - private static final String TARGET_VERSION = "2.5.2"; + private static final String TARGET_VERSION = "2.5.3"; - private static final String REPLACE_VERSION = "2.5.3"; + private static final String REPLACE_VERSION = "2.5.4"; private static final String PATH = new File("").getAbsolutePath(); diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/MetricsAlarmEngine.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/MetricsAlarmEngine.java index 28b34194..10cbb429 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/MetricsAlarmEngine.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/MetricsAlarmEngine.java @@ -135,7 +135,7 @@ public class MetricsAlarmEngine extends BaseAlarmEngine { @Override protected void setExtraAlarmPushParams(Map params, AlarmEventTriggerDTO event) { - HostAlarmSourceInfo sourceInfo = JSON.parseObject(event.getAlarmInfo(), HostAlarmSourceInfo.class); + HostAlarmSourceInfo sourceInfo = JSON.parseObject(event.getSourceInfo(), HostAlarmSourceInfo.class); params.put("hostId", event.getSourceId()); params.put("hostName", sourceInfo.getName()); params.put("hostCode", sourceInfo.getCode()); diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development index a248469d..961a714b 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.5.3 +VITE_APP_VERSION=2.5.4 diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production index cc283bbf..dd3ae01f 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.5.3 +VITE_APP_VERSION=2.5.4 diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json index 4cb88c4c..f714cc36 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.5.3", + "version": "2.5.4", "private": true, "author": "Jiahang Li", "license": "Apache 2.0", diff --git a/pom.xml b/pom.xml index abc45086..f0f03d7e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - 2.5.3 + 2.5.4 8 8 3.0.0-M5