test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-03 12:29:14 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

pre commit 2.8.25

Browse Source
This commit is contained in:
bwcx_jzy 2022-06-10 14:24:32 +08:00
parent dbdb0a58c6
commit 3e867c5e17
No known key found for this signature in database
GPG Key ID: 5E48E9372088B9E5
22 changed files with 31 additions and 31 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.8.24 JPOM_VERSION=2.8.25
# Server Token 生产部署请更换 # Server Token 生产部署请更换
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97

10
.workflow/MasterPipeline.yml
View File

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

2
CHANGELOG.md
View File

@ -1,6 +1,6 @@
# 🚀 版本日志 # 🚀 版本日志
# 2.8.25 # 2.8.25 (2022-06-10)
### 🐣 新增功能 ### 🐣 新增功能

2
docs/version.txt
View File

@ -1 +1 @@
2.8.24 2.8.25

4
modules/agent/pom.xml
View File

@ -29,12 +29,12 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>io.jpom</groupId> <groupId>io.jpom</groupId>
<version>2.8.24</version> <version>2.8.25</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.8.24</version> <version>2.8.25</version>
<name>Jpom Agent</name> <name>Jpom Agent</name>
<properties> <properties>
<start-class>io.jpom.JpomAgentApplication</start-class> <start-class>io.jpom.JpomAgentApplication</start-class>

4
modules/common/pom.xml
View File

@ -29,13 +29,13 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>io.jpom</groupId> <groupId>io.jpom</groupId>
<version>2.8.24</version> <version>2.8.25</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.8.24</version> <version>2.8.25</version>
<dependencies> <dependencies>

2
modules/common/src/main/resources/jpom-logo.txt
View File

@ -7,4 +7,4 @@
| | | |
|_| |_|
➜ Jpom \ (•◡•) / (v2.8.24) ➜ Jpom \ (•◡•) / (v2.8.25)

2
modules/server/DockerfileRelease
View File

@ -24,7 +24,7 @@
FROM maven:3.8.5-jdk-8 FROM maven:3.8.5-jdk-8
ENV JPOM_HOME /usr/local/jpom-server ENV JPOM_HOME /usr/local/jpom-server
ENV JPOM_PKG server-2.8.24-release.tar.gz ENV JPOM_PKG server-2.8.25-release.tar.gz
ENV JPOM_DATA_PATH ${JPOM_HOME}/data ENV JPOM_DATA_PATH ${JPOM_HOME}/data
ENV JPOM_LOG_PATH ${JPOM_HOME}/log ENV JPOM_LOG_PATH ${JPOM_HOME}/log

4
modules/server/pom.xml
View File

@ -29,13 +29,13 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>io.jpom</groupId> <groupId>io.jpom</groupId>
<version>2.8.24</version> <version>2.8.25</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.8.24</version> <version>2.8.25</version>
<properties> <properties>
<start-class>io.jpom.JpomServerApplication</start-class> <start-class>io.jpom.JpomServerApplication</start-class>
</properties> </properties>

2
modules/sub-plugin/auto-charset-jchardet/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>io.jpom.plugins</groupId> <groupId>io.jpom.plugins</groupId>
<version>2.8.24</version> <version>2.8.25</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/db-h2/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>io.jpom.plugins</groupId> <groupId>io.jpom.plugins</groupId>
<version>2.8.24</version> <version>2.8.25</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/docker-cli/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>io.jpom.plugins</groupId> <groupId>io.jpom.plugins</groupId>
<version>2.8.24</version> <version>2.8.25</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

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>io.jpom.plugins</groupId> <groupId>io.jpom.plugins</groupId>
<version>2.8.24</version> <version>2.8.25</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

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>io.jpom.plugins</groupId> <groupId>io.jpom.plugins</groupId>
<version>2.8.24</version> <version>2.8.25</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/maven-plugin/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>io.jpom.plugins</groupId> <groupId>io.jpom.plugins</groupId>
<version>2.8.24</version> <version>2.8.25</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

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>
<groupId>io.jpom</groupId> <groupId>io.jpom</groupId>
<version>2.8.24</version> <version>2.8.25</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -44,7 +44,7 @@
<module>git-clone</module> <module>git-clone</module>
</modules> </modules>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.8.24</version> <version>2.8.25</version>
<groupId>io.jpom.plugins</groupId> <groupId>io.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/svn-clone/pom.xml
View File

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>io.jpom.plugins</groupId> <groupId>io.jpom.plugins</groupId>
<version>2.8.24</version> <version>2.8.25</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

@ -29,7 +29,7 @@
<parent> <parent>
<artifactId>jpom-plugins-parent</artifactId> <artifactId>jpom-plugins-parent</artifactId>
<groupId>io.jpom.plugins</groupId> <groupId>io.jpom.plugins</groupId>
<version>2.8.24</version> <version>2.8.25</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

@ -47,7 +47,7 @@
简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
</description> </description>
<inceptionYear>2017</inceptionYear> <inceptionYear>2017</inceptionYear>
<version>2.8.24</version> <version>2.8.25</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

@ -29,12 +29,12 @@
# https://hub.docker.com/r/jpomdocker/jpom # https://hub.docker.com/r/jpomdocker/jpom
# 服务端 # 服务端
docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.24 -f ./modules/server/DockerfileRelease --push . docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.25 -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.8.24 # 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.8.25
# docker stop jpom-server # docker stop jpom-server
# docker rm jpom-server # docker rm jpom-server
# docker exec -it jpom-server /bin/bash # docker exec -it jpom-server /bin/bash

2
script/release-sha1sum.sh
View File

@ -24,7 +24,7 @@
# 版本 # 版本
jpom_version=2.8.24 jpom_version=2.8.25
function checkItem() function checkItem()
{ {

2
web-vue/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "jpom-vue", "name": "jpom-vue",
"version": "2.8.24", "version": "2.8.25",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service --max-old-space-size=900 serve --mode dev", "serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",