fix: 修改sftp账号备份文件名及任务日志提示

apps/accounts/automations/backup_account/handlers.py

@@ -12,13 +12,17 @@ from accounts.serializers import AccountSecretSerializer
 from accounts.models.automations.backup_account import AccountBackupAutomation
 from assets.const import AllTypes
 from common.utils.file import encrypt_and_compress_zip_file, zip_files
-from common.utils.timezone import local_now_display
+from common.utils.timezone import local_now_filename, local_now_display
 from terminal.models.component.storage import ReplayStorage
 from users.models import User
 
 PATH = os.path.join(os.path.dirname(settings.BASE_DIR), 'tmp')
 
 
+class RecipientsNotFound(Exception):
+    pass
+
+
 class BaseAccountHandler:
     @classmethod
     def unpack_data(cls, serializer_data, data=None):
@@ -70,7 +74,7 @@ class AssetAccountHandler(BaseAccountHandler):
     @staticmethod
     def get_filename(plan_name):
         filename = os.path.join(
-            PATH, f'{plan_name}-{local_now_display()}-{time.time()}.xlsx'
+            PATH, f'{plan_name}-{local_now_filename()}-{time.time()}.xlsx'
         )
         return filename
 
@@ -146,7 +150,7 @@ class AccountBackupHandler:
         wb.save(filename)
         files.append(filename)
         timedelta = round((time.time() - time_start), 2)
-        print('步骤完成: 用时 {}s'.format(timedelta))
+        print('创建备份文件完成: 用时 {}s'.format(timedelta))
         return files
 
     def send_backup_mail(self, files, recipients):
@@ -155,7 +159,7 @@ class AccountBackupHandler:
         recipients = User.objects.filter(id__in=list(recipients))
         print(
             '\n'
-            '\033[32m>>> 发送备份邮件\033[0m'
+            '\033[32m>>> 开始发送备份邮件\033[0m'
             ''
         )
         plan_name = self.plan_name
@@ -164,7 +168,7 @@ class AccountBackupHandler:
                 attachment_list = []
             else:
                 password = user.secret_key.encode('utf8')
-                attachment = os.path.join(PATH, f'{plan_name}-{local_now_display()}-{time.time()}.zip')
+                attachment = os.path.join(PATH, f'{plan_name}-{local_now_filename()}-{time.time()}.zip')
                 encrypt_and_compress_zip_file(attachment, password, files)
                 attachment_list = [attachment, ]
             AccountBackupExecutionTaskMsg(plan_name, user).publish(attachment_list)
@@ -178,13 +182,14 @@ class AccountBackupHandler:
         recipients = ReplayStorage.objects.filter(id__in=list(recipients))
         print(
             '\n'
-            '\033[31m>>> 发送备份文件到sftp服务器\033[0m'
+            '\033[32m>>> 开始发送备份文件到sftp服务器\033[0m'
             ''
         )
         plan_name = self.plan_name
         for rec in recipients:
-            attachment = os.path.join(PATH, f'{plan_name}-{local_now_display()}-{time.time()}.zip')
+            attachment = os.path.join(PATH, f'{plan_name}-{local_now_filename()}-{time.time()}.zip')
             if password:
+                print('\033[32m>>> 使用加密密码对文件进行加密中\033[0m')
                 password = password.encode('utf8')
                 encrypt_and_compress_zip_file(attachment, password, files)
             else:
@@ -199,12 +204,12 @@ class AccountBackupHandler:
         self.execution.reason = reason[:1024]
         self.execution.is_success = is_success
         self.execution.save()
-        print('已完成对任务状态的更新')
+        print('\n已完成对任务状态的更新\n')
 
     @staticmethod
     def step_finished(is_success):
         if is_success:
-            print('任务执行完成')
+            print('任务执行成功')
         else:
             print('任务执行失败')
 
@@ -241,8 +246,9 @@ class AccountBackupHandler:
                 '\033[31m>>> 该备份任务未分配sftp服务器\033[0m'
                 ''
             )
-            return
+            raise RecipientsNotFound('Not Found Recipients')
         if obj_recipients_part_one and obj_recipients_part_two:
+            print('\033[32m>>> 账号的密钥将被拆分成前后两部分发送\033[0m')
             files = self.create_excel(section='front')
             self.send_backup_obj_storage(files, obj_recipients_part_one, zip_encrypt_password)
 
@@ -262,8 +268,9 @@ class AccountBackupHandler:
                 '\033[31m>>> 该备份任务未分配收件人\033[0m'
                 ''
             )
-            return
+            raise RecipientsNotFound('Not Found Recipients')
         if recipients_part_one and recipients_part_two:
+            print('\033[32m>>> 账号的密钥将被拆分成前后两部分发送\033[0m')
             files = self.create_excel(section='front')
             self.send_backup_mail(files, recipients_part_one)
 
@@ -286,4 +293,4 @@ class AccountBackupHandler:
         finally:
             print('\n任务结束: {}'.format(local_now_display()))
             timedelta = round((time.time() - time_start), 2)
-            print('用时: {}'.format(timedelta))
+            print('用时: {}s'.format(timedelta))