fix:修复执行日志时间时区显示

Author: wyyalt

apps/node_man/handlers/job.py

@@ -37,7 +37,7 @@
 from apps.utils import APIModel
 from apps.utils.basic import filter_values, to_int_or_default
 from apps.utils.local import get_request_username, get_tenant_id
-from apps.utils.time_tools import local_dt_str2utc_dt
+from apps.utils.time_tools import format_log_time, local_dt_str2utc_dt
 from common.api import NodeApi
 from common.api.exception import DataAPIException
 
@@ -910,7 +910,7 @@ def retrieve(self, params: Dict[str, Any], user_timezone):
         return job_detail
 
     @staticmethod
-    def get_log_base(subscription_id: int, task_id_list: List[int], instance_id: str) -> list:
+    def get_log_base(subscription_id: int, task_id_list: List[int], instance_id: str, user_timezone) -> list:
         """
         根据订阅任务ID，实例ID，获取日志
         :param subscription_id: 订阅任务ID
@@ -928,21 +928,21 @@ def get_log_base(subscription_id: int, task_id_list: List[int], instance_id: str
                         {
                             "step": step["node_name"],
                             "status": step["status"],
-                            "log": step["log"],
-                            "start_time": step.get("start_time"),
-                            "finish_time": step.get("finish_time"),
+                            "log": format_log_time(step["log"], target_timezone=user_timezone),
+                            "start_time": format_log_time(step.get("start_time"), target_timezone=user_timezone),
+                            "finish_time": format_log_time(step.get("finish_time"), target_timezone=user_timezone),
                         }
                     )
         return logs
 
-    def get_log(self, instance_id: str) -> list:
+    def get_log(self, instance_id: str, user_timezone) -> list:
         """
         获得日志
         :param instance_id: 实例ID
         :return: 日志列表
         """
         # 获得并返回日志
-        return JobHandler.get_log_base(self.data.subscription_id, self.data.task_id_list, instance_id)
+        return JobHandler.get_log_base(self.data.subscription_id, self.data.task_id_list, instance_id, user_timezone)
 
     def collect_log(self, instance_id: int) -> list:
         return NodeApi.collect_subscription_task_detail({"job_id": self.job_id, "instance_id": instance_id})

apps/node_man/views/job.py

@@ -276,7 +276,8 @@ def log(self, request, *args, **kwargs):
         """
         job_id = kwargs["pk"]
         JobTools.isolate_tenant_job(job_id)
-        return Response(JobHandler(job_id).get_log(request.query_params["instance_id"]))
+        user_timezone = get_user_timezone(request)
+        return Response(JobHandler(job_id).get_log(request.query_params["instance_id"]), user_timezone)
 
     @swagger_auto_schema(
         operation_summary="查询日志",

apps/utils/time_tools.py

@@ -12,6 +12,7 @@
 from __future__ import absolute_import, unicode_literals
 
 import datetime
+import re
 import time
 from functools import partial
 from typing import Optional
@@ -298,3 +299,26 @@ def get_user_timezone(request):
             return default_tz
     except Exception:
         return default_tz
+
+def format_log_time(
+    log_content, 
+    original_timezone="Asia/Shanghai",
+    target_timezone="UTC",
+    output_format="%Y-%m-%d %H:%M:%S%z"
+):
+    pattern = r'(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})'
+    
+    orig_tz = pytz.timezone(original_timezone)
+    tgt_tz = pytz.timezone(target_timezone)
+    
+    def replace_match(match):
+        time_str = match.group(1)
+        try:
+            dt_naive = datetime.strptime(time_str, "%Y-%m-%d %H:%M:%S")
+            dt_orig = orig_tz.localize(dt_naive)
+            dt_target = dt_orig.astimezone(tgt_tz)
+            return dt_target.strftime(output_format)
+        except ValueError as e:
+            return time_str
+    
+    return re.sub(pattern, replace_match, log_content)