fix(datatask,datasource): use Beijing time for timestamps, surface driver errors

Author: camilesing

CHANGELOG.md

@@ -62,6 +62,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
   and the container `TZ=Asia/Shanghai`. Previously the MySQL session timezone defaulted to UTC,
   so `TIMESTAMP` columns (e.g. `DATAPOLY_DATA_TASK_DEF.create_time`/`update_time`) read back
   with an 8-hour shift.
+- Data task timestamps now serialize as Beijing time: the `DataTaskJobView` fields
+  (`/data-task/jobs/search`, `/data-task/job/{id}`) declared their `@JsonFormat`
+  pattern without a time zone, so Jackson's UTC default applied and a job started at
+  10:48 Beijing was returned as `02:48`; the `/data-task/list` times were raw epoch
+  millis. Both now use `yyyy-MM-dd HH:mm:ss` at `GMT+8` like the other management
+  DTOs, and `DataTaskTimeZoneJsonTest` locks the rendering.
+- Datasource connection test failures now report the driver's reason: `testConnection`/
+  `updateTestConnection` let the driver exception escape as a generic internal error, so the
+  ODPS "Access Denied / NO privilege" text never reached the UI. Failures are now raised as
+  the business error `10` (HTTP 200) with the deepest cause message (whitespace collapsed,
+  capped at 500 chars) under the new `datasource.connect.failed` i18n key; functional
+  `CommonException`s still pass through untouched, and
+  `DataSourceServiceConnectFailureTest` locks the extraction.
 - Asynchronous data task framework (DataTask): manager endpoints under
   `/datapoly/manager/api/v1/data-task/**` for task definitions (SQL + input parameter
   declarations + output reshaping: naming strategy / column aliases / column order /

datapoly-common/src/main/resources/i18n/messages.properties

@@ -42,6 +42,7 @@ datasource.name.exists=name [{0}] already exists
 datasource.db.name.missing=Database name not specified: {0}
 datasource.file.path.missing=File path not specified: {0}
 datasource.driver.not.found=Driver directory for database type [{0}] version [{1}] not found, check datasource config against the drivers directory!
+datasource.connect.failed=Connection failed: {0}
 # API messages
 api.path.or.method.required=path or method
 api.cannot.update.method=can't update method

datapoly-common/src/main/resources/i18n/messages_en_US.properties

@@ -42,6 +42,7 @@ datasource.name.exists=name [{0}] already exists
 datasource.db.name.missing=Database name not specified: {0}
 datasource.file.path.missing=File path not specified: {0}
 datasource.driver.not.found=Driver directory for database type [{0}] version [{1}] not found, check datasource config against the drivers directory!
+datasource.connect.failed=Connection failed: {0}
 # API messages
 api.path.or.method.required=path or method
 api.cannot.update.method=can't update method

datapoly-common/src/main/resources/i18n/messages_zh_CN.properties

@@ -42,6 +42,7 @@ datasource.name.exists=\u540D\u79F0 [{0}] \u5DF2\u5B58\u5728
 datasource.db.name.missing=\u5E93\u540D\u6CA1\u6709\u6307\u5B9A: {0}
 datasource.file.path.missing=\u6587\u4EF6\u8DEF\u5F84\u6CA1\u6709\u6307\u5B9A: {0}
 datasource.driver.not.found=\u672A\u627E\u5230\u6570\u636E\u5E93\u7C7B\u578B[{0}]\u7248\u672C[{1}]\u5BF9\u5E94\u7684\u9A71\u52A8\u76EE\u5F55\uFF0C\u8BF7\u68C0\u67E5\u6570\u636E\u6E90\u914D\u7F6E\u4E0Edrivers\u76EE\u5F55\u662F\u5426\u4E00\u81F4!
+datasource.connect.failed=\u8FDE\u63A5\u5931\u8D25: {0}
 # \u63A5\u53E3\u6D88\u606F
 api.path.or.method.required=\u8DEF\u5F84\u6216\u65B9\u6CD5\u4E0D\u80FD\u4E3A\u7A7A
 api.cannot.update.method=\u65E0\u6CD5\u4FEE\u6539\u8BF7\u6C42\u65B9\u6CD5

datapoly-core/src/main/java/com/cs/core/dto/DataTaskBaseResponse.java

@@ -1,6 +1,7 @@
 // Use of this source code is governed by a BSD-style license
 package com.cs.core.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -31,9 +32,11 @@ public class DataTaskBaseResponse {
     @Schema(description = "是否启用")
     private Boolean enabled;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Schema(description = "创建时间")
     private Timestamp createTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Schema(description = "修改时间")
     private Timestamp updateTime;
 }

datapoly-core/src/main/java/com/cs/core/dto/DataTaskJobView.java

@@ -48,15 +48,15 @@ public class DataTaskJobView {
     @Schema(description = "提交人")
     private String submittedBy;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Schema(description = "开始时间")
     private Timestamp startTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Schema(description = "结束时间")
     private Timestamp finishTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Schema(description = "创建时间")
     private Timestamp createTime;
 }

datapoly-core/src/main/java/com/cs/core/service/DataSourceService.java

@@ -17,6 +17,7 @@
 import com.cs.persistence.util.PageUtils;
 import com.zaxxer.hikari.HikariDataSource;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Service;
@@ -30,9 +31,16 @@
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class DataSourceService {
 
+    /**
+     * Cap for the driver message carried out by a connection test; driver stacks can be far longer than
+     * anything a user needs to read in a toast.
+     */
+    private static final int CONNECT_ERROR_MESSAGE_MAX_LENGTH = 500;
+
     @Resource
     private DataSourceDao dataSourceDao;
 
@@ -114,11 +122,17 @@ public void preTest(DataSourceBaseRequest request) {
                 .getVersionDriverFile(dataSourceEntity.getType(),
                         dataSourceEntity.getVersion());
         String driverPath = driverPathFile.getAbsolutePath();
-        HikariDataSource ds = DataSourceUtils.createDataSource(dataSourceEntity, driverPath);
         try {
-            testConnection(ds, request.getType());
-        } finally {
-            DataSourceUtils.closeHikariDataSource(ds);
+            HikariDataSource ds = DataSourceUtils.createDataSource(dataSourceEntity, driverPath);
+            try {
+                testConnection(ds, request.getType());
+            } finally {
+                DataSourceUtils.closeHikariDataSource(ds);
+            }
+        } catch (CommonException e) {
+            throw e;
+        } catch (RuntimeException e) {
+            throw connectFailure(e);
         }
     }
 
@@ -131,8 +145,43 @@ public void testDataSource(Long id) {
                 .getVersionDriverFile(dataSourceEntity.getType(),
                         dataSourceEntity.getVersion());
         String driverPath = driverPathFile.getAbsolutePath();
-        HikariDataSource ds = DataSourceUtils.getHikariDataSource(dataSourceEntity, driverPath);
-        testConnection(ds, dataSourceEntity.getType());
+        try {
+            HikariDataSource ds = DataSourceUtils.getHikariDataSource(dataSourceEntity, driverPath);
+            testConnection(ds, dataSourceEntity.getType());
+        } catch (CommonException e) {
+            throw e;
+        } catch (RuntimeException e) {
+            throw connectFailure(e);
+        }
+    }
+
+    /**
+     * A connection test exists to tell the caller why a datasource does not work, so the driver/server
+     * message is raised as a business error (code 10, business failures stay HTTP 200) instead of being
+     * masked as a generic internal error. The stack still goes to the log for support.
+     */
+    static CommonException connectFailure(Throwable cause) {
+        String message = causeMessage(cause);
+        log.warn("Datasource connection test failed: {}", message, cause);
+        CommonException exception = new CommonException(ResponseErrorCode.ERROR_CANNOT_CONNECT_REMOTE,
+                "datasource.connect.failed", message);
+        exception.initCause(cause);
+        return exception;
+    }
+
+    /**
+     * Deepest cause message: JDBC driver stacks (ODPS and friends) put the actionable text - permission
+     * denied, unknown host, bad credentials - at the bottom, while the outer layers only repeat it.
+     * Whitespace is collapsed so a multi-line driver dump stays readable in one response field.
+     */
+    static String causeMessage(Throwable cause) {
+        Throwable root = cause;
+        while (null != root.getCause() && root.getCause() != root) {
+            root = root.getCause();
+        }
+        String message = StringUtils.defaultIfBlank(root.getMessage(), cause.getMessage());
+        message = StringUtils.defaultIfBlank(message, root.getClass().getName());
+        return StringUtils.abbreviate(message.replaceAll("\\s+", " ").trim(), CONNECT_ERROR_MESSAGE_MAX_LENGTH);
     }
 
     public void createDataSource(DataSourceSaveRequest request) {

datapoly-persistence/src/main/java/com/cs/persistence/entity/ApiAssignmentEntity.java

@@ -86,11 +86,11 @@ public class ApiAssignmentEntity {
     @TableField("cache_expire_seconds")
     private Long cacheExpireSeconds;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(value = "create_time", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
     private Timestamp createTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(value = "update_time", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
     private Timestamp updateTime;
 

datapoly-persistence/src/main/java/com/cs/persistence/entity/DataTaskDefEntity.java

@@ -90,11 +90,11 @@ public class DataTaskDefEntity {
     @TableField("enabled")
     private Boolean enabled;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(value = "create_time", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
     private Timestamp createTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(value = "update_time", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
     private Timestamp updateTime;
 }

datapoly-persistence/src/main/java/com/cs/persistence/entity/DataTaskJobEntity.java

@@ -65,23 +65,23 @@ public class DataTaskJobEntity {
     @TableField("submitted_by")
     private String submittedBy;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("start_time")
     private Timestamp startTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("finish_time")
     private Timestamp finishTime;
 
     /** Running jobs must be refreshed before this moment or get reaped as lost */
     @TableField("lease_expire_at")
     private Timestamp leaseExpireAt;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(value = "create_time", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
     private Timestamp createTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(value = "update_time", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
     private Timestamp updateTime;
 }