commit 2.9.17

2024-12-02 03:48:05 +08:00 · 2022-11-28 17:53:08 +08:00 · 2022-11-28 17:53:08 +08:00 · c63e15b46c
commit c63e15b46c
parent 38d3fbba46
23 changed files with 32 additions and 126 deletions
--- a/.env
+++ b/.env
@ -1,3 +1,3 @@
-JPOM_VERSION=2.9.16
+JPOM_VERSION=2.9.17
 # Server Token 生产部署请更换
 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
--- a/.workflow/MasterPipeline.yml
+++ b/.workflow/MasterPipeline.yml
@ -29,14 +29,14 @@ stages:
        artifacts:
          - name: all_zip
            path:
-              - modules/server/target/server-2.9.16-release.zip
-              - modules/agent/target/agent-2.9.16-release.zip
+              - modules/server/target/server-2.9.17-release.zip
+              - modules/agent/target/agent-2.9.17-release.zip
          - name: server_zip
            path:
-              - modules/server/target/server-2.9.16-release.zip
+              - modules/server/target/server-2.9.17-release.zip
          - name: agent_zip
            path:
-              - modules/agent/target/agent-2.9.16-release.zip
+              - modules/agent/target/agent-2.9.17-release.zip
        settings: []
        strategy:
          retry: '0'
@ -50,7 +50,7 @@ stages:
        name: publish_general_artifacts
        displayName: 合并打包
        dependArtifact: all_zip
-        artifactName: jpom-2.9.16
+        artifactName: jpom-2.9.17
        strategy:
          retry: '0'
 strategy:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,6 @@
 # 🚀 版本日志

-## 2.9.17
+## 2.9.17 (2022-11-28)

 ### 🐣 新增功能

--- a/docs/version.txt
+++ b/docs/version.txt
@ -1 +1 @@
-2.9.16
+2.9.17
--- a/modules/agent/pom.xml
+++ b/modules/agent/pom.xml
@ -29,12 +29,12 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>agent</artifactId>
-    <version>2.9.16</version>
+    <version>2.9.17</version>
    <name>Jpom Agent</name>
    <properties>
        <start-class>io.jpom.JpomAgentApplication</start-class>
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@ -29,13 +29,13 @@
 	<parent>
 		<artifactId>jpom-parent</artifactId>
 		<groupId>io.jpom</groupId>
-		<version>2.9.16</version>
+		<version>2.9.17</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<name>Jpom Common</name>
 	<artifactId>common</artifactId>
-	<version>2.9.16</version>
+	<version>2.9.17</version>

 	<dependencies>

--- a/modules/common/src/main/resources/jpom-logo.txt
+++ b/modules/common/src/main/resources/jpom-logo.txt
@ -7,4 +7,4 @@
        | |
        |_|

- ➜ Jpom \ (•◡•) / (v2.9.16)
+ ➜ Jpom \ (•◡•) / (v2.9.17)
--- a/modules/server/DockerfileRelease
+++ b/modules/server/DockerfileRelease
@ -29,7 +29,7 @@ LABEL maintainer="bwcx-jzy <bwcx_jzy@163.com>"
 LABEL documentation="https://jpom.top"

 ENV JPOM_HOME	/usr/local/jpom-server
-ENV JPOM_PKG_VERSION	2.9.16
+ENV JPOM_PKG_VERSION	2.9.17
 ENV JPOM_PKG	server-${JPOM_PKG_VERSION}-release.tar.gz


--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@ -29,13 +29,13 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <name>Jpom Server</name>
    <artifactId>server</artifactId>
-    <version>2.9.16</version>
+    <version>2.9.17</version>
    <properties>
        <start-class>io.jpom.JpomServerApplication</start-class>
    </properties>
--- a/modules/sub-plugin/auto-charset-jchardet/pom.xml
+++ b/modules/sub-plugin/auto-charset-jchardet/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/db-h2/pom.xml
+++ b/modules/sub-plugin/db-h2/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/docker-cli/pom.xml
+++ b/modules/sub-plugin/docker-cli/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/email/pom.xml
+++ b/modules/sub-plugin/email/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/git-clone/pom.xml
+++ b/modules/sub-plugin/git-clone/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/maven-plugin/pom.xml
+++ b/modules/sub-plugin/maven-plugin/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/pom.xml
+++ b/modules/sub-plugin/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
@ -44,7 +44,7 @@
        <module>git-clone</module>
    </modules>
    <modelVersion>4.0.0</modelVersion>
-    <version>2.9.16</version>
+    <version>2.9.17</version>
    <groupId>io.jpom.plugins</groupId>
    <artifactId>jpom-plugins-parent</artifactId>
    <name>Jpom Plugins</name>
--- a/modules/sub-plugin/svn-clone/pom.xml
+++ b/modules/sub-plugin/svn-clone/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/webhook/pom.xml
+++ b/modules/sub-plugin/webhook/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.9.16</version>
+        <version>2.9.17</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/pom.xml
+++ b/pom.xml
@ -47,7 +47,7 @@
        简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
    </description>
    <inceptionYear>2017</inceptionYear>
-    <version>2.9.16</version>
+    <version>2.9.17</version>
    <url>https://gitee.com/dromara/Jpom</url>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--- 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.9.16 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.9.17 -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.9.16
+# 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.9.17
 # docker stop jpom-server
 # docker rm jpom-server
 # docker exec -it jpom-server /bin/bash
--- a/script/release-sha1sum.sh
+++ b/script/release-sha1sum.sh
@ -24,7 +24,7 @@


 # 版本
-jpom_version=2.9.16
+jpom_version=2.9.17

 #Mirror_Host=download.fastgit.org
 #Mirror_Host=hub.fastgit.xyz
--- a/web-vue/package.json
+++ b/web-vue/package.json
@ -1,6 +1,6 @@
 {
  "name": "jpom-vue",
-  "version": "2.9.16",
+  "version": "2.9.17",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service --max-old-space-size=900 serve  --mode dev",
--- a/web-vue/public/index.html
+++ b/web-vue/public/index.html
@ -15,101 +15,7 @@
    <meta name="jpom-version" content="<%= htmlWebpackPlugin.options.buildVersion %>">
    <title><%= htmlWebpackPlugin.options.title %></title>
    <style>
-        .first-loading-wrp {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            flex-direction: column;
-            min-height: 420px;
-            height: 100%
-        }
-
-        .first-loading-wrp > h1 {
-            font-size: 128px
-        }
-
-        .first-loading-wrp .loading-wrp {
-            padding: 98px;
-            display: flex;
-            justify-content: center;
-            align-items: center
-        }
-
-        .dot {
-            animation: antRotate 1.2s infinite linear;
-            transform: rotate(45deg);
-            position: relative;
-            display: inline-block;
-            font-size: 32px;
-            width: 32px;
-            height: 32px;
-            box-sizing: border-box
-        }
-
-        .dot i {
-            width: 14px;
-            height: 14px;
-            position: absolute;
-            display: block;
-            background-color: #1890ff;
-            border-radius: 100%;
-            transform: scale(.75);
-            transform-origin: 50% 50%;
-            opacity: .3;
-            animation: antSpinMove 1s infinite linear alternate
-        }
-
-        .dot i:nth-child(1) {
-            top: 0;
-            left: 0
-        }
-
-        .dot i:nth-child(2) {
-            top: 0;
-            right: 0;
-            -webkit-animation-delay: .4s;
-            animation-delay: .4s
-        }
-
-        .dot i:nth-child(3) {
-            right: 0;
-            bottom: 0;
-            -webkit-animation-delay: .8s;
-            animation-delay: .8s
-        }
-
-        .dot i:nth-child(4) {
-            bottom: 0;
-            left: 0;
-            -webkit-animation-delay: 1.2s;
-            animation-delay: 1.2s
-        }
-
-        @keyframes antRotate {
-            to {
-                -webkit-transform: rotate(405deg);
-                transform: rotate(405deg)
-            }
-        }
-
-        @-webkit-keyframes antRotate {
-            to {
-                -webkit-transform: rotate(405deg);
-                transform: rotate(405deg)
-            }
-        }
-
-        @keyframes antSpinMove {
-            to {
-                opacity: 1
-            }
-        }
-
-        @-webkit-keyframes antSpinMove {
-            to {
-                opacity: 1
-            }
-        }
+        .first-loading-wrp {display: flex;justify-content: center;align-items: center;flex-direction: column;min-height: 420px;height: 100% }.first-loading-wrp > h1 {font-size: 128px }.first-loading-wrp .loading-wrp {padding: 98px;display: flex;justify-content: center;align-items: center }.dot {animation: antRotate 1.2s infinite linear;transform: rotate(45deg);position: relative;display: inline-block;font-size: 32px;width: 32px;height: 32px;box-sizing: border-box }.dot i {width: 14px;height: 14px;position: absolute;display: block;background-color: #1890ff;border-radius: 100%;transform: scale(.75);transform-origin: 50% 50%;opacity: .3;animation: antSpinMove 1s infinite linear alternate }.dot i:nth-child(1) {top: 0;left: 0 }.dot i:nth-child(2) {top: 0;right: 0;-webkit-animation-delay: .4s;animation-delay: .4s }.dot i:nth-child(3) {right: 0;bottom: 0;-webkit-animation-delay: .8s;animation-delay: .8s }.dot i:nth-child(4) {bottom: 0;left: 0;-webkit-animation-delay: 1.2s;animation-delay: 1.2s }@keyframes antRotate {to {-webkit-transform: rotate(405deg);transform: rotate(405deg) }}@-webkit-keyframes antRotate {to {-webkit-transform: rotate(405deg);transform: rotate(405deg) }}@keyframes antSpinMove {to {opacity: 1 }}@-webkit-keyframes antSpinMove {to {opacity: 1 }}
    </style>
 </head>
 <body>
 @ -1 +1 @@
 .9.16
 .9.17