pre commit 2.8.15

2024-12-02 03:48:05 +08:00 · 2022-03-09 10:40:42 +08:00 · 2022-03-09 10:40:42 +08:00 · ef5204688b
commit ef5204688b
parent a77fa6d8bc
23 changed files with 61 additions and 29 deletions
--- a/.env
+++ b/.env
@ -1,3 +1,3 @@
-JPOM_VERSION=2.8.14
+JPOM_VERSION=2.8.15
 # Server Token 生产部署请更换
 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -0,0 +1,32 @@
+name: build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [ 16.x ]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: cd web-vue && npm i && npm run build
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B package
--- a/.github/workflows/package-testing.yml
+++ b/.github/workflows/package-testing.yml
@ -39,5 +39,5 @@ jobs:
        #file: ./zhuzhu-project/target/site/jacoco/jacoco.xml
 #        run: |
 #          docker buildx create --use
-#          docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.14 -f ./modules/server/DockerfileRelease --push .
+#          docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.15 -f ./modules/server/DockerfileRelease --push .
 #          docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
--- a/docs/js/version.js
+++ b/docs/js/version.js
@ -1 +1 @@
-var version = '2.8.14';
+var version = '2.8.15';
--- a/docs/version.txt
+++ b/docs/version.txt
@ -1 +1 @@
-2.8.14
+2.8.15
--- a/docs/versions.json
+++ b/docs/versions.json
@ -1,6 +1,6 @@
 {
-  "tag_name": "v2.8.14",
-  "agentUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/agent-2.8.14-release.zip",
-  "serverUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/server-2.8.14-release.zip",
+  "tag_name": "v2.8.15",
+  "agentUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/agent-2.8.15-release.zip",
+  "serverUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/server-2.8.15-release.zip",
  "changelogUrl": "https://gitee.com/dromara/Jpom/raw/master/CHANGELOG.md"
 }
--- 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.14</version>
+        <version>2.8.15</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>agent</artifactId>
-    <version>2.8.14</version>
+    <version>2.8.15</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.8.14</version>
+		<version>2.8.15</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<name>Jpom Common</name>
 	<artifactId>common</artifactId>
-	<version>2.8.14</version>
+	<version>2.8.15</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.8.14)
+ ➜ Jpom \ (•◡•) / (v2.8.15)
--- a/modules/server/DockerfileRelease
+++ b/modules/server/DockerfileRelease
@ -24,7 +24,7 @@
 FROM maven:3.8.4-jdk-8

 ENV JPOM_HOME	/usr/local/jpom-server
-ENV JPOM_PKG	server-2.8.14-release.tar.gz
+ENV JPOM_PKG	server-2.8.15-release.tar.gz

 ENV JPOM_DATA_PATH ${JPOM_HOME}/data
 ENV JPOM_LOG_PATH ${JPOM_HOME}/log
--- 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.14</version>
+        <version>2.8.15</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <name>Jpom Server</name>
    <artifactId>server</artifactId>
-    <version>2.8.14</version>
+    <version>2.8.15</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.8.14</version>
+        <version>2.8.15</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.8.14</version>
+        <version>2.8.15</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.8.14</version>
+        <version>2.8.15</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.8.14</version>
+        <version>2.8.15</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.8.14</version>
+        <version>2.8.15</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.8.14</version>
+        <version>2.8.15</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.8.14</version>
+        <version>2.8.15</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.14</version>
+    <version>2.8.15</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.8.14</version>
+        <version>2.8.15</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.8.14</version>
+        <version>2.8.15</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/pom.xml
+++ b/pom.xml
@ -46,7 +46,7 @@
        简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
    </description>
    <inceptionYear>2017</inceptionYear>
-    <version>2.8.14</version>
+    <version>2.8.15</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
@ -6,12 +6,12 @@
 # https://hub.docker.com/r/jpomdocker/jpom

 # 服务端
-docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.14 -f ./modules/server/DockerfileRelease --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.15 -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.14
+# 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.15
 # docker stop jpom-server
 # docker rm jpom-server
 # docker exec -it jpom-server /bin/bash
--- a/web-vue/package.json
+++ b/web-vue/package.json
@ -1,6 +1,6 @@
 {
  "name": "jpom-vue",
-  "version": "2.8.14",
+  "version": "2.8.15",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service --max-old-space-size=900 serve  --mode dev",
 @ -1 +1 @@
 .8.14
 .8.15