Merge branch '5.1.0-bugfix'

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>tech.powerjob</groupId>
     <artifactId>powerjob</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-bugfix</version>
     <packaging>pom</packaging>
     <name>powerjob</name>
     <url>http://www.powerjob.tech</url>

powerjob-client/pom.xml

@@ -5,19 +5,19 @@
     <parent>
         <artifactId>powerjob</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-client</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-bugfix</version>
     <packaging>jar</packaging>
 
     <properties>
         <junit.version>5.9.1</junit.version>
         <logback.version>1.2.13</logback.version>
         <fastjson.version>1.2.83</fastjson.version>
-        <powerjob.common.version>5.1.0</powerjob.common.version>
+        <powerjob.common.version>5.1.0-bugfix</powerjob.common.version>
 
         <mvn.shade.plugin.version>3.2.4</mvn.shade.plugin.version>
     </properties>

powerjob-common/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>powerjob</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-common</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-bugfix</version>
     <packaging>jar</packaging>
 
     <properties>

powerjob-official-processors/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>powerjob</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-official-processors</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-bugfix</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -20,7 +20,7 @@
         <!-- 不会被打包的部分，scope 只能是 test 或 provide -->
         <junit.version>5.9.1</junit.version>
         <logback.version>1.2.13</logback.version>
-        <powerjob.worker.version>5.1.0</powerjob.worker.version>
+        <powerjob.worker.version>5.1.0-bugfix</powerjob.worker.version>
         <h2.db.version>2.2.224</h2.db.version>
         <mysql.version>8.0.28</mysql.version>
         <spring.version>5.3.31</spring.version>

powerjob-remote/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>powerjob</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

powerjob-remote/powerjob-remote-benchmark/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>powerjob-remote</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,8 +21,8 @@
 
         <logback.version>1.2.13</logback.version>
         <springboot.version>2.7.18</springboot.version>
-        <powerjob-remote-impl-http.version>5.1.0</powerjob-remote-impl-http.version>
-        <powerjob-remote-impl-akka.version>5.1.0</powerjob-remote-impl-akka.version>
+        <powerjob-remote-impl-http.version>5.1.0-bugfix</powerjob-remote-impl-http.version>
+        <powerjob-remote-impl-akka.version>5.1.0-bugfix</powerjob-remote-impl-akka.version>
 
         <gatling.version>3.9.0</gatling.version>
         <gatling-maven-plugin.version>4.2.9</gatling-maven-plugin.version>

powerjob-remote/powerjob-remote-framework/pom.xml

@@ -5,19 +5,19 @@
     <parent>
         <artifactId>powerjob-remote</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <version>5.1.0</version>
+    <version>5.1.0-bugfix</version>
     <artifactId>powerjob-remote-framework</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <powerjob-common.version>5.1.0</powerjob-common.version>
+        <powerjob-common.version>5.1.0-bugfix</powerjob-common.version>
         <reflections.version>0.10.2</reflections.version>
 
 

powerjob-remote/powerjob-remote-impl-akka/pom.xml

@@ -5,19 +5,19 @@
     <parent>
         <artifactId>powerjob-remote</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>powerjob-remote-impl-akka</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-bugfix</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <powerjob-remote-framework.version>5.1.0</powerjob-remote-framework.version>
+        <powerjob-remote-framework.version>5.1.0-bugfix</powerjob-remote-framework.version>
 
         <akka.version>2.6.13</akka.version>
     </properties>

powerjob-remote/powerjob-remote-impl-http/pom.xml

@@ -5,20 +5,20 @@
     <parent>
         <artifactId>powerjob-remote</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>powerjob-remote-impl-http</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-bugfix</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <vertx.version>4.3.7</vertx.version>
-        <powerjob-remote-framework.version>5.1.0</powerjob-remote-framework.version>
+        <powerjob-remote-framework.version>5.1.0-bugfix</powerjob-remote-framework.version>
     </properties>
 
     <dependencies>

powerjob-server/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>powerjob</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-server</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.0-bugfix</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -51,9 +51,9 @@
         <groovy.version>3.0.10</groovy.version>
         <cron-utils.version>9.2.1</cron-utils.version>
 
-        <powerjob-common.version>5.1.0</powerjob-common.version>
-        <powerjob-remote-impl-http.version>5.1.0</powerjob-remote-impl-http.version>
-        <powerjob-remote-impl-akka.version>5.1.0</powerjob-remote-impl-akka.version>
+        <powerjob-common.version>5.1.0-bugfix</powerjob-common.version>
+        <powerjob-remote-impl-http.version>5.1.0-bugfix</powerjob-remote-impl-http.version>
+        <powerjob-remote-impl-akka.version>5.1.0-bugfix</powerjob-remote-impl-akka.version>
         <springdoc-openapi-ui.version>1.6.14</springdoc-openapi-ui.version>
         <aliyun-sdk-oss.version>3.17.1</aliyun-sdk-oss.version>
         <aws-java-sdk-s3.version>1.12.665</aws-java-sdk-s3.version>

powerjob-server/powerjob-server-auth/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>tech.powerjob</groupId>
         <artifactId>powerjob-server</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

powerjob-server/powerjob-server-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>powerjob-server</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

powerjob-server/powerjob-server-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>powerjob-server</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

powerjob-server/powerjob-server-extension/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>powerjob-server</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

powerjob-server/powerjob-server-migrate/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>powerjob-server</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

powerjob-server/powerjob-server-monitor/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>powerjob-server</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

powerjob-server/powerjob-server-persistence/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>powerjob-server</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

powerjob-server/powerjob-server-persistence/src/main/java/tech/powerjob/server/persistence/storage/impl/PostgresqlSeriesDfsService.java

@@ -15,32 +15,24 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.core.env.Environment;
+import tech.powerjob.common.enums.SwitchableStatus;
 import tech.powerjob.common.serialize.JsonUtils;
 import tech.powerjob.common.utils.CommonUtils;
-import tech.powerjob.common.enums.SwitchableStatus;
 import tech.powerjob.server.common.spring.condition.PropertyAndOneBeanCondition;
-import tech.powerjob.server.extension.dfs.DFsService;
-import tech.powerjob.server.extension.dfs.DownloadRequest;
-import tech.powerjob.server.extension.dfs.FileLocation;
-import tech.powerjob.server.extension.dfs.FileMeta;
-import tech.powerjob.server.extension.dfs.StoreRequest;
+import tech.powerjob.server.extension.dfs.*;
 import tech.powerjob.server.persistence.storage.AbstractDFsService;
 
+import javax.annotation.Priority;
+import javax.sql.DataSource;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.sql.Blob;
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.sql.*;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import javax.annotation.Priority;
-import javax.sql.DataSource;
 
 /**
  * postgresql 数据库存储，使用的版本是14
@@ -93,13 +85,13 @@ public class PostgresqlSeriesDfsService extends AbstractDFsService {
 
     private static final String DEFAULT_TABLE_NAME = "powerjob_files";
 
-    private static final String POWERJOB_FILES_ID_SEQ = "CREATE SEQUENCE powerjob_files_id_seq\n" +
+    private static final String POWERJOB_FILES_ID_SEQ = "CREATE SEQUENCE if not exists powerjob_files_id_seq\n" +
             "    START WITH 1\n" +
             "    INCREMENT BY 1\n" +
             "    NO MINVALUE\n" +
             "    NO MAXVALUE\n" +
             "    CACHE 1;" ;
-    private static final String CREATE_TABLE_SQL = "CREATE TABLE powerjob_files (\n" +
+    private static final String CREATE_TABLE_SQL = "CREATE TABLE if not exists powerjob_files (\n" +
             "  id bigint NOT NULL DEFAULT nextval('powerjob_files_id_seq') PRIMARY KEY,\n" +
             "  bucket varchar(255) NOT NULL,\n" +
             "  name varchar(255) NOT NULL,\n" +
@@ -160,7 +152,6 @@ public void store(StoreRequest storeRequest) throws IOException, SQLException {
             con = dataSource.getConnection();
             //pg库提示报错：org.postgresql.util.PSQLException: Large Objects may not be used in auto-commit mode.
             con.setAutoCommit(false);
-            log.info("[PostgresqlSeriesDfsService] set autocommit false.");
 
             pst = con.prepareStatement(insertSQL);
 
@@ -185,13 +176,12 @@ public void store(StoreRequest storeRequest) throws IOException, SQLException {
             if(con != null){
                 con.rollback();
             }
-            log.error("[PostgresqlSeriesDfsService] store [{}] failed!", fileLocation);
+            log.error("[PostgresqlSeriesDfsService] store [{}] failed!", fileLocation, e);
             ExceptionUtils.rethrow(e);
         }finally {
             if(con != null){
                 //设置回来，恢复自动提交模式
                 con.setAutoCommit(true);
-                log.info("[PostgresqlSeriesDfsService] set autocommit true.");
                 con.close();
             }
             if(null != pst){
@@ -246,8 +236,17 @@ public void download(DownloadRequest downloadRequest) throws IOException {
                 return;
             }
 
-            Blob dataBlob = resultSet.getBlob("data");
-            FileUtils.copyInputStreamToFile(new BufferedInputStream(dataBlob.getBinaryStream()), downloadRequest.getTarget());
+            // 在 PostgreSQL 中，bytea 类型的数据并不直接映射为 JDBC 的 Blob 类型。相反，bytea 数据应当被处理为字节数组 (byte[]) 而不是 Blob 对象
+            try {
+                byte[] dataBytes = resultSet.getBytes("data");
+                try (FileOutputStream fos = new FileOutputStream(downloadRequest.getTarget())) {
+                    fos.write(dataBytes);
+                }
+            } catch (Exception ignore) {
+                // 测试发现会报错 报错“不良的类型值 long”；但并未有用户反馈问题，暂时保留老写法，可能是不同DB获取方式不同？
+                Blob dataBlob = resultSet.getBlob("data");
+                FileUtils.copyInputStreamToFile(new BufferedInputStream(dataBlob.getBinaryStream()), downloadRequest.getTarget());
+            }
 
             log.info("[PostgresqlSeriesDfsService] download [{}] successfully, cost: {}", fileLocation, sw);
 
@@ -331,7 +330,7 @@ void initDatabase(PostgresqlProperty property) {
 
         HikariConfig config = new HikariConfig();
 
-        config.setDriverClassName(property.driver);
+        config.setDriverClassName(StringUtils.isEmpty(property.driver) ? "org.postgresql.Driver" : property.driver);
         config.setJdbcUrl(property.url);
         config.setUsername(property.username);
         config.setPassword(property.password);
@@ -404,4 +403,4 @@ protected Class<?> beanType() {
             return DFsService.class;
         }
     }
-}
+}

powerjob-server/powerjob-server-remote/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>powerjob-server</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

powerjob-server/powerjob-server-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>powerjob-server</artifactId>
         <groupId>tech.powerjob</groupId>
-        <version>5.1.0</version>
+        <version>5.1.0-bugfix</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>