reactor: 重构命令&录像存储模块的Serializer及相关模块 (#5392)

* reactor: 重构命令&录像存储模块的Serializer及相关模块 Co-authored-by: Bai <bugatti_it@163.com>
2025-09-24 21:08:30 +00:00 · 2021-01-12 18:06:42 +08:00
parent b3f359d47b
commit 86a055638c
34 changed files with 636 additions and 551 deletions
--- a/apps/applications/serializers/application.py
+++ b/apps/applications/serializers/application.py
@@ -18,15 +18,19 @@ class ApplicationSerializerMixin(serializers.Serializer):
    attrs = MethodSerializer()

    def get_attrs_serializer(self):
-        request = self.context['request']
-        query_type = request.query_params.get('type')
-        query_category = request.query_params.get('category')
-        if query_type:
-            serializer_class = type_serializer_classes_mapping.get(query_type)
-        elif query_category:
-            serializer_class = category_serializer_classes_mapping.get(query_category)
+        serializer_class = None
+        if isinstance(self.instance, models.Application):
+            instance_type = self.instance.type
+            serializer_class = type_serializer_classes_mapping.get(instance_type)
        else:
-            serializer_class = None
+            request = self.context['request']
+            query_type = request.query_params.get('type')
+            query_category = request.query_params.get('category')
+            if query_type:
+                serializer_class = type_serializer_classes_mapping.get(query_type)
+            elif query_category:
+                serializer_class = category_serializer_classes_mapping.get(query_category)
+
        if serializer_class is None:
            serializer_class = serializers.Serializer
        serializer = serializer_class()
--- a/apps/applications/serializers/attrs/application_category/cloud.py
+++ b/apps/applications/serializers/attrs/application_category/cloud.py
@@ -6,4 +6,4 @@ __all__ = ['CloudSerializer']


 class CloudSerializer(serializers.Serializer):
-    cluster = serializers.CharField(max_length=1024, label=_('Cluster'))
+    cluster = serializers.CharField(max_length=1024, label=_('Cluster'), allow_null=True)
--- a/apps/applications/serializers/attrs/application_category/db.py
+++ b/apps/applications/serializers/attrs/application_category/db.py
@@ -8,9 +8,8 @@ __all__ = ['DBSerializer']


 class DBSerializer(serializers.Serializer):
-    host = serializers.CharField(max_length=128, label=_('Host'))
-    port = serializers.IntegerField(label=_('Port'))
-    # 添加allow_null=True，兼容之前数据库中database字段为None的情况
+    host = serializers.CharField(max_length=128, label=_('Host'), allow_null=True)
+    port = serializers.IntegerField(label=_('Port'), allow_null=True)
    database = serializers.CharField(
        max_length=128, required=True, allow_null=True, label=_('Database')
    )
--- a/apps/applications/serializers/attrs/application_category/remote_app.py
+++ b/apps/applications/serializers/attrs/application_category/remote_app.py
@@ -29,8 +29,12 @@ class CharPrimaryKeyRelatedField(serializers.PrimaryKeyRelatedField):

 class RemoteAppSerializer(serializers.Serializer):
    asset_info = serializers.SerializerMethodField()
-    asset = CharPrimaryKeyRelatedField(queryset=Asset.objects, required=False, label=_("Asset"))
-    path = serializers.CharField(max_length=128, label=_('Application path'))
+    asset = CharPrimaryKeyRelatedField(
+        queryset=Asset.objects, required=False, label=_("Asset"), allow_null=True
+    )
+    path = serializers.CharField(
+        max_length=128, label=_('Application path'), allow_null=True
+    )

    @staticmethod
    def get_asset_info(obj):
--- a/apps/applications/serializers/attrs/application_type/chrome.py
+++ b/apps/applications/serializers/attrs/application_type/chrome.py
@@ -11,15 +11,16 @@ class ChromeSerializer(RemoteAppSerializer):
    CHROME_PATH = 'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe'

    path = serializers.CharField(
-        max_length=128, label=_('Application path'), default=CHROME_PATH
+        max_length=128, label=_('Application path'), default=CHROME_PATH, allow_null=True,
    )
    chrome_target = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, label=_('Target URL')
+        max_length=128, allow_blank=True, required=False, label=_('Target URL'), allow_null=True,
    )
    chrome_username = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, label=_('Username')
+        max_length=128, allow_blank=True, required=False, label=_('Username'), allow_null=True,
    )
    chrome_password = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, write_only=True, label=_('Password')
+        max_length=128, allow_blank=True, required=False, write_only=True, label=_('Password'),
+        allow_null=True
    )

--- a/apps/applications/serializers/attrs/application_type/custom.py
+++ b/apps/applications/serializers/attrs/application_type/custom.py
@@ -10,14 +10,18 @@ __all__ = ['CustomSerializer']

 class CustomSerializer(RemoteAppSerializer):
    custom_cmdline = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, label=_('Operating parameter')
+        max_length=128, allow_blank=True, required=False, label=_('Operating parameter'),
+        allow_null=True,
    )
    custom_target = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, label=_('Target url')
+        max_length=128, allow_blank=True, required=False, label=_('Target url'),
+        allow_null=True,
    )
    custom_username = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, label=_('Username')
+        max_length=128, allow_blank=True, required=False, label=_('Username'),
+        allow_null=True,
    )
    custom_password = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, write_only=True, label=_('Password')
+        max_length=128, allow_blank=True, required=False, write_only=True, label=_('Password'),
+        allow_null=True,
    )
--- a/apps/applications/serializers/attrs/application_type/mysql.py
+++ b/apps/applications/serializers/attrs/application_type/mysql.py
@@ -8,7 +8,7 @@ __all__ = ['MySQLSerializer']


 class MySQLSerializer(DBSerializer):
-    port = serializers.IntegerField(default=3306, label=_('Port'))
+    port = serializers.IntegerField(default=3306, label=_('Port'), allow_null=True)



--- a/apps/applications/serializers/attrs/application_type/mysql_workbench.py
+++ b/apps/applications/serializers/attrs/application_type/mysql_workbench.py
@@ -11,20 +11,26 @@ class MySQLWorkbenchSerializer(RemoteAppSerializer):
    MYSQL_WORKBENCH_PATH = 'C:\Program Files\MySQL\MySQL Workbench 8.0 CE\MySQLWorkbench.exe'

    path = serializers.CharField(
-        max_length=128, label=_('Application path'), default=MYSQL_WORKBENCH_PATH
+        max_length=128, label=_('Application path'), default=MYSQL_WORKBENCH_PATH,
+        allow_null=True,
    )
    mysql_workbench_ip = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, label=_('IP')
+        max_length=128, allow_blank=True, required=False, label=_('IP'),
+        allow_null=True,
    )
    mysql_workbench_port = serializers.IntegerField(
-        required=False, label=_('Port')
+        required=False, label=_('Port'),
+        allow_null=True,
    )
    mysql_workbench_name = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, label=_('Database')
+        max_length=128, allow_blank=True, required=False, label=_('Database'),
+        allow_null=True,
    )
    mysql_workbench_username = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, label=_('Username')
+        max_length=128, allow_blank=True, required=False, label=_('Username'),
+        allow_null=True,
    )
    mysql_workbench_password = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, write_only=True, label=_('Password')
+        max_length=128, allow_blank=True, required=False, write_only=True, label=_('Password'),
+        allow_null=True,
    )
--- a/apps/applications/serializers/attrs/application_type/oracle.py
+++ b/apps/applications/serializers/attrs/application_type/oracle.py
@@ -8,5 +8,5 @@ __all__ = ['OracleSerializer']


 class OracleSerializer(DBSerializer):
-    port = serializers.IntegerField(default=1521, label=_('Port'))
+    port = serializers.IntegerField(default=1521, label=_('Port'), allow_null=True)

--- a/apps/applications/serializers/attrs/application_type/pgsql.py
+++ b/apps/applications/serializers/attrs/application_type/pgsql.py
@@ -8,5 +8,5 @@ __all__ = ['PostgreSerializer']


 class PostgreSerializer(DBSerializer):
-    port = serializers.IntegerField(default=5432, label=_('Port'))
+    port = serializers.IntegerField(default=5432, label=_('Port'), allow_null=True)

--- a/apps/applications/serializers/attrs/application_type/vmware_client.py
+++ b/apps/applications/serializers/attrs/application_type/vmware_client.py
@@ -15,14 +15,18 @@ class VMwareClientSerializer(RemoteAppSerializer):
    VMWARE_CLIENT_PATH = ''.join(PATH.split())

    path = serializers.CharField(
-        max_length=128, label=_('Application path'), default=VMWARE_CLIENT_PATH
+        max_length=128, label=_('Application path'), default=VMWARE_CLIENT_PATH,
+        allow_null=True
    )
    vmware_target = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, label=_('Target URL')
+        max_length=128, allow_blank=True, required=False, label=_('Target URL'),
+        allow_null=True
    )
    vmware_username = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, label=_('Username')
+        max_length=128, allow_blank=True, required=False, label=_('Username'),
+        allow_null=True
    )
    vmware_password = serializers.CharField(
-        max_length=128, allow_blank=True, required=False, write_only=True, label=_('Password')
+        max_length=128, allow_blank=True, required=False, write_only=True, label=_('Password'),
+        allow_null=True
    )