fix: 修复timezone修改成pytz，页面刷新404LoginRequiredMiddleware传入函数问题 TencentBlueKing#7625

Author: huangpixu

gcloud/core/models.py

@@ -14,6 +14,7 @@
 import typing
 from os import environ
 
+import pytz
 from django.conf import settings
 from django.contrib.auth.models import Group
 from django.db import models, transaction
@@ -208,7 +209,7 @@ def update_business_project_status(self, archived_cc_ids, active_cc_ids):
 
     def get_timezone_based_timestamp(self, project_id, timestamp_fmt="%Y%m%d%H%M%S"):
         project_tz = getattr(self.filter(id=project_id).first(), "time_zone") or settings.TIME_ZONE
-        timestamp = datetime.datetime.now(tz=timezone.pytz.timezone(project_tz)).strftime(timestamp_fmt)
+        timestamp = datetime.datetime.now(tz=pytz.timezone(project_tz)).strftime(timestamp_fmt)
         return timestamp
 
 

gcloud/core/views.py

@@ -30,11 +30,16 @@
 logger = logging.getLogger("root")
 
 
+def get_response(request):
+    # 这是一个假函数，用于模拟正常的 get_response 逻辑
+    return None
+
+
 def page_not_found(request, exception):
     if request.path.startswith(settings.STATIC_URL):
         return HttpResponseNotFound()
 
-    user = LoginRequiredMiddleware().authenticate(request)
+    user = LoginRequiredMiddleware(get_response).authenticate(request)
 
     if user:
         request.user = user
@@ -45,7 +50,7 @@ def page_not_found(request, exception):
 
     # 未登录重定向到首页，跳到登录页面
     if hasattr(LoginRequiredMiddleware(), "is_user_forbidden"):
-        user_forbidden, msg = LoginRequiredMiddleware().is_user_forbidden(request)
+        user_forbidden, msg = LoginRequiredMiddleware(get_response).is_user_forbidden(request)
         if user_forbidden:
             handler = ResponseHandler(ConfFixture, settings)
             return handler.build_403_response(msg)

gcloud/taskflow3/domains/context.py

@@ -13,8 +13,9 @@
 import datetime
 import logging
 
+import pytz
 from django.conf import settings
-from django.utils import timezone, translation
+from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
 
 from engine_pickle_obj.context import SystemObject
@@ -52,7 +53,7 @@ def __init__(self, taskflow, username):
         self.biz_cc_name = self.bk_biz_name
         # 任务开始时间
         project = Project.objects.get(id=self.project_id)
-        project_tz = timezone.pytz.timezone(project.time_zone)
+        project_tz = pytz.timezone(project.time_zone)
         self.task_start_time = datetime.datetime.now(tz=project_tz).strftime("%Y-%m-%d %H:%M:%S")
         # 任务URL
         self.task_url = (
@@ -128,7 +129,12 @@ def flat_details(cls):
                 "index": -3,
                 "desc": "",
             },
-            cls.to_flat_key("task_id"): {"key": cls.to_flat_key("task_id"), "index": -2, "name": _("任务ID"), "desc": ""},
+            cls.to_flat_key("task_id"): {
+                "key": cls.to_flat_key("task_id"),
+                "index": -2,
+                "name": _("任务ID"),
+                "desc": "",
+            },
             cls.to_flat_key("task_name"): {
                 "key": cls.to_flat_key("task_name"),
                 "name": _("任务名称"),

pipeline_plugins/components/collections/controller.py

@@ -16,8 +16,9 @@
 import os
 import re
 
+import pytz
 from django.conf import settings
-from django.utils import timezone, translation
+from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
 from pipeline.component_framework.component import Component
 from pipeline.core.flow.activity import Service, StaticIntervalGenerator
@@ -79,7 +80,9 @@ class PauseComponent(Component):
     code = "pause_node"
     bound_service = PauseService
     form = settings.STATIC_URL + "components/atoms/bk/pause.js"
-    desc = _("该节点可以通过node_callback API接口进行回调并传入数据，callback_data参数为dict类型，回调数据会作为该节点的输出数据")
+    desc = _(
+        "该节点可以通过node_callback API接口进行回调并传入数据，callback_data参数为dict类型，回调数据会作为该节点的输出数据"
+    )
 
 
 class SleepTimerService(Service):
@@ -103,7 +106,9 @@ def inputs_format(self):
                 name=_("是否强制晚于当前时间"),
                 key="force_check",
                 type="bool",
-                schema=StringItemSchema(description=_("用户输入日期格式时是否强制要求时间晚于当前时间，只对日期格式定时输入有效")),
+                schema=StringItemSchema(
+                    description=_("用户输入日期格式时是否强制要求时间晚于当前时间，只对日期格式定时输入有效")
+                ),
             ),
         ]
 
@@ -119,7 +124,7 @@ def execute(self, data, parent_data):
         # 项目时区获取
         project = Project.objects.get(id=parent_data.inputs.project_id)
 
-        project_tz = timezone.pytz.timezone(project.time_zone)
+        project_tz = pytz.timezone(project.time_zone)
         data.outputs.business_tz = project_tz
 
         now = datetime.datetime.now(tz=project_tz)
@@ -134,7 +139,10 @@ def execute(self, data, parent_data):
             #  如果写成+号 可以输入无限长，或考虑前端修改
             eta = now + datetime.timedelta(seconds=int(timing))
         else:
-            message = _("[定时]节点执行失败: 定时时间仅支持「秒(s)」 或 「%%Y-%%m-%%d %%H:%%M:%%S)」格式，请检查节点配置") % timing
+            message = (
+                _("[定时]节点执行失败: 定时时间仅支持「秒(s)」 或 「%%Y-%%m-%%d %%H:%%M:%%S)」格式，请检查节点配置")
+                % timing
+            )
             LOGGER.error(message)
             data.set_outputs("ex_data", message)
             return False

pipeline_plugins/variables/collections/common.py

@@ -16,8 +16,8 @@
 import logging
 from typing import List
 
+import pytz
 from django.conf import settings
-from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from pipeline.core.data.var import LazyVariable, RegisterVariableMeta, SpliceVariable
 from pipeline.core.flow.io import IntItemSchema, StringItemSchema
@@ -75,7 +75,9 @@ class Datetime(CommonPlainVariable, SelfExplainVariable):
 
     @classmethod
     def _self_explain(cls, **kwargs) -> List[FieldExplain]:
-        return [FieldExplain(key="${KEY}", type=Type.STRING, description="用户选择的时间，输出格式: 2000-04-19 14:45:16")]
+        return [
+            FieldExplain(key="${KEY}", type=Type.STRING, description="用户选择的时间，输出格式: 2000-04-19 14:45:16")
+        ]
 
 
 class Int(CommonPlainVariable, SelfExplainVariable):
@@ -116,11 +118,17 @@ class Select(LazyVariable, SelfExplainVariable):
     meta_tag = "select.select_meta"
     form = "%svariables/%s.js" % (settings.STATIC_URL, code)
     schema = StringItemSchema(description=_("下拉框变量"))
-    desc = _("单选模式下输出选中的 value，多选模式下输出选中 value 以 ',' 拼接的字符串\n该变量默认不支持输入任意值，仅在子流程节点配置填参时支持输入任意值")
+    desc = _(
+        "单选模式下输出选中的 value，多选模式下输出选中 value 以 ',' 拼接的字符串\n该变量默认不支持输入任意值，仅在子流程节点配置填参时支持输入任意值"
+    )
 
     @classmethod
     def _self_explain(cls, **kwargs) -> List[FieldExplain]:
-        return [FieldExplain(key="${KEY}", type=Type.STRING, description="选中的 value，多选模式下输出选中 value 以 ',' 拼接的字符串")]
+        return [
+            FieldExplain(
+                key="${KEY}", type=Type.STRING, description="选中的 value，多选模式下输出选中 value 以 ',' 拼接的字符串"
+            )
+        ]
 
     def get_value(self):
         # multiple select
@@ -151,11 +159,17 @@ class TextValueSelect(LazyVariable, SelfExplainVariable):
     @classmethod
     def _self_explain(cls, **kwargs) -> List[FieldExplain]:
         return [
-            FieldExplain(key="${KEY}", type=Type.DICT, description="用户选择的选项的text与value以及未选中的text与value"),
+            FieldExplain(
+                key="${KEY}", type=Type.DICT, description="用户选择的选项的text与value以及未选中的text与value"
+            ),
             FieldExplain(key='${KEY["value"]}', type=Type.STRING, description="用户选中选项的value，多个以,分隔"),
             FieldExplain(key='${KEY["text"]}', type=Type.STRING, description="用户选中选项的text，多个以,分隔"),
-            FieldExplain(key='${KEY["value_not_selected"]}', type=Type.STRING, description="用户未选中选项的value，多个以,分隔"),
-            FieldExplain(key='${KEY["text_not_selected"]}', type=Type.STRING, description="用户未选中选项的text，多个以,分隔"),
+            FieldExplain(
+                key='${KEY["value_not_selected"]}', type=Type.STRING, description="用户未选中选项的value，多个以,分隔"
+            ),
+            FieldExplain(
+                key='${KEY["text_not_selected"]}', type=Type.STRING, description="用户未选中选项的text，多个以,分隔"
+            ),
         ]
 
     def get_value(self):
@@ -213,7 +227,7 @@ def _self_explain(cls, **kwargs) -> List[FieldExplain]:
     def get_value(self):
         time_format = self.value.get("time_format", "%Y-%m-%d %H:%M:%S").strip()
         time_zone = self.value.get("time_zone", "Asia/Shanghai")
-        now = datetime.datetime.now(timezone.pytz.timezone(time_zone))
+        now = datetime.datetime.now(pytz.timezone(time_zone))
         current_time = now.strftime(time_format)
         return current_time
 
@@ -233,7 +247,7 @@ def _self_explain(cls, **kwargs) -> List[FieldExplain]:
     def get_value(self):
         time_units = self.value.get("time_unit") or ["year", "month", "day", "hour", "minute", "second"]
         time_zone = self.value.get("time_zone", "Asia/Shanghai")
-        now = datetime.datetime.now(timezone.pytz.timezone(time_zone))
+        now = datetime.datetime.now(pytz.timezone(time_zone))
         current_time = now.strftime(self._generate_time_format(time_units))
         return current_time
 
@@ -321,7 +335,10 @@ class StaffGroupSelector(LazyVariable, SelfExplainVariable):
     type = "dynamic"
     tag = "staff_group_multi_selector.staff_group_selector"
     form = "%svariables/staff_group_multi_selector.js" % settings.STATIC_URL
-    desc = _("可选cc业务固定的四个人员分组(运维人员、产品人员、开发人员、测试人员)和标准运维【项目管理】中配置的人员分组\n" "输出格式为选中人员用户名以 ',' 拼接的字符串")
+    desc = _(
+        "可选cc业务固定的四个人员分组(运维人员、产品人员、开发人员、测试人员)和标准运维【项目管理】中配置的人员分组\n"
+        "输出格式为选中人员用户名以 ',' 拼接的字符串"
+    )
 
     @classmethod
     def _self_explain(cls, **kwargs) -> List[FieldExplain]: