feat: Update v3.1.1

perf: 设置资产账号的默认值，方便导入

GITSHA

@@ -0,0 +1 @@
+012da07999d836ea137eb0124d7f49b935fa75e5

apps/accounts/serializers/account/account.py

@@ -81,7 +81,7 @@ class AccountAssetSerializer(serializers.ModelSerializer):
 
     def to_internal_value(self, data):
         if isinstance(data, dict):
-            i = data.get('id')
+            i = data.get('id') or data.get('pk')
         else:
             i = data
 

apps/assets/serializers/asset/common.py

@@ -71,7 +71,8 @@ class AssetAccountSerializer(
     template = serializers.BooleanField(
         default=False, label=_("Template"), write_only=True
     )
-    name = serializers.CharField(max_length=128, required=True, label=_("Name"))
+    name = serializers.CharField(max_length=128, required=False, label=_("Name"))
+    secret_type = serializers.CharField(max_length=64, default='password', label=_("Secret type"))
 
     class Meta:
         model = Account

apps/common/drf/parsers/base.py

@@ -111,7 +111,7 @@ class BaseFileParser(BaseParser):
         return {'pk': obj_id, 'name': obj_name}
 
     def parse_value(self, field, value):
-        if value is '-':
+        if value == '-' and field and field.allow_null:
             return None
         elif hasattr(field, 'to_file_internal_value'):
             value = field.to_file_internal_value(value)

apps/perms/serializers/permission.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-
-from django.db.models import Q, QuerySet
+from django.db.models import Q
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers
 
@@ -119,7 +118,10 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer):
             return
         assets = self.get_all_assets(nodes, assets)
         accounts = self.create_accounts(assets)
-        push_accounts_to_assets_task.delay([str(account.id) for account in accounts])
+        account_ids = [str(account.id) for account in accounts]
+        slice_count = 20
+        for i in range(0, len(account_ids), slice_count):
+            push_accounts_to_assets_task.delay(account_ids[i:i + slice_count])
 
     def validate_accounts(self, usernames: list[str]):
         template_ids = []