Merge branch 'master' into dev

2024-11-30 10:58:14 +08:00 · 2023-03-14 21:45:49 +08:00 · 2023-03-14 21:45:49 +08:00 · a3a68ff9ee
commit a3a68ff9ee
parent c173a54d46 3608cb0782
30 changed files with 49 additions and 39 deletions
--- a/.env
+++ b/.env
@ -1,3 +1,3 @@
-JPOM_VERSION=2.10.31
+JPOM_VERSION=2.10.32
 # 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.10.31-release.zip
-              - modules/agent/target/agent-2.10.31-release.zip
+              - modules/server/target/server-2.10.32-release.zip
+              - modules/agent/target/agent-2.10.32-release.zip
          - name: server_zip
            path:
-              - modules/server/target/server-2.10.31-release.zip
+              - modules/server/target/server-2.10.32-release.zip
          - name: agent_zip
            path:
-              - modules/agent/target/agent-2.10.31-release.zip
+              - modules/agent/target/agent-2.10.32-release.zip
        settings: []
        strategy:
          retry: '0'
@ -50,7 +50,7 @@ stages:
        name: publish_general_artifacts
        displayName: 合并打包
        dependArtifact: all_zip
-        artifactName: jpom-2.10.31
+        artifactName: jpom-2.10.32
        strategy:
          retry: '0'
 strategy:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,13 @@
 # 🚀 版本日志

+## 2.10.32 (2023-03-14)
+
+### 🐞 解决BUG、优化功能
+
+1. 【server】修复 mysql 数据库因为字段长度问题初始化失败（感谢@xuejun）
+
+------
+
 ## 2.10.31 (2023-03-14)

 ### 🐞 解决BUG、优化功能
--- a/docs/version.txt
+++ b/docs/version.txt
@ -1 +1 @@
-2.10.31
+2.10.32
--- a/modules/agent-transport/agent-transport-common/pom.xml
+++ b/modules/agent-transport/agent-transport-common/pom.xml
@ -30,7 +30,7 @@
    <parent>
        <groupId>io.jpom.agent-transport</groupId>
        <artifactId>jpom-agent-transport-parent</artifactId>
-        <version>2.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/agent-transport/agent-transport-http/pom.xml
+++ b/modules/agent-transport/agent-transport-http/pom.xml
@ -30,7 +30,7 @@
    <parent>
        <groupId>io.jpom.agent-transport</groupId>
        <artifactId>jpom-agent-transport-parent</artifactId>
-        <version>2.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/agent-transport/pom.xml
+++ b/modules/agent-transport/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
@ -38,7 +38,7 @@
        <module>agent-transport-http</module>
    </modules>
    <modelVersion>4.0.0</modelVersion>
-    <version>2.10.31</version>
+    <version>2.10.32</version>
    <groupId>io.jpom.agent-transport</groupId>
    <artifactId>jpom-agent-transport-parent</artifactId>
    <name>Jpom Agent Transport</name>
--- 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.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>agent</artifactId>
-    <version>2.10.31</version>
+    <version>2.10.32</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.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <name>Jpom Common</name>
    <artifactId>common</artifactId>
-    <version>2.10.31</version>
+    <version>2.10.32</version>

    <dependencies>

--- a/modules/common/src/main/resources/banner.txt
+++ b/modules/common/src/main/resources/banner.txt
@ -8,4 +8,4 @@
        | |
        |_|

- ➜ Jpom \ (•◡•) / (v2.10.31)
+ ➜ Jpom \ (•◡•) / (v2.10.32)
--- 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.10.31
+ENV JPOM_PKG_VERSION	2.10.32
 ENV JPOM_PKG	server-${JPOM_PKG_VERSION}-release.tar.gz
 ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1

--- 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.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <name>Jpom Server</name>
    <artifactId>server</artifactId>
-    <version>2.10.31</version>
+    <version>2.10.32</version>
    <properties>
        <start-class>io.jpom.JpomServerApplication</start-class>
    </properties>
--- a/modules/server/src/main/resources/sql-view/execute.mysql.v1.0.sql
+++ b/modules/server/src/main/resources/sql-view/execute.mysql.v1.0.sql
@ -67,7 +67,7 @@ DROP PROCEDURE IF EXISTS add_column_if_not_exists;
 CREATE PROCEDURE add_column_if_not_exists(
    tname VARCHAR(64),
    cname VARCHAR(64),
-    columninfo VARCHAR(64)
+    columninfo VARCHAR(200)
 )
 BEGIN
    IF column_exists(tname, cname)
--- a/modules/storage-module/pom.xml
+++ b/modules/storage-module/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
@ -39,7 +39,7 @@
        <module>storage-module-mysql</module>
    </modules>
    <modelVersion>4.0.0</modelVersion>
-    <version>2.10.31</version>
+    <version>2.10.32</version>
    <groupId>io.jpom.storage-module</groupId>
    <artifactId>jpom-storage-module-parent</artifactId>
    <name>Jpom storage module</name>
--- a/modules/storage-module/storage-module-common/pom.xml
+++ b/modules/storage-module/storage-module-common/pom.xml
@ -30,7 +30,7 @@
    <parent>
        <groupId>io.jpom.storage-module</groupId>
        <artifactId>jpom-storage-module-parent</artifactId>
-        <version>2.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/storage-module/storage-module-h2/pom.xml
+++ b/modules/storage-module/storage-module-h2/pom.xml
@ -30,7 +30,7 @@
    <parent>
        <groupId>io.jpom.storage-module</groupId>
        <artifactId>jpom-storage-module-parent</artifactId>
-        <version>2.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/storage-module/storage-module-mysql/pom.xml
+++ b/modules/storage-module/storage-module-mysql/pom.xml
@ -30,7 +30,7 @@
    <parent>
        <groupId>io.jpom.storage-module</groupId>
        <artifactId>jpom-storage-module-parent</artifactId>
-        <version>2.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/storage-module/storage-module-mysql/src/main/java/top/jpom/storage/MysqlTableBuilderImpl.java
+++ b/modules/storage-module/storage-module-mysql/src/main/java/top/jpom/storage/MysqlTableBuilderImpl.java
@ -83,6 +83,8 @@ public class MysqlTableBuilderImpl implements IStorageSqlBuilderService {
                    //  ALTER TABLE PROJECT_INFO ADD IF NOT EXISTS triggerToken VARCHAR (100) comment '触发器token';
                    String columnSql = this.generateColumnSql(viewAlterData);
                    columnSql = StrUtil.replace(columnSql, "'", "\\'");
+                    int length = StrUtil.length(columnSql);
+                    Assert.state(length <= 180, "sql 语句太长啦");
                    stringBuilder.append("CALL add_column_if_not_exists('").append(viewAlterData.getTableName()).append("','").append(viewAlterData.getName()).append("','").append(columnSql).append("')");
                    break;
                case "DROP-TABLE":
--- 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.10.31</version>
+        <version>2.10.32</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.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/sub-plugin/encrypt/pom.xml
+++ b/modules/sub-plugin/encrypt/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-plugins-parent</artifactId>
        <groupId>io.jpom.plugins</groupId>
-        <version>2.10.31</version>
+        <version>2.10.32</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.10.31</version>
+        <version>2.10.32</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.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
@ -42,7 +42,7 @@
        <module>encrypt</module>
    </modules>
    <modelVersion>4.0.0</modelVersion>
-    <version>2.10.31</version>
+    <version>2.10.32</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.10.31</version>
+        <version>2.10.32</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.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/updater/pom.xml
+++ b/modules/updater/pom.xml
@ -29,7 +29,7 @@
    <parent>
        <artifactId>jpom-parent</artifactId>
        <groupId>io.jpom</groupId>
-        <version>2.10.31</version>
+        <version>2.10.32</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/pom.xml
+++ b/pom.xml
@ -50,7 +50,7 @@
        简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
    </description>
    <inceptionYear>2017</inceptionYear>
-    <version>2.10.31</version>
+    <version>2.10.32</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.10.31 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.10.32 -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.10.31
+# 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.32
 # 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
 # docker stop jpom-server
 # docker rm jpom-server
--- a/script/release-sha1sum.sh
+++ b/script/release-sha1sum.sh
@ -24,7 +24,7 @@


 # 版本
-jpom_version=2.10.31
+jpom_version=2.10.32

 #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.10.31",
+  "version": "2.10.32",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service --max-old-space-size=900 serve  --mode dev",
 @ -1 +1 @@
 .10.31
 .10.32