From a806a2d3e6bf6813345d83d2707c6feed3e36719 Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 16 Feb 2022 19:16:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | 4 ++-- apps/locale/zh/LC_MESSAGES/django.po | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 28f37294d..8611f2cc2 100644 --- a/apps/locale/zh/LC_MESSAGES/django.mo +++ b/apps/locale/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a421482ff4103a9c3ca895b29e739c2cef0dc10a4f9914bfe7226fa3c45cac4 -size 97592 +oid sha256:67a04954f2a6c1da8c2f40307166a87ba1088e858422378eb638a1d1aafc5a89 +size 97595 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 208e87c10..a4edb3f6b 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -1955,7 +1955,7 @@ msgstr "异地登录提醒" #: authentication/notifications.py:52 msgid "binding reminder" -msgstr "定时提醒" +msgstr "绑定提醒" #: authentication/templates/authentication/_access_key_modal.html:6 msgid "API key list" From c7f8ebb6135303099f52a203573d473055feda35 Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 16 Feb 2022 20:07:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E7=AB=99=E5=86=85=E4=BF=A1=20Server?= =?UTF-8?q?PerformanceCheck=20redis=20=E8=AE=A2=E9=98=85=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ops/notifications.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/ops/notifications.py b/apps/ops/notifications.py index 442a81cf6..b34b00e1f 100644 --- a/apps/ops/notifications.py +++ b/apps/ops/notifications.py @@ -1,4 +1,5 @@ from django.utils.translation import gettext_lazy as _ +from django.utils.translation import gettext from django.template.loader import render_to_string from notifications.notifications import SystemMessage @@ -19,7 +20,7 @@ class ServerPerformanceMessage(SystemMessage): self.terms_with_errors = terms_with_errors def get_html_msg(self) -> dict: - subject = _("Terminal health check warning") + subject = gettext("Terminal health check warning") context = { 'terms_with_errors': self.terms_with_errors } From b088362ae304d19d2bb7390a50b8991fea9fc784 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Wed, 16 Feb 2022 18:29:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf:=20=E8=B4=A6=E5=8F=B7=E5=A4=87?= =?UTF-8?q?=E4=BB=BD=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/task_handlers/backup/handlers.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/assets/task_handlers/backup/handlers.py b/apps/assets/task_handlers/backup/handlers.py index 91bae54d1..d0e9fe365 100644 --- a/apps/assets/task_handlers/backup/handlers.py +++ b/apps/assets/task_handlers/backup/handlers.py @@ -52,10 +52,11 @@ class BaseAccountHandler: return header_fields @classmethod - def create_row(cls, account, serializer_cls): + def create_row(cls, account, serializer_cls, header_fields=None): serializer = serializer_cls(account) + if not header_fields: + header_fields = cls.get_header_fields(serializer) data = cls.unpack_data(serializer.data) - header_fields = cls.get_header_fields(serializer) row_dict = {} for field, header_name in header_fields.items(): row_dict[header_name] = data[field] @@ -74,12 +75,16 @@ class AssetAccountHandler(BaseAccountHandler): def create_df(cls): df_dict = defaultdict(list) sheet_name = AuthBook._meta.verbose_name - accounts = AuthBook.get_queryset() + + accounts = AuthBook.get_queryset().select_related('systemuser') + if not accounts.first(): + return df_dict + + header_fields = cls.get_header_fields(AccountSecretSerializer(accounts.first())) for account in accounts: account.load_auth() - row = cls.create_row(account, AccountSecretSerializer) + row = cls.create_row(account, AccountSecretSerializer, header_fields) df_dict[sheet_name].append(row) - for k, v in df_dict.items(): df_dict[k] = pd.DataFrame(v) @@ -98,7 +103,7 @@ class AppAccountHandler(BaseAccountHandler): @classmethod def create_df(cls): df_dict = defaultdict(list) - accounts = Account.get_queryset() + accounts = Account.get_queryset().select_related('systemuser') for account in accounts: account.load_auth() app_type = account.type