From 9fb1a0ce73baed522370c8f738d879df730f587e Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Wed, 23 Aug 2023 14:59:21 +0800 Subject: [PATCH 1/5] pre commit 2.10.42.5 --- CHANGELOG-BETA.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG-BETA.md b/CHANGELOG-BETA.md index 081072e79..746d85ea4 100644 --- a/CHANGELOG-BETA.md +++ b/CHANGELOG-BETA.md @@ -1,6 +1,6 @@ # 🚀 版本日志 -### 2.10.42.5-beta +### 2.10.42.5-beta (2023-08-23) ### 🐣 新增功能 From 0a02e267cf3ed7933c17e04206518f4601304d8f Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Wed, 23 Aug 2023 15:00:16 +0800 Subject: [PATCH 2/5] commit beta 2.10.42.5 --- env-beta.env | 2 +- modules/agent-transport/agent-transport-common/pom.xml | 2 +- modules/agent-transport/agent-transport-http/pom.xml | 2 +- modules/agent-transport/pom.xml | 4 ++-- modules/agent/pom.xml | 4 ++-- modules/common/pom.xml | 4 ++-- modules/common/src/main/resources/banner.txt | 2 +- modules/server/DockerfileBeta | 2 +- modules/server/DockerfileBetaJdk17 | 2 +- modules/server/pom.xml | 4 ++-- modules/storage-module/pom.xml | 4 ++-- modules/storage-module/storage-module-common/pom.xml | 2 +- modules/storage-module/storage-module-h2/pom.xml | 2 +- modules/storage-module/storage-module-mysql/pom.xml | 2 +- modules/sub-plugin/docker-cli/pom.xml | 2 +- modules/sub-plugin/email/pom.xml | 2 +- modules/sub-plugin/encrypt/pom.xml | 2 +- modules/sub-plugin/git-clone/pom.xml | 2 +- modules/sub-plugin/pom.xml | 4 ++-- modules/sub-plugin/ssh-jsch/pom.xml | 2 +- modules/sub-plugin/svn-clone/pom.xml | 2 +- modules/sub-plugin/webhook/pom.xml | 2 +- modules/updater/pom.xml | 2 +- pom.xml | 2 +- script/tag.beta.txt | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-) diff --git a/env-beta.env b/env-beta.env index cf51d718c..fdbbee64e 100644 --- a/env-beta.env +++ b/env-beta.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.10.42.4 +JPOM_VERSION=2.10.42.5 # Server Token 生产部署请更换 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 diff --git a/modules/agent-transport/agent-transport-common/pom.xml b/modules/agent-transport/agent-transport-common/pom.xml index d8bedd856..79d78324a 100644 --- a/modules/agent-transport/agent-transport-common/pom.xml +++ b/modules/agent-transport/agent-transport-common/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.agent-transport jpom-agent-transport-parent - 2.10.42.4 + 2.10.42.5 ../pom.xml diff --git a/modules/agent-transport/agent-transport-http/pom.xml b/modules/agent-transport/agent-transport-http/pom.xml index 06555647b..f7ff6da7d 100644 --- a/modules/agent-transport/agent-transport-http/pom.xml +++ b/modules/agent-transport/agent-transport-http/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.agent-transport jpom-agent-transport-parent - 2.10.42.4 + 2.10.42.5 ../pom.xml diff --git a/modules/agent-transport/pom.xml b/modules/agent-transport/pom.xml index 6ae9f85e1..680ca72e0 100644 --- a/modules/agent-transport/pom.xml +++ b/modules/agent-transport/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.4 + 2.10.42.5 ../../pom.xml pom @@ -38,7 +38,7 @@ agent-transport-http 4.0.0 - 2.10.42.4 + 2.10.42.5 org.dromara.jpom.agent-transport jpom-agent-transport-parent Jpom Agent Transport diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml index 5b7285511..d7f30a7b4 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -29,12 +29,12 @@ jpom-parent org.dromara.jpom - 2.10.42.4 + 2.10.42.5 ../../pom.xml 4.0.0 agent - 2.10.42.4 + 2.10.42.5 Jpom Agent org.dromara.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 60ddbe23e..27df83913 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -29,13 +29,13 @@ jpom-parent org.dromara.jpom - 2.10.42.4 + 2.10.42.5 ../../pom.xml 4.0.0 Jpom Common common - 2.10.42.4 + 2.10.42.5 diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt index be8c4cb80..f17e150ca 100644 --- a/modules/common/src/main/resources/banner.txt +++ b/modules/common/src/main/resources/banner.txt @@ -7,5 +7,5 @@ | | |_| - ➜ Jpom \ (•◡•) / (v2.10.42.4) + ➜ Jpom \ (•◡•) / (v2.10.42.5) diff --git a/modules/server/DockerfileBeta b/modules/server/DockerfileBeta index f8105f9c2..01a97ad9d 100644 --- a/modules/server/DockerfileBeta +++ b/modules/server/DockerfileBeta @@ -29,7 +29,7 @@ LABEL maintainer="bwcx-jzy " LABEL documentation="https://jpom.top" ENV JPOM_HOME /usr/local/jpom-server -ENV JPOM_PKG_VERSION 2.10.42.4 +ENV JPOM_PKG_VERSION 2.10.42.5 ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1 diff --git a/modules/server/DockerfileBetaJdk17 b/modules/server/DockerfileBetaJdk17 index 1d7a739fe..803457f9e 100644 --- a/modules/server/DockerfileBetaJdk17 +++ b/modules/server/DockerfileBetaJdk17 @@ -29,7 +29,7 @@ LABEL maintainer="bwcx-jzy " LABEL documentation="https://jpom.top" ENV JPOM_HOME /usr/local/jpom-server -ENV JPOM_PKG_VERSION 2.10.42.4 +ENV JPOM_PKG_VERSION 2.10.42.5 ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1 diff --git a/modules/server/pom.xml b/modules/server/pom.xml index 1d6223e46..a339809f7 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -29,13 +29,13 @@ jpom-parent org.dromara.jpom - 2.10.42.4 + 2.10.42.5 ../../pom.xml 4.0.0 Jpom Server server - 2.10.42.4 + 2.10.42.5 org.dromara.jpom.JpomServerApplication diff --git a/modules/storage-module/pom.xml b/modules/storage-module/pom.xml index a354b22c8..9e2e9e1b4 100644 --- a/modules/storage-module/pom.xml +++ b/modules/storage-module/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.4 + 2.10.42.5 ../../pom.xml pom @@ -39,7 +39,7 @@ storage-module-mysql 4.0.0 - 2.10.42.4 + 2.10.42.5 org.dromara.jpom.storage-module jpom-storage-module-parent Jpom storage module diff --git a/modules/storage-module/storage-module-common/pom.xml b/modules/storage-module/storage-module-common/pom.xml index 27d89b747..c816fa0a2 100644 --- a/modules/storage-module/storage-module-common/pom.xml +++ b/modules/storage-module/storage-module-common/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.10.42.4 + 2.10.42.5 ../pom.xml diff --git a/modules/storage-module/storage-module-h2/pom.xml b/modules/storage-module/storage-module-h2/pom.xml index 21067d34f..34245d159 100644 --- a/modules/storage-module/storage-module-h2/pom.xml +++ b/modules/storage-module/storage-module-h2/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.10.42.4 + 2.10.42.5 ../pom.xml diff --git a/modules/storage-module/storage-module-mysql/pom.xml b/modules/storage-module/storage-module-mysql/pom.xml index 9528a9c9c..371bd5d8c 100644 --- a/modules/storage-module/storage-module-mysql/pom.xml +++ b/modules/storage-module/storage-module-mysql/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.10.42.4 + 2.10.42.5 ../pom.xml diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index cb651053e..38be63b78 100644 --- a/modules/sub-plugin/docker-cli/pom.xml +++ b/modules/sub-plugin/docker-cli/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.4 + 2.10.42.5 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index 9b031f360..1381381a5 100644 --- a/modules/sub-plugin/email/pom.xml +++ b/modules/sub-plugin/email/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.4 + 2.10.42.5 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/encrypt/pom.xml b/modules/sub-plugin/encrypt/pom.xml index 096d371f8..458589685 100644 --- a/modules/sub-plugin/encrypt/pom.xml +++ b/modules/sub-plugin/encrypt/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.4 + 2.10.42.5 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml index 0bb68f46b..1f518b5af 100644 --- a/modules/sub-plugin/git-clone/pom.xml +++ b/modules/sub-plugin/git-clone/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.4 + 2.10.42.5 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml index aab888795..20093a182 100644 --- a/modules/sub-plugin/pom.xml +++ b/modules/sub-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.4 + 2.10.42.5 ../../pom.xml pom @@ -43,7 +43,7 @@ ssh-jsch 4.0.0 - 2.10.42.4 + 2.10.42.5 org.dromara.jpom.plugins jpom-plugins-parent Jpom Plugins diff --git a/modules/sub-plugin/ssh-jsch/pom.xml b/modules/sub-plugin/ssh-jsch/pom.xml index ed2f5da43..3faeb3fb2 100644 --- a/modules/sub-plugin/ssh-jsch/pom.xml +++ b/modules/sub-plugin/ssh-jsch/pom.xml @@ -30,7 +30,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.4 + 2.10.42.5 ../pom.xml plugin-ssh-jsch diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml index 2e454f4bc..f903d98bf 100644 --- a/modules/sub-plugin/svn-clone/pom.xml +++ b/modules/sub-plugin/svn-clone/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.4 + 2.10.42.5 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index 58c736478..b226ea22e 100644 --- a/modules/sub-plugin/webhook/pom.xml +++ b/modules/sub-plugin/webhook/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.4 + 2.10.42.5 ../pom.xml 4.0.0 diff --git a/modules/updater/pom.xml b/modules/updater/pom.xml index 2c0dd9c5b..1d54b1c45 100644 --- a/modules/updater/pom.xml +++ b/modules/updater/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.4 + 2.10.42.5 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 95d15b6af..4e64ccb97 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.10.42.4 + 2.10.42.5 https://gitee.com/dromara/Jpom UTF-8 diff --git a/script/tag.beta.txt b/script/tag.beta.txt index 372dbf9ba..6eda71125 100644 --- a/script/tag.beta.txt +++ b/script/tag.beta.txt @@ -1 +1 @@ -2.10.42.4 +2.10.42.5 From fa2b4ce5d8aea181063a4ab2eba4edb26c35b8d5 Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Wed, 23 Aug 2023 16:35:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=20=E6=9C=AA=E9=85=8D=E7=BD=AE=E9=9B=86?= =?UTF-8?q?=E7=BE=A4=E5=9C=B0=E5=9D=80=E6=97=B6=E6=97=A0=E6=B3=95=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=20pre=20commit=20?= =?UTF-8?q?2.10.42.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG-BETA.md | 8 ++++++++ web-vue/src/pages/layout/user-header.vue | 14 ++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG-BETA.md b/CHANGELOG-BETA.md index 746d85ea4..e5db53423 100644 --- a/CHANGELOG-BETA.md +++ b/CHANGELOG-BETA.md @@ -1,5 +1,13 @@ # 🚀 版本日志 +### 2.10.42.6-beta (2023-08-23) + +### 🐞 解决BUG、优化功能 + +1. 【server】修复 未配置集群地址时无法切换工作空间（感谢@ccx2480） + +------ + ### 2.10.42.5-beta (2023-08-23) ### 🐣 新增功能 diff --git a/web-vue/src/pages/layout/user-header.vue b/web-vue/src/pages/layout/user-header.vue index 1a514462e..dbc67fe91 100644 --- a/web-vue/src/pages/layout/user-header.vue +++ b/web-vue/src/pages/layout/user-header.vue @@ -773,7 +773,7 @@ export default { const cluster = this.myClusterList.find((item2) => { return item2.id === item.clusterInfoId; }); - if (cluster && location.href.indexOf(cluster.url) !== 0) { + if (cluster && item.url && location.href.indexOf(cluster.url) !== 0) { let url = `${cluster.url}/#/${this.$route.fullPath}`.replace(/[\\/]+[\\/]/g, "/").replace(":/", "://"); url = url.replace(`wid=${this.selectWorkspace.id}`, `wid=${item.id}`); // console.log(location.href.indexOf(cluster.url), url); @@ -791,9 +791,15 @@ export default { }, // 集群切换 handleClusterChange(item) { - const url = `${item.url}/#/${this.$route.fullPath}`.replace(/[\\/]+[\\/]/g, "/").replace(":/", "://"); - // console.log(url); - location.href = url; + if (item.url) { + const url = `${item.url}/#/${this.$route.fullPath}`.replace(/[\\/]+[\\/]/g, "/").replace(":/", "://"); + // console.log(url); + location.href = url; + } else { + this.$notification.error({ + message: "还未配置集群地址,不能切换集群", + }); + } }, tabChange(key) { if (key === 1) { From 91dbdd5dc2a8d6f56e108ceafb640905d0f870f8 Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Wed, 23 Aug 2023 16:39:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=20=E6=9C=AA=E9=85=8D=E7=BD=AE=E9=9B=86?= =?UTF-8?q?=E7=BE=A4=E5=9C=B0=E5=9D=80=E6=97=B6=E6=97=A0=E6=B3=95=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=20pre=20commit=20?= =?UTF-8?q?2.10.42.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web-vue/src/pages/layout/user-header.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-vue/src/pages/layout/user-header.vue b/web-vue/src/pages/layout/user-header.vue index dbc67fe91..1c919ba98 100644 --- a/web-vue/src/pages/layout/user-header.vue +++ b/web-vue/src/pages/layout/user-header.vue @@ -773,7 +773,7 @@ export default { const cluster = this.myClusterList.find((item2) => { return item2.id === item.clusterInfoId; }); - if (cluster && item.url && location.href.indexOf(cluster.url) !== 0) { + if (cluster && cluster.url && location.href.indexOf(cluster.url) !== 0) { let url = `${cluster.url}/#/${this.$route.fullPath}`.replace(/[\\/]+[\\/]/g, "/").replace(":/", "://"); url = url.replace(`wid=${this.selectWorkspace.id}`, `wid=${item.id}`); // console.log(location.href.indexOf(cluster.url), url); From f33e3fab49dc290a274063ba829020c291799674 Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Wed, 23 Aug 2023 16:40:25 +0800 Subject: [PATCH 5/5] commit beta 2.10.42.6 --- env-beta.env | 2 +- modules/agent-transport/agent-transport-common/pom.xml | 2 +- modules/agent-transport/agent-transport-http/pom.xml | 2 +- modules/agent-transport/pom.xml | 4 ++-- modules/agent/pom.xml | 4 ++-- modules/common/pom.xml | 4 ++-- modules/common/src/main/resources/banner.txt | 2 +- modules/server/DockerfileBeta | 2 +- modules/server/DockerfileBetaJdk17 | 2 +- modules/server/pom.xml | 4 ++-- modules/storage-module/pom.xml | 4 ++-- modules/storage-module/storage-module-common/pom.xml | 2 +- modules/storage-module/storage-module-h2/pom.xml | 2 +- modules/storage-module/storage-module-mysql/pom.xml | 2 +- modules/sub-plugin/docker-cli/pom.xml | 2 +- modules/sub-plugin/email/pom.xml | 2 +- modules/sub-plugin/encrypt/pom.xml | 2 +- modules/sub-plugin/git-clone/pom.xml | 2 +- modules/sub-plugin/pom.xml | 4 ++-- modules/sub-plugin/ssh-jsch/pom.xml | 2 +- modules/sub-plugin/svn-clone/pom.xml | 2 +- modules/sub-plugin/webhook/pom.xml | 2 +- modules/updater/pom.xml | 2 +- pom.xml | 2 +- script/tag.beta.txt | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-) diff --git a/env-beta.env b/env-beta.env index fdbbee64e..0a7fb9cac 100644 --- a/env-beta.env +++ b/env-beta.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.10.42.5 +JPOM_VERSION=2.10.42.6 # Server Token 生产部署请更换 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 diff --git a/modules/agent-transport/agent-transport-common/pom.xml b/modules/agent-transport/agent-transport-common/pom.xml index 79d78324a..eb187c8fe 100644 --- a/modules/agent-transport/agent-transport-common/pom.xml +++ b/modules/agent-transport/agent-transport-common/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.agent-transport jpom-agent-transport-parent - 2.10.42.5 + 2.10.42.6 ../pom.xml diff --git a/modules/agent-transport/agent-transport-http/pom.xml b/modules/agent-transport/agent-transport-http/pom.xml index f7ff6da7d..c3790851c 100644 --- a/modules/agent-transport/agent-transport-http/pom.xml +++ b/modules/agent-transport/agent-transport-http/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.agent-transport jpom-agent-transport-parent - 2.10.42.5 + 2.10.42.6 ../pom.xml diff --git a/modules/agent-transport/pom.xml b/modules/agent-transport/pom.xml index 680ca72e0..2106d7195 100644 --- a/modules/agent-transport/pom.xml +++ b/modules/agent-transport/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml pom @@ -38,7 +38,7 @@ agent-transport-http 4.0.0 - 2.10.42.5 + 2.10.42.6 org.dromara.jpom.agent-transport jpom-agent-transport-parent Jpom Agent Transport diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml index d7f30a7b4..03315d34c 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -29,12 +29,12 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml 4.0.0 agent - 2.10.42.5 + 2.10.42.6 Jpom Agent org.dromara.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 27df83913..c033f57cc 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -29,13 +29,13 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml 4.0.0 Jpom Common common - 2.10.42.5 + 2.10.42.6 diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt index f17e150ca..204fb47a9 100644 --- a/modules/common/src/main/resources/banner.txt +++ b/modules/common/src/main/resources/banner.txt @@ -7,5 +7,5 @@ | | |_| - ➜ Jpom \ (•◡•) / (v2.10.42.5) + ➜ Jpom \ (•◡•) / (v2.10.42.6) diff --git a/modules/server/DockerfileBeta b/modules/server/DockerfileBeta index 01a97ad9d..472536206 100644 --- a/modules/server/DockerfileBeta +++ b/modules/server/DockerfileBeta @@ -29,7 +29,7 @@ LABEL maintainer="bwcx-jzy " LABEL documentation="https://jpom.top" ENV JPOM_HOME /usr/local/jpom-server -ENV JPOM_PKG_VERSION 2.10.42.5 +ENV JPOM_PKG_VERSION 2.10.42.6 ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1 diff --git a/modules/server/DockerfileBetaJdk17 b/modules/server/DockerfileBetaJdk17 index 803457f9e..6233a03d7 100644 --- a/modules/server/DockerfileBetaJdk17 +++ b/modules/server/DockerfileBetaJdk17 @@ -29,7 +29,7 @@ LABEL maintainer="bwcx-jzy " LABEL documentation="https://jpom.top" ENV JPOM_HOME /usr/local/jpom-server -ENV JPOM_PKG_VERSION 2.10.42.5 +ENV JPOM_PKG_VERSION 2.10.42.6 ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1 diff --git a/modules/server/pom.xml b/modules/server/pom.xml index a339809f7..ee0bd29d6 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -29,13 +29,13 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml 4.0.0 Jpom Server server - 2.10.42.5 + 2.10.42.6 org.dromara.jpom.JpomServerApplication diff --git a/modules/storage-module/pom.xml b/modules/storage-module/pom.xml index 9e2e9e1b4..ea762b040 100644 --- a/modules/storage-module/pom.xml +++ b/modules/storage-module/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml pom @@ -39,7 +39,7 @@ storage-module-mysql 4.0.0 - 2.10.42.5 + 2.10.42.6 org.dromara.jpom.storage-module jpom-storage-module-parent Jpom storage module diff --git a/modules/storage-module/storage-module-common/pom.xml b/modules/storage-module/storage-module-common/pom.xml index c816fa0a2..90f3502e1 100644 --- a/modules/storage-module/storage-module-common/pom.xml +++ b/modules/storage-module/storage-module-common/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.10.42.5 + 2.10.42.6 ../pom.xml diff --git a/modules/storage-module/storage-module-h2/pom.xml b/modules/storage-module/storage-module-h2/pom.xml index 34245d159..759ac7fd1 100644 --- a/modules/storage-module/storage-module-h2/pom.xml +++ b/modules/storage-module/storage-module-h2/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.10.42.5 + 2.10.42.6 ../pom.xml diff --git a/modules/storage-module/storage-module-mysql/pom.xml b/modules/storage-module/storage-module-mysql/pom.xml index 371bd5d8c..b41d776c6 100644 --- a/modules/storage-module/storage-module-mysql/pom.xml +++ b/modules/storage-module/storage-module-mysql/pom.xml @@ -30,7 +30,7 @@ org.dromara.jpom.storage-module jpom-storage-module-parent - 2.10.42.5 + 2.10.42.6 ../pom.xml diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index 38be63b78..cce51b006 100644 --- a/modules/sub-plugin/docker-cli/pom.xml +++ b/modules/sub-plugin/docker-cli/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index 1381381a5..c13a89d5d 100644 --- a/modules/sub-plugin/email/pom.xml +++ b/modules/sub-plugin/email/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/encrypt/pom.xml b/modules/sub-plugin/encrypt/pom.xml index 458589685..e819f3188 100644 --- a/modules/sub-plugin/encrypt/pom.xml +++ b/modules/sub-plugin/encrypt/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml index 1f518b5af..998cbd396 100644 --- a/modules/sub-plugin/git-clone/pom.xml +++ b/modules/sub-plugin/git-clone/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml index 20093a182..7e448921e 100644 --- a/modules/sub-plugin/pom.xml +++ b/modules/sub-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml pom @@ -43,7 +43,7 @@ ssh-jsch 4.0.0 - 2.10.42.5 + 2.10.42.6 org.dromara.jpom.plugins jpom-plugins-parent Jpom Plugins diff --git a/modules/sub-plugin/ssh-jsch/pom.xml b/modules/sub-plugin/ssh-jsch/pom.xml index 3faeb3fb2..c44520e0b 100644 --- a/modules/sub-plugin/ssh-jsch/pom.xml +++ b/modules/sub-plugin/ssh-jsch/pom.xml @@ -30,7 +30,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml plugin-ssh-jsch diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml index f903d98bf..b09c5a7c1 100644 --- a/modules/sub-plugin/svn-clone/pom.xml +++ b/modules/sub-plugin/svn-clone/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index b226ea22e..33668ed95 100644 --- a/modules/sub-plugin/webhook/pom.xml +++ b/modules/sub-plugin/webhook/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent org.dromara.jpom.plugins - 2.10.42.5 + 2.10.42.6 ../pom.xml 4.0.0 diff --git a/modules/updater/pom.xml b/modules/updater/pom.xml index 1d54b1c45..7653d3c57 100644 --- a/modules/updater/pom.xml +++ b/modules/updater/pom.xml @@ -29,7 +29,7 @@ jpom-parent org.dromara.jpom - 2.10.42.5 + 2.10.42.6 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 4e64ccb97..d3a990f39 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.10.42.5 + 2.10.42.6 https://gitee.com/dromara/Jpom UTF-8 diff --git a/script/tag.beta.txt b/script/tag.beta.txt index 6eda71125..1232cb90f 100644 --- a/script/tag.beta.txt +++ b/script/tag.beta.txt @@ -1 +1 @@ -2.10.42.5 +2.10.42.6