From 370272ca4323a21cd0190efad0f27a26e60e4553 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Mon, 3 Jun 2024 11:53:53 +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-compose.yml | 6 +++--- docker/orion-visor-mysql/build.sh | 2 +- docker/orion-visor-redis/build.sh | 2 +- docker/orion-visor-service/build.sh | 2 +- orion-visor-dependencies/pom.xml | 2 +- .../orion/visor/framework/common/constant/AppConst.java | 2 +- .../orion-visor-module-infra-service/pom.xml | 7 +++++++ orion-visor-ui/.env.development | 2 +- orion-visor-ui/.env.production | 2 +- orion-visor-ui/package.json | 2 +- pom.xml | 2 +- 11 files changed, 19 insertions(+), 12 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a091af2a..c970bedb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: orion-visor-service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.3 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.4 ports: - 1081:80 environment: @@ -20,7 +20,7 @@ services: - orion-visor-mysql - orion-visor-redis orion-visor-mysql: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.3 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.4 privileged: true ports: - 3307:3306 @@ -34,7 +34,7 @@ services: - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql-files:/var/lib/mysql-files - /data/orion-visor-space/docker-volumes/orion-visor-mysql/etc-mysql:/etc/mysql orion-visor-redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.3 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.4 privileged: true ports: - 6380:6379 diff --git a/docker/orion-visor-mysql/build.sh b/docker/orion-visor-mysql/build.sh index e4ddf266..94d658d7 100644 --- a/docker/orion-visor-mysql/build.sh +++ b/docker/orion-visor-mysql/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.0.3 +version=2.0.4 cp -r ../../sql ./sql docker build -t orion-visor-mysql:${version} . rm -rf ./sql diff --git a/docker/orion-visor-redis/build.sh b/docker/orion-visor-redis/build.sh index a7009fe6..8351213f 100644 --- a/docker/orion-visor-redis/build.sh +++ b/docker/orion-visor-redis/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.0.3 +version=2.0.4 docker build -t orion-visor-redis:${version} . docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} diff --git a/docker/orion-visor-service/build.sh b/docker/orion-visor-service/build.sh index 012e10de..01c63690 100644 --- a/docker/orion-visor-service/build.sh +++ b/docker/orion-visor-service/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.0.3 +version=2.0.4 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar mv ../../orion-visor-ui/dist ./dist docker build -t orion-visor-service:${version} . diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index 2ba33b95..4e10be9d 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/lijiahangmax/orion-visor - 2.0.3 + 2.0.4 2.7.17 2.7.15 1.5.0 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java index 792d5092..421bfaf4 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java @@ -14,7 +14,7 @@ public interface AppConst extends OrionConst { /** * 同 ${orion.version} 迭代时候需要手动更改 */ - String VERSION = "2.0.3"; + String VERSION = "2.0.4"; String ORION_VISOR = "orion-visor"; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml b/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml index d927017b..82a41024 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml @@ -28,6 +28,13 @@ ${revision} + + + com.orion.visor + orion-visor-module-asset-provider + ${revision} + + com.orion.visor diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development index fdc659c1..8d55101a 100644 --- a/orion-visor-ui/.env.development +++ b/orion-visor-ui/.env.development @@ -1,5 +1,5 @@ VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion-visor/api' VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion-visor/keep-alive' -VITE_APP_VERSION= '2.0.3' +VITE_APP_VERSION= '2.0.4' VITE_SFTP_PREVIEW_MB= 2 VITE_DEMO_MODE= false diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production index f3992cab..3bfb41fc 100644 --- a/orion-visor-ui/.env.production +++ b/orion-visor-ui/.env.production @@ -1,5 +1,5 @@ VITE_API_BASE_URL= '/orion-visor/api' VITE_WS_BASE_URL= '/orion-visor/keep-alive' -VITE_APP_VERSION= '2.0.3' +VITE_APP_VERSION= '2.0.4' VITE_SFTP_PREVIEW_MB= 2 VITE_DEMO_MODE= false diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json index 76a6fa4c..78cb6a1f 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.0.3", + "version": "2.0.4", "private": true, "author": "Jiahang Li", "license": "Apache 2.0", diff --git a/pom.xml b/pom.xml index dff47449..ad01684d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - 2.0.3 + 2.0.4 8 8 3.0.0-M5