pre commit 2.9.0

2024-11-30 02:48:17 +08:00 · 2022-06-10 15:54:58 +08:00 · 2022-06-10 15:54:58 +08:00 · 29c6ea3a93
commit 29c6ea3a93
parent cb26666509
22 changed files with 35 additions and 30 deletions
--- a/.env
+++ b/.env
@ -1,3 +1,3 @@
-JPOM_VERSION=2.8.25
+JPOM_VERSION=2.9.0
 # 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.8.25-release.zip
-              - modules/agent/target/agent-2.8.25-release.zip
+              - modules/server/target/server-2.9.0-release.zip
+              - modules/agent/target/agent-2.9.0-release.zip
          - name: server_zip
            path:
-              - modules/server/target/server-2.8.25-release.zip
+              - modules/server/target/server-2.9.0-release.zip
          - name: agent_zip
            path:
-              - modules/agent/target/agent-2.8.25-release.zip
+              - modules/agent/target/agent-2.9.0-release.zip
        settings: []
        strategy:
          retry: '0'
@ -50,7 +50,7 @@ stages:
        name: publish_general_artifacts
        displayName: 合并打包
        dependArtifact: all_zip
-        artifactName: jpom-2.8.25
+        artifactName: jpom-2.9.0
        strategy:
          retry: '0'
 strategy:
--- a/docs/version.txt
+++ b/docs/version.txt
@ -1 +1 @@
-2.8.25
+2.9.0
--- a/modules/agent/pom.xml
+++ b/modules/agent/pom.xml
@ -29,15 +29,17 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.8.25</version>
+        <version>2.9.0</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>agent</artifactId>
-    <version>2.8.25</version>
+    <version>2.9.0</version>
    <name>Jpom Agent</name>
    <properties>
        <start-class>io.jpom.JpomAgentApplication</start-class>
+        <!--当前程序兼容 jpom 最新版本号-->
+        <jpom-min-version>1.0.0</jpom-min-version>
    </properties>
    <dependencies>
        <dependency>
--- 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.25</version>
+		<version>2.9.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<name>Jpom Common</name>
 	<artifactId>common</artifactId>
-	<version>2.8.25</version>
+	<version>2.9.0</version>

 	<dependencies>

--- a/modules/common/src/main/java/io/jpom/system/ExtConfigEnvironmentPostProcessor.java
+++ b/modules/common/src/main/java/io/jpom/system/ExtConfigEnvironmentPostProcessor.java
@ -60,6 +60,9 @@ public class ExtConfigEnvironmentPostProcessor implements EnvironmentPostProcess
        {
            // 兼容一些全局默认配置属性
            List<URL> resources = ClassUtil.getResources("bin/extConfigDefault.yml");
+            if (resources.isEmpty()) {
+                resources.add(ClassUtil.getResourceURL("bin/extConfigDefault.yml"));
+            }
            for (int i = 0; i < resources.size(); i++) {
                URL resource = resources.get(i);
                Resource extConfigDefault = new UrlResource(resource);
--- 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.25)
+ ➜ Jpom \ (•◡•) / (v2.9.0)
--- 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.25-release.tar.gz
+ENV JPOM_PKG	server-2.9.0-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.25</version>
+        <version>2.9.0</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <name>Jpom Server</name>
    <artifactId>server</artifactId>
-    <version>2.8.25</version>
+    <version>2.9.0</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.25</version>
+        <version>2.9.0</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.25</version>
+        <version>2.9.0</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.25</version>
+        <version>2.9.0</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.25</version>
+        <version>2.9.0</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.25</version>
+        <version>2.9.0</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.25</version>
+        <version>2.9.0</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.25</version>
+        <version>2.9.0</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.25</version>
+    <version>2.9.0</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.25</version>
+        <version>2.9.0</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.25</version>
+        <version>2.9.0</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.8.25</version>
+    <version>2.9.0</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
@ -29,12 +29,12 @@
 # https://hub.docker.com/r/jpomdocker/jpom

 # 服务端
-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:2.9.0 -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.25
+# 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.0
 # 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.8.25
+jpom_version=2.9.0

 function checkItem()
 {
--- a/web-vue/package.json
+++ b/web-vue/package.json
@ -1,6 +1,6 @@
 {
  "name": "jpom-vue",
-  "version": "2.8.25",
+  "version": "2.9.0",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service --max-old-space-size=900 serve  --mode dev",
 @ -1 +1 @@
 .8.25
 .9.0