Merge pull request #9587 from jumpserver/pr@dev@perf_gateway

perf: 优化 gateway 返回情况

apps/accounts/serializers/account/account.py

@@ -12,19 +12,19 @@ from .base import BaseAccountSerializer
 
 
 class AccountSerializerCreateValidateMixin:
-    id: str
+    from_id: str
     template: bool
     push_now: bool
     replace_attrs: callable
 
     def to_internal_value(self, data):
-        _id = data.pop('id', None)
+        from_id = data.pop('id', None)
         ret = super().to_internal_value(data)
-        self.id = _id
+        self.from_id = from_id
         return ret
 
     def set_secret(self, attrs):
-        _id = self.id
+        _id = self.from_id
         template = attrs.pop('template', None)
 
         if _id and template:

apps/assets/models/asset/common.py

@@ -234,9 +234,11 @@ class Asset(NodesRelationMixin, AbsConnectivity, JMSOrgBaseModel):
 
     @lazyproperty
     def gateway(self):
-        if self.domain_id:
+        if not self.domain_id:
-            return self.domain.select_gateway()
+            return
-        return None
+        if not self.platform.domain_enabled:
+            return
+        return self.domain.select_gateway()
 
     def as_node(self):
         from assets.models import Node

apps/authentication/api/connection_token.py

@@ -151,7 +151,6 @@ class RDPFileClientProtocolURLMixin:
                 }
             })
         else:
-            print("Connect method: {}".format(connect_method_dict))
             endpoint = self.get_smart_endpoint(
                 protocol=connect_method_dict['endpoint_protocol'],
                 asset=token.asset

apps/authentication/models/connection_token.py

@@ -228,16 +228,16 @@ class ConnectionToken(JMSOrgBaseModel):
 
     @lazyproperty
     def domain(self):
+        if not self.asset.platform.domain_enabled:
+            return
         domain = self.asset.domain if self.asset else None
         return domain
 
     @lazyproperty
     def gateway(self):
-        from assets.models import Domain
+        if not self.asset:
-        if not self.domain:
             return
-        self.domain: Domain
+        return self.asset.gateway
-        return self.domain.select_gateway()
 
     @lazyproperty
     def command_filter_acls(self):