commit 2.8.18

dromara · Apr 12, 2022 · 863c470 · 863c470
1 parent e670f82
commit 863c470
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 31 deletions.
diff --git a/.env b/.env
@@ -1,3 +1,3 @@
-JPOM_VERSION=2.8.17
+JPOM_VERSION=2.8.18
 # Server Token 生产部署请更换
 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,12 @@
 # 🚀 版本日志
 
 
-# 2.8.18
+# 2.8.18 (2022-04-12)
 
 ### 🐣 新增功能
 
 1. 【server】SSH文件管理器中加入创建目录和文件的功能 （感谢 [@wxyShine](https://gitee.com/wxyShine) [Gitee PR 161](https://gitee.com/dromara/Jpom/pulls/161) ）
-2. 【server】新增禁用登录图形验证码配置属性 `jpom.disabledCaptcha` （ [Gitee issues I4GD0U](https://gitee.com/dromara/Jpom/issues/I4GD0U) ）
+2. 【server】新增禁用登录图形验证码配置属性 `jpom.disabledCaptcha` （感谢 [@放学后的茶会](https://gitee.com/tt2yui) [Gitee issues I4GD0U](https://gitee.com/dromara/Jpom/issues/I4GD0U) ）
 3. 【agent】节点项目文件管理新增创建文件夹/文件功能 （感谢 [@Eibons](https://gitee.com/eibons) [Gitee issues I4ZFFH](https://gitee.com/dromara/Jpom/issues/I4ZFFH) ）
 
 ### 🐞 解决BUG、优化功能

diff --git a/docs/js/version.js b/docs/js/version.js
@@ -1 +1 @@
-var version = '2.8.17';
+var version = '2.8.18';
diff --git a/docs/version.txt b/docs/version.txt
@@ -1 +1 @@
-2.8.17
+2.8.18
diff --git a/docs/versions.json b/docs/versions.json
@@ -1,6 +1,6 @@
 {
-  "tag_name": "v2.8.17",
-  "agentUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/agent-2.8.17-release.zip",
-  "serverUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/server-2.8.17-release.zip",
+  "tag_name": "v2.8.18",
+  "agentUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/agent-2.8.18-release.zip",
+  "serverUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/server-2.8.18-release.zip",
   "changelogUrl": "https://gitee.com/dromara/Jpom/raw/master/CHANGELOG.md"
 }
diff --git 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.8.17</version>
+        <version>2.8.18</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>agent</artifactId>
-    <version>2.8.17</version>
+    <version>2.8.18</version>
     <name>Jpom Agent</name>
     <properties>
         <start-class>io.jpom.JpomAgentApplication</start-class>

diff --git 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.8.17</version>
+		<version>2.8.18</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<name>Jpom Common</name>
 	<artifactId>common</artifactId>
-	<version>2.8.17</version>
+	<version>2.8.18</version>
 
 	<dependencies>
 

diff --git a/modules/common/src/main/resources/jpom-logo.txt b/modules/common/src/main/resources/jpom-logo.txt
@@ -7,4 +7,4 @@
         | |
         |_|
 
- ➜ Jpom \ (•◡•) / (v2.8.17)
+ ➜ Jpom \ (•◡•) / (v2.8.18)
diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease
@@ -24,7 +24,7 @@
 FROM maven:3.8.5-jdk-8
 
 ENV JPOM_HOME	/usr/local/jpom-server
-ENV JPOM_PKG	server-2.8.17-release.tar.gz
+ENV JPOM_PKG	server-2.8.18-release.tar.gz
 
 ENV JPOM_DATA_PATH ${JPOM_HOME}/data
 ENV JPOM_LOG_PATH ${JPOM_HOME}/log

diff --git 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.8.17</version>
+        <version>2.8.18</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>Jpom Server</name>
     <artifactId>server</artifactId>
-    <version>2.8.17</version>
+    <version>2.8.18</version>
     <properties>
         <start-class>io.jpom.JpomServerApplication</start-class>
     </properties>

diff --git 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.8.17</version>
+        <version>2.8.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git 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.8.17</version>
+        <version>2.8.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git 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.8.17</version>
+        <version>2.8.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git 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.8.17</version>
+        <version>2.8.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git 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.8.17</version>
+        <version>2.8.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git 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.8.17</version>
+        <version>2.8.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git 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.8.17</version>
+        <version>2.8.18</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.8.17</version>
+    <version>2.8.18</version>
     <groupId>io.jpom.plugins</groupId>
     <artifactId>jpom-plugins-parent</artifactId>
     <name>Jpom Plugins</name>

diff --git 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.8.17</version>
+        <version>2.8.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git 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.8.17</version>
+        <version>2.8.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

diff --git a/script/docker.sh b/script/docker.sh
@@ -29,12 +29,12 @@
 # https://hub.docker.com/r/jpomdocker/jpom
 
 # 服务端
-docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.17 -f ./modules/server/DockerfileRelease --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.18 -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.8.17
+# 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.18
 # docker stop jpom-server
 # docker rm jpom-server
 # docker exec -it jpom-server /bin/bash

diff --git a/script/release-sha1sum.sh b/script/release-sha1sum.sh
@@ -24,7 +24,7 @@
 
 
 # 版本
-jpom_version=2.8.17
+jpom_version=2.8.18
 
 function checkItem()
 {

diff --git a/web-vue/package.json b/web-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jpom-vue",
-  "version": "2.8.17",
+  "version": "2.8.18",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service --max-old-space-size=900 serve  --mode dev",
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ @@
             | |
             |_|
-     ➜ Jpom \ (•◡•) / (v2.8.17)
+     ➜ Jpom \ (•◡•) / (v2.8.18)