Skip to content

Commit 778a46f

Browse files
bwcx-jzybwcx-jzy
committed
2 commit 2.10.16
1 parent e4ca4ce commit 778a46f

File tree

29 files changed

+41
-39
lines changed

29 files changed

+41
-39
lines changed

‎.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
JPOM_VERSION=2.10.15
1+
JPOM_VERSION=2.10.16
22
# Server Token 生产部署请更换
33
SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97

‎.workflow/MasterPipeline.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ stages:
2929
artifacts:
3030
- name: all_zip
3131
path:
32-
- modules/server/target/server-2.10.15-release.zip
33-
- modules/agent/target/agent-2.10.15-release.zip
32+
- modules/server/target/server-2.10.16-release.zip
33+
- modules/agent/target/agent-2.10.16-release.zip
3434
- name: server_zip
3535
path:
36-
- modules/server/target/server-2.10.15-release.zip
36+
- modules/server/target/server-2.10.16-release.zip
3737
- name: agent_zip
3838
path:
39-
- modules/agent/target/agent-2.10.15-release.zip
39+
- modules/agent/target/agent-2.10.16-release.zip
4040
settings: []
4141
strategy:
4242
retry: '0'
@@ -50,7 +50,7 @@ stages:
5050
name: publish_general_artifacts
5151
displayName: 合并打包
5252
dependArtifact: all_zip
53-
artifactName: jpom-2.10.15
53+
artifactName: jpom-2.10.16
5454
strategy:
5555
retry: '0'
5656
strategy:

‎PLANS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
15. **用户体系支持接入第三方系统**
2020
16. 监控通知模块优化支持更多（飞书）
2121

22-
构建参数
22+
回滚操作日志
2323

2424
### DONE
2525

‎docs/version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.10.15
1+
2.10.16

‎modules/agent-transport/agent-transport-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<parent>
3131
<groupId>io.jpom.agent-transport</groupId>
3232
<artifactId>jpom-agent-transport-parent</artifactId>
33-
<version>2.10.15</version>
33+
<version>2.10.16</version>
3434
<relativePath>../pom.xml</relativePath>
3535
</parent>
3636

‎modules/agent-transport/agent-transport-http/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<parent>
3131
<groupId>io.jpom.agent-transport</groupId>
3232
<artifactId>jpom-agent-transport-parent</artifactId>
33-
<version>2.10.15</version>
33+
<version>2.10.16</version>
3434
<relativePath>../pom.xml</relativePath>
3535
</parent>
3636

‎modules/agent-transport/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>jpom-parent</artifactId>
3131
<groupId>io.jpom</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../../pom.xml</relativePath>
3434
</parent>
3535
<packaging>pom</packaging>
@@ -38,7 +38,7 @@
3838
<module>agent-transport-http</module>
3939
</modules>
4040
<modelVersion>4.0.0</modelVersion>
41-
<version>2.10.15</version>
41+
<version>2.10.16</version>
4242
<groupId>io.jpom.agent-transport</groupId>
4343
<artifactId>jpom-agent-transport-parent</artifactId>
4444
<name>Jpom Agent Transport</name>

‎modules/agent/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
<parent>
3030
<artifactId>jpom-parent</artifactId>
3131
<groupId>io.jpom</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../../pom.xml</relativePath>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>
3636
<artifactId>agent</artifactId>
37-
<version>2.10.15</version>
37+
<version>2.10.16</version>
3838
<name>Jpom Agent</name>
3939
<properties>
4040
<start-class>io.jpom.JpomAgentApplication</start-class>

‎modules/common/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
<parent>
3030
<artifactId>jpom-parent</artifactId>
3131
<groupId>io.jpom</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../../pom.xml</relativePath>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>
3636
<name>Jpom Common</name>
3737
<artifactId>common</artifactId>
38-
<version>2.10.15</version>
38+
<version>2.10.16</version>
3939

4040
<dependencies>
4141

‎modules/common/src/main/resources/banner.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
| |
99
|_|
1010

11-
➜ Jpom \ (•◡•) / (v2.10.15)
11+
➜ Jpom \ (•◡•) / (v2.10.16)

‎modules/server/DockerfileRelease

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ LABEL maintainer="bwcx-jzy <[email protected]>"
2929
LABEL documentation="https://jpom.top"
3030

3131
ENV JPOM_HOME /usr/local/jpom-server
32-
ENV JPOM_PKG_VERSION 2.10.15
32+
ENV JPOM_PKG_VERSION 2.10.16
3333
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
3434
ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1
3535

‎modules/server/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
<parent>
3030
<artifactId>jpom-parent</artifactId>
3131
<groupId>io.jpom</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../../pom.xml</relativePath>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>
3636
<name>Jpom Server</name>
3737
<artifactId>server</artifactId>
38-
<version>2.10.15</version>
38+
<version>2.10.16</version>
3939
<properties>
4040
<start-class>io.jpom.JpomServerApplication</start-class>
4141
</properties>

‎modules/storage-module/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>jpom-parent</artifactId>
3131
<groupId>io.jpom</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../../pom.xml</relativePath>
3434
</parent>
3535
<packaging>pom</packaging>
@@ -39,7 +39,7 @@
3939
<module>storage-module-mysql</module>
4040
</modules>
4141
<modelVersion>4.0.0</modelVersion>
42-
<version>2.10.15</version>
42+
<version>2.10.16</version>
4343
<groupId>io.jpom.storage-module</groupId>
4444
<artifactId>jpom-storage-module-parent</artifactId>
4545
<name>Jpom storage module</name>

‎modules/storage-module/storage-module-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<parent>
3131
<groupId>io.jpom.storage-module</groupId>
3232
<artifactId>jpom-storage-module-parent</artifactId>
33-
<version>2.10.15</version>
33+
<version>2.10.16</version>
3434
<relativePath>../pom.xml</relativePath>
3535
</parent>
3636

‎modules/storage-module/storage-module-h2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<parent>
3131
<groupId>io.jpom.storage-module</groupId>
3232
<artifactId>jpom-storage-module-parent</artifactId>
33-
<version>2.10.15</version>
33+
<version>2.10.16</version>
3434
<relativePath>../pom.xml</relativePath>
3535
</parent>
3636

‎modules/storage-module/storage-module-mysql/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<parent>
3131
<groupId>io.jpom.storage-module</groupId>
3232
<artifactId>jpom-storage-module-parent</artifactId>
33-
<version>2.10.15</version>
33+
<version>2.10.16</version>
3434
<relativePath>../pom.xml</relativePath>
3535
</parent>
3636

‎modules/sub-plugin/docker-cli/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>jpom-plugins-parent</artifactId>
3131
<groupId>io.jpom.plugins</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../pom.xml</relativePath>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>

‎modules/sub-plugin/email/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>jpom-plugins-parent</artifactId>
3131
<groupId>io.jpom.plugins</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../pom.xml</relativePath>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>

‎modules/sub-plugin/git-clone/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>jpom-plugins-parent</artifactId>
3131
<groupId>io.jpom.plugins</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../pom.xml</relativePath>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>

‎modules/sub-plugin/maven-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>jpom-plugins-parent</artifactId>
3131
<groupId>io.jpom.plugins</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../pom.xml</relativePath>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>

‎modules/sub-plugin/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>jpom-parent</artifactId>
3131
<groupId>io.jpom</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../../pom.xml</relativePath>
3434
</parent>
3535
<packaging>pom</packaging>
@@ -42,7 +42,7 @@
4242
<module>git-clone</module>
4343
</modules>
4444
<modelVersion>4.0.0</modelVersion>
45-
<version>2.10.15</version>
45+
<version>2.10.16</version>
4646
<groupId>io.jpom.plugins</groupId>
4747
<artifactId>jpom-plugins-parent</artifactId>
4848
<name>Jpom Plugins</name>

‎modules/sub-plugin/svn-clone/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>jpom-plugins-parent</artifactId>
3131
<groupId>io.jpom.plugins</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../pom.xml</relativePath>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>

‎modules/sub-plugin/webhook/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>jpom-plugins-parent</artifactId>
3131
<groupId>io.jpom.plugins</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../pom.xml</relativePath>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>

‎modules/updater/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>jpom-parent</artifactId>
3131
<groupId>io.jpom</groupId>
32-
<version>2.10.15</version>
32+
<version>2.10.16</version>
3333
<relativePath>../../pom.xml</relativePath>
3434
</parent>
3535
<modelVersion>4.0.0</modelVersion>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
5151
</description>
5252
<inceptionYear>2017</inceptionYear>
53-
<version>2.10.15</version>
53+
<version>2.10.16</version>
5454
<url>https://gitee.com/dromara/Jpom</url>
5555
<properties>
5656
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎script/docker.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
# docker buildx create --use
3232

3333
# 服务端
34-
docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.15 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
34+
docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.16 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
3535
#
3636
#docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
3737

3838
# docker logs --tail="100" jpom-server
39-
# 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.15
39+
# 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.16
4040
# 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
4141
# docker stop jpom-server
4242
# docker rm jpom-server

‎script/release-sha1sum.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525

2626
# 版本
27-
jpom_version=2.10.15
27+
jpom_version=2.10.16
2828

2929
#Mirror_Host=download.fastgit.org
3030
#Mirror_Host=hub.fastgit.xyz

‎web-vue/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jpom-vue",
3-
"version": "2.10.15",
3+
"version": "2.10.16",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",

‎web-vue/src/utils/const.js

+2
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,7 @@ export function compareVersion(version1, version2) {
510510
return diff !== 0 ? diff : v1s.length - v2s.length;
511511
}
512512

513+
// 当前页面构建信息
513514
export function pageBuildInfo() {
514515
const htmlVersion = document.head.querySelector("[name~=jpom-version][content]").content;
515516
const buildTime = document.head.querySelector("[name~=build-time][content]").content;
@@ -519,5 +520,6 @@ export function pageBuildInfo() {
519520
t: buildTime,
520521
e: buildEnv,
521522
df: (document.title || "").toLowerCase().includes("jpom"),
523+
t2: Date.now(),
522524
};
523525
}

0 commit comments

Comments
 (0)