From 90eb6003c9cfec92ed6147425fc69a124a0809ae Mon Sep 17 00:00:00 2001 From: Hanner Date: Fri, 6 Dec 2024 10:08:54 +0800 Subject: [PATCH 1/8] =?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 Signed-off-by: Hanner --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3a40b77..7f9d9d82 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - 2.2.0 + 2.2.1 8 8 3.0.0-M5 From cf093e102399fed6836d011301b1ee7fe8b5e5a6 Mon Sep 17 00:00:00 2001 From: Hanner Date: Fri, 6 Dec 2024 10:10:27 +0800 Subject: [PATCH 2/8] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20pom.xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hanner --- orion-visor-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index 8416dfd1..a4030c98 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/dromara/orion-visor - 2.2.0 + 2.2.1 2.7.17 2.7.15 1.5.0 From fc6418caf3635bcc9a16661bd1fd4b73f2224592 Mon Sep 17 00:00:00 2001 From: Hanner Date: Fri, 6 Dec 2024 10:11:51 +0800 Subject: [PATCH 3/8] =?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 Signed-off-by: Hanner --- orion-visor-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index a4030c98..85f9b208 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -10,7 +10,7 @@ pom ${project.artifactId} - 项目所有依赖 + 项目全部依赖 https://github.com/dromara/orion-visor From 214b6fe9ac709c9f4e6eb8c7fdcc2d46d33e27e7 Mon Sep 17 00:00:00 2001 From: chaoyuyu Date: Fri, 6 Dec 2024 10:25:02 +0800 Subject: [PATCH 4/8] =?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 Signed-off-by: chaoyuyu --- .../org/dromara/visor/framework/common/constant/AppConst.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java index 53853c13..0c6bd2e3 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java @@ -29,7 +29,7 @@ public interface AppConst extends OrionConst { /** * 同 ${orion.version} 迭代时候需要手动更改 */ - String VERSION = "2.2.0"; + String VERSION = "2.2.1"; /** * 同 ${spring.application.name} From 211a50d33dc2e738268692c535ec7e110e5421f9 Mon Sep 17 00:00:00 2001 From: opensources Date: Fri, 6 Dec 2024 10:31:17 +0800 Subject: [PATCH 5/8] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: opensources --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e2966de2..0b12080c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.1 privileged: true ports: - ${SERVICE_PORT:-1081}:80 @@ -32,7 +32,7 @@ services: - mysql - redis mysql: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.1 privileged: true ports: - 3307:3306 @@ -52,7 +52,7 @@ services: retries: 15 start_period: 3s redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.1 privileged: true ports: - 6380:6379 @@ -68,7 +68,7 @@ services: retries: 15 start_period: 3s adminer: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.2.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.2.1 ports: - 8081:8080 depends_on: From cb828e56842c5131608cd116dc9877f208e90780 Mon Sep 17 00:00:00 2001 From: opensources Date: Fri, 6 Dec 2024 10:34:30 +0800 Subject: [PATCH 6/8] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: opensources --- docker-compose-testing.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml index 6033d357..23cfa2e2 100644 --- a/docker-compose-testing.yml +++ b/docker-compose-testing.yml @@ -1,7 +1,7 @@ version: '3.3' services: service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.1 privileged: true ports: - 1081:80 @@ -32,7 +32,7 @@ services: - mysql - redis mysql: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.1 privileged: true ports: - 3307:3306 @@ -52,7 +52,7 @@ services: retries: 10 start_period: 3s redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.0 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.1 privileged: true ports: - 6380:6379 From a75ce2143deeb0836c60ccd637a1923a781feed5 Mon Sep 17 00:00:00 2001 From: opensources Date: Fri, 6 Dec 2024 10:35:37 +0800 Subject: [PATCH 7/8] =?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 Signed-off-by: opensources --- docker/push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/push.sh b/docker/push.sh index 4c5a6406..fbafd922 100644 --- a/docker/push.sh +++ b/docker/push.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.2.0 +version=2.2.1 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} From e3d33295fe2de6d2d72daa147f0a0c7fd127d0b8 Mon Sep 17 00:00:00 2001 From: chaoyuyu Date: Fri, 6 Dec 2024 10:46:09 +0800 Subject: [PATCH 8/8] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20build.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chaoyuyu --- docker/adminer/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh index 83260fac..4dc2a041 100644 --- a/docker/adminer/build.sh +++ b/docker/adminer/build.sh @@ -1,4 +1,4 @@ #/bin/bash -version=2.2.0 +version=2.2.1 docker build -t orion-visor-adminer:${version} . docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}