diff --git a/.env b/.env
index 48505935c6..f9890aa9fa 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-JPOM_VERSION=2.10.32
+JPOM_VERSION=2.10.33
# Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
diff --git a/.workflow/MasterPipeline.yml b/.workflow/MasterPipeline.yml
index 2f70e32548..ce389f9265 100644
--- a/.workflow/MasterPipeline.yml
+++ b/.workflow/MasterPipeline.yml
@@ -29,14 +29,14 @@ stages:
artifacts:
- name: all_zip
path:
- - modules/server/target/server-2.10.32-release.zip
- - modules/agent/target/agent-2.10.32-release.zip
+ - modules/server/target/server-2.10.33-release.zip
+ - modules/agent/target/agent-2.10.33-release.zip
- name: server_zip
path:
- - modules/server/target/server-2.10.32-release.zip
+ - modules/server/target/server-2.10.33-release.zip
- name: agent_zip
path:
- - modules/agent/target/agent-2.10.32-release.zip
+ - modules/agent/target/agent-2.10.33-release.zip
settings: []
strategy:
retry: '0'
@@ -50,7 +50,7 @@ stages:
name: publish_general_artifacts
displayName: 合并打包
dependArtifact: all_zip
- artifactName: jpom-2.10.32
+ artifactName: jpom-2.10.33
strategy:
retry: '0'
strategy:
diff --git a/docs/version.txt b/docs/version.txt
index a863cb8540..319c6e7f27 100644
--- a/docs/version.txt
+++ b/docs/version.txt
@@ -1 +1 @@
-2.10.32
+2.10.33
diff --git a/modules/agent-transport/agent-transport-common/pom.xml b/modules/agent-transport/agent-transport-common/pom.xml
index 1abff1137e..7f20e18196 100644
--- a/modules/agent-transport/agent-transport-common/pom.xml
+++ b/modules/agent-transport/agent-transport-common/pom.xml
@@ -30,7 +30,7 @@
io.jpom.agent-transport
jpom-agent-transport-parent
- 2.10.32
+ 2.10.33
../pom.xml
diff --git a/modules/agent-transport/agent-transport-http/pom.xml b/modules/agent-transport/agent-transport-http/pom.xml
index 63f408bc50..df958b4502 100644
--- a/modules/agent-transport/agent-transport-http/pom.xml
+++ b/modules/agent-transport/agent-transport-http/pom.xml
@@ -30,7 +30,7 @@
io.jpom.agent-transport
jpom-agent-transport-parent
- 2.10.32
+ 2.10.33
../pom.xml
diff --git a/modules/agent-transport/pom.xml b/modules/agent-transport/pom.xml
index 95f149ccab..3c6a10b74d 100644
--- a/modules/agent-transport/pom.xml
+++ b/modules/agent-transport/pom.xml
@@ -29,7 +29,7 @@
jpom-parent
io.jpom
- 2.10.32
+ 2.10.33
../../pom.xml
pom
@@ -38,7 +38,7 @@
agent-transport-http
4.0.0
- 2.10.32
+ 2.10.33
io.jpom.agent-transport
jpom-agent-transport-parent
Jpom Agent Transport
diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml
index 8ed3e81ef0..ade765d2ef 100644
--- a/modules/agent/pom.xml
+++ b/modules/agent/pom.xml
@@ -29,12 +29,12 @@
jpom-parent
io.jpom
- 2.10.32
+ 2.10.33
../../pom.xml
4.0.0
agent
- 2.10.32
+ 2.10.33
Jpom Agent
io.jpom.JpomAgentApplication
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index e107632e1c..1ca224160c 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -29,13 +29,13 @@
jpom-parent
io.jpom
- 2.10.32
+ 2.10.33
../../pom.xml
4.0.0
Jpom Common
common
- 2.10.32
+ 2.10.33
diff --git a/modules/common/src/main/resources/banner.txt b/modules/common/src/main/resources/banner.txt
index df40a620a3..590d44e01d 100644
--- a/modules/common/src/main/resources/banner.txt
+++ b/modules/common/src/main/resources/banner.txt
@@ -8,4 +8,4 @@
| |
|_|
- ➜ Jpom \ (•◡•) / (v2.10.32)
+ ➜ Jpom \ (•◡•) / (v2.10.33)
diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease
index c6bc9fc347..6bebd64d87 100644
--- a/modules/server/DockerfileRelease
+++ b/modules/server/DockerfileRelease
@@ -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.32
+ENV JPOM_PKG_VERSION 2.10.33
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 0555570360..04e0c58a5a 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -29,13 +29,13 @@
jpom-parent
io.jpom
- 2.10.32
+ 2.10.33
../../pom.xml
4.0.0
Jpom Server
server
- 2.10.32
+ 2.10.33
io.jpom.JpomServerApplication
diff --git a/modules/storage-module/pom.xml b/modules/storage-module/pom.xml
index 3151fa5629..fa78a7aac5 100644
--- a/modules/storage-module/pom.xml
+++ b/modules/storage-module/pom.xml
@@ -29,7 +29,7 @@
jpom-parent
io.jpom
- 2.10.32
+ 2.10.33
../../pom.xml
pom
@@ -39,7 +39,7 @@
storage-module-mysql
4.0.0
- 2.10.32
+ 2.10.33
io.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 86042023f5..695d2298ab 100644
--- a/modules/storage-module/storage-module-common/pom.xml
+++ b/modules/storage-module/storage-module-common/pom.xml
@@ -30,7 +30,7 @@
io.jpom.storage-module
jpom-storage-module-parent
- 2.10.32
+ 2.10.33
../pom.xml
diff --git a/modules/storage-module/storage-module-h2/pom.xml b/modules/storage-module/storage-module-h2/pom.xml
index ceb8a1786b..1ce7a0a54e 100644
--- a/modules/storage-module/storage-module-h2/pom.xml
+++ b/modules/storage-module/storage-module-h2/pom.xml
@@ -30,7 +30,7 @@
io.jpom.storage-module
jpom-storage-module-parent
- 2.10.32
+ 2.10.33
../pom.xml
diff --git a/modules/storage-module/storage-module-mysql/pom.xml b/modules/storage-module/storage-module-mysql/pom.xml
index 0d24b873b6..90571b53b7 100644
--- a/modules/storage-module/storage-module-mysql/pom.xml
+++ b/modules/storage-module/storage-module-mysql/pom.xml
@@ -30,7 +30,7 @@
io.jpom.storage-module
jpom-storage-module-parent
- 2.10.32
+ 2.10.33
../pom.xml
diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml
index 3447257e98..efb79ae57e 100644
--- a/modules/sub-plugin/docker-cli/pom.xml
+++ b/modules/sub-plugin/docker-cli/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.10.32
+ 2.10.33
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml
index 260b76d0c1..469abb4927 100644
--- a/modules/sub-plugin/email/pom.xml
+++ b/modules/sub-plugin/email/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.10.32
+ 2.10.33
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/encrypt/pom.xml b/modules/sub-plugin/encrypt/pom.xml
index e31e1c0b9e..8db45ecec9 100644
--- a/modules/sub-plugin/encrypt/pom.xml
+++ b/modules/sub-plugin/encrypt/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.10.32
+ 2.10.33
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml
index 85c89a22c1..3bfd4d5f3b 100644
--- a/modules/sub-plugin/git-clone/pom.xml
+++ b/modules/sub-plugin/git-clone/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.10.32
+ 2.10.33
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml
index ee75ff02e3..60fa29f7c8 100644
--- a/modules/sub-plugin/pom.xml
+++ b/modules/sub-plugin/pom.xml
@@ -29,7 +29,7 @@
jpom-parent
io.jpom
- 2.10.32
+ 2.10.33
../../pom.xml
pom
@@ -42,7 +42,7 @@
encrypt
4.0.0
- 2.10.32
+ 2.10.33
io.jpom.plugins
jpom-plugins-parent
Jpom Plugins
diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml
index 64a04b3dc9..5bd77b52af 100644
--- a/modules/sub-plugin/svn-clone/pom.xml
+++ b/modules/sub-plugin/svn-clone/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.10.32
+ 2.10.33
../pom.xml
4.0.0
diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml
index ffe0e68f4e..95234cf6c8 100644
--- a/modules/sub-plugin/webhook/pom.xml
+++ b/modules/sub-plugin/webhook/pom.xml
@@ -29,7 +29,7 @@
jpom-plugins-parent
io.jpom.plugins
- 2.10.32
+ 2.10.33
../pom.xml
4.0.0
diff --git a/modules/updater/pom.xml b/modules/updater/pom.xml
index 0a249adfb5..961355dba3 100644
--- a/modules/updater/pom.xml
+++ b/modules/updater/pom.xml
@@ -29,7 +29,7 @@
jpom-parent
io.jpom
- 2.10.32
+ 2.10.33
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index d2f91fa486..0de760e315 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
2017
- 2.10.32
+ 2.10.33
https://gitee.com/dromara/Jpom
UTF-8
diff --git a/script/docker.sh b/script/docker.sh
index 925b674356..10246fadde 100644
--- a/script/docker.sh
+++ b/script/docker.sh
@@ -31,12 +31,12 @@
# docker buildx create --use
# 服务端
-docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.32 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.33 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
#
#docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
# docker logs --tail="100" jpom-server
-# docker run -d -p 2122:2122 --name jpom-server -v /etc/localtime:/etc/localtime:ro -v jpom-server-vol:/usr/local/jpom-server jpomdocker/jpom:mac-arm-2.10.32
+# docker run -d -p 2122:2122 --name jpom-server -v /etc/localtime:/etc/localtime:ro -v jpom-server-vol:/usr/local/jpom-server jpomdocker/jpom:mac-arm-2.10.33
# docker run -d -p 2122:2122 --name jpom-server -v D:/home/jpom-server/logs:/usr/local/jpom-server/logs -v D:/home/jpom-server/data:/usr/local/jpom-server/data -v D:/home/jpom-server/conf:/usr/local/jpom-server/conf jpomdocker/jpom
# docker stop jpom-server
# docker rm jpom-server
diff --git a/script/release-sha1sum.sh b/script/release-sha1sum.sh
index 7fcb531ebf..d1472677d4 100644
--- a/script/release-sha1sum.sh
+++ b/script/release-sha1sum.sh
@@ -24,7 +24,7 @@
# 版本
-jpom_version=2.10.32
+jpom_version=2.10.33
#Mirror_Host=download.fastgit.org
#Mirror_Host=hub.fastgit.xyz
diff --git a/web-vue/package.json b/web-vue/package.json
index 6195562cfe..51279b076d 100644
--- a/web-vue/package.json
+++ b/web-vue/package.json
@@ -1,6 +1,6 @@
{
"name": "jpom-vue",
- "version": "2.10.32",
+ "version": "2.10.33",
"private": true,
"scripts": {
"serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",