test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-11-29 18:38:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
小吾立 2024-04-23 14:42:18 +08:00
commit 0e51d00e16
30 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -1,3 +1,3 @@
JPOM_VERSION=2.11.4 JPOM_VERSION=2.11.5
# Server Token 生产部署请更换 # Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97

10
.workflow/MasterPipeline.yml
View File

@ -39,14 +39,14 @@ stages:
artifacts: artifacts:
- name: all_zip - name: all_zip
path: path:
- modules/server/target/server-2.11.4-release.zip - modules/server/target/server-2.11.5-release.zip
- modules/agent/target/agent-2.11.4-release.zip - modules/agent/target/agent-2.11.5-release.zip
- name: server_zip - name: server_zip
path: path:
- modules/server/target/server-2.11.4-release.zip - modules/server/target/server-2.11.5-release.zip
- name: agent_zip - name: agent_zip
path: path:
- modules/agent/target/agent-2.11.4-release.zip - modules/agent/target/agent-2.11.5-release.zip
settings: [] settings: []
strategy: strategy:
retry: '0' retry: '0'
@ -60,7 +60,7 @@ stages:
name: publish_general_artifacts name: publish_general_artifacts
displayName: 合并打包 displayName: 合并打包
dependArtifact: all_zip dependArtifact: all_zip
artifactName: jpom-2.11.4 artifactName: jpom-2.11.5
strategy: strategy:
retry: '0' retry: '0'
strategy: strategy:

2
env-release.env
View File

@ -1,3 +1,3 @@
JPOM_VERSION=2.11.4 JPOM_VERSION=2.11.5
# Server Token 生产部署请更换 # Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97

2
modules/agent-transport/agent-transport-common/pom.xml
View File

@ -17,7 +17,7 @@
<parent> <parent>
<groupId>org.dromara.jpom.agent-transport</groupId> <groupId>org.dromara.jpom.agent-transport</groupId>
<artifactId>jpom-agent-transport-parent</artifactId> <artifactId>jpom-agent-transport-parent</artifactId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/agent-transport/agent-transport-http/pom.xml
View File

@ -17,7 +17,7 @@
<parent> <parent>
<groupId>org.dromara.jpom.agent-transport</groupId> <groupId>org.dromara.jpom.agent-transport</groupId>
<artifactId>jpom-agent-transport-parent</artifactId> <artifactId>jpom-agent-transport-parent</artifactId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

4
modules/agent-transport/pom.xml
View File

@ -16,7 +16,7 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -25,7 +25,7 @@
<module>agent-transport-http</module> <module>agent-transport-http</module>
</modules> </modules>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.11.4.2</version> <version>2.11.5</version>
<groupId>org.dromara.jpom.agent-transport</groupId> <groupId>org.dromara.jpom.agent-transport</groupId>
<artifactId>jpom-agent-transport-parent</artifactId> <artifactId>jpom-agent-transport-parent</artifactId>
<name>Jpom Agent Transport</name> <name>Jpom Agent Transport</name>

4
modules/agent/pom.xml
View File

@ -16,12 +16,12 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>agent</artifactId> <artifactId>agent</artifactId>
<version>2.11.4.2</version> <version>2.11.5</version>
<name>Jpom Agent</name> <name>Jpom Agent</name>
<properties> <properties>
<start-class>org.dromara.jpom.JpomAgentApplication</start-class> <start-class>org.dromara.jpom.JpomAgentApplication</start-class>

4
modules/common/pom.xml
View File

@ -16,13 +16,13 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>Jpom Common</name> <name>Jpom Common</name>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>2.11.4.2</version> <version>2.11.5</version>
<dependencies> <dependencies>

2
modules/common/src/main/resources/banner.txt
View File

@ -7,4 +7,4 @@
| | | |
|_| |_|
➜ Jpom is licensed under Mulan PSL v2. ➜ Jpom is licensed under Mulan PSL v2.
➜ \ (•◡•) / (v2.11.4.2) ➜ \ (•◡•) / (v2.11.5)

2
modules/server/DockerfileRelease
View File

@ -16,7 +16,7 @@ LABEL maintainer="bwcx-jzy <bwcx_jzy@163.com>"
LABEL documentation="https://jpom.top" LABEL documentation="https://jpom.top"
ENV JPOM_HOME /usr/local/jpom-server ENV JPOM_HOME /usr/local/jpom-server
ENV JPOM_PKG_VERSION 2.11.4 ENV JPOM_PKG_VERSION 2.11.5
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1 ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

2
modules/server/DockerfileReleaseJdk17
View File

@ -16,7 +16,7 @@ LABEL maintainer="bwcx-jzy <bwcx_jzy@163.com>"
LABEL documentation="https://jpom.top" LABEL documentation="https://jpom.top"
ENV JPOM_HOME /usr/local/jpom-server ENV JPOM_HOME /usr/local/jpom-server
ENV JPOM_PKG_VERSION 2.11.4 ENV JPOM_PKG_VERSION 2.11.5
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1 ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

4
modules/server/pom.xml
View File

@ -16,13 +16,13 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>Jpom Server</name> <name>Jpom Server</name>
<artifactId>server</artifactId> <artifactId>server</artifactId>
<version>2.11.4.2</version> <version>2.11.5</version>
<properties> <properties>
<start-class>org.dromara.jpom.JpomServerApplication</start-class> <start-class>org.dromara.jpom.JpomServerApplication</start-class>
</properties> </properties>

4
modules/storage-module/pom.xml
View File

@ -16,7 +16,7 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -28,7 +28,7 @@
<module>storage-module-mariadb</module> <module>storage-module-mariadb</module>
</modules> </modules>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.11.4.2</version> <version>2.11.5</version>
<groupId>org.dromara.jpom.storage-module</groupId> <groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId> <artifactId>jpom-storage-module-parent</artifactId>
<name>Jpom storage module</name> <name>Jpom storage module</name>

2
modules/storage-module/storage-module-common/pom.xml
View File

@ -17,7 +17,7 @@
<parent> <parent>
<groupId>org.dromara.jpom.storage-module</groupId> <groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId> <artifactId>jpom-storage-module-parent</artifactId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/storage-module/storage-module-h2/pom.xml
View File

@ -17,7 +17,7 @@
<parent> <parent>
<groupId>org.dromara.jpom.storage-module</groupId> <groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId> <artifactId>jpom-storage-module-parent</artifactId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/storage-module/storage-module-mariadb/pom.xml
View File

@ -17,7 +17,7 @@
<parent> <parent>
<groupId>org.dromara.jpom.storage-module</groupId> <groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId> <artifactId>jpom-storage-module-parent</artifactId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/storage-module/storage-module-mysql/pom.xml
View File

@ -17,7 +17,7 @@
<parent> <parent>
<groupId>org.dromara.jpom.storage-module</groupId> <groupId>org.dromara.jpom.storage-module</groupId>
<artifactId>jpom-storage-module-parent</artifactId> <artifactId>jpom-storage-module-parent</artifactId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
modules/storage-module/storage-module-postgresql/pom.xml
View File

@ -16,7 +16,7 @@
<parent> <parent>
<artifactId>jpom-storage-module-parent</artifactId> <artifactId>jpom-storage-module-parent</artifactId>
<groupId>org.dromara.jpom.storage-module</groupId> <groupId>org.dromara.jpom.storage-module</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/sub-plugin/docker-cli/pom.xml
View File

@ -16,7 +16,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/sub-plugin/email/pom.xml
View File

@ -16,7 +16,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/sub-plugin/encrypt/pom.xml
View File

@ -16,7 +16,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/sub-plugin/git-clone/pom.xml
View File

@ -16,7 +16,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
modules/sub-plugin/pom.xml
View File

@ -16,7 +16,7 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>org.dromara.jpom</groupId> <groupId>org.dromara.jpom</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -30,7 +30,7 @@
<module>ssh-jsch</module> <module>ssh-jsch</module>
</modules> </modules>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.11.4.2</version> <version>2.11.5</version>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<name>Jpom Plugins</name> <name>Jpom Plugins</name>

2
modules/sub-plugin/ssh-jsch/pom.xml
View File

@ -17,7 +17,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<name>plugin-ssh-jsch</name> <name>plugin-ssh-jsch</name>

2
modules/sub-plugin/svn-clone/pom.xml
View File

@ -16,7 +16,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/sub-plugin/webhook/pom.xml
View File

@ -16,7 +16,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>org.dromara.jpom.plugins</groupId> <groupId>org.dromara.jpom.plugins</groupId>
<version>2.11.4.2</version> <version>2.11.5</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

@ -36,7 +36,7 @@
简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
</description> </description>
<inceptionYear>2017</inceptionYear> <inceptionYear>2017</inceptionYear>
<version>2.11.4.2</version> <version>2.11.5</version>
<url>https://gitee.com/dromara/Jpom</url> <url>https://gitee.com/dromara/Jpom</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

4
script/docker.sh
View File

@ -18,12 +18,12 @@
# docker buildx create --use # docker buildx create --use
# 服务端 # 服务端
docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.11.4.1 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push . docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.11.5.1 -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 buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
# docker logs --tail="100" jpom-server # 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.11.4.1 # 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.11.5.1
# 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 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 stop jpom-server
# docker rm jpom-server # docker rm jpom-server

2
script/tag.release.txt
View File

@ -1 +1 @@
2.11.4 2.11.5

2
web-vue/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "jpom-vue3", "name": "jpom-vue3",
"private": true, "private": true,
"version": "2.11.4", "version": "2.11.5",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite --mode dev", "dev": "vite --mode dev",