mirror of https://github.com/jumpserver/jumpserver
perf: 优化 connect token asset info
parent
1248458451
commit
34e846927b
|
@ -148,6 +148,14 @@ class Asset(NodesRelationMixin, AbsConnectivity, JMSOrgBaseModel):
|
||||||
spec_fields = self.get_spec_fields(instance, secret=True)
|
spec_fields = self.get_spec_fields(instance, secret=True)
|
||||||
return self.get_spec_values(instance, spec_fields)
|
return self.get_spec_values(instance, spec_fields)
|
||||||
|
|
||||||
|
@lazyproperty
|
||||||
|
def info(self):
|
||||||
|
info = {}
|
||||||
|
info.update(self.gathered_info or {})
|
||||||
|
info.update(self.custom_info or {})
|
||||||
|
info.update(self.spec_info or {})
|
||||||
|
return info
|
||||||
|
|
||||||
@lazyproperty
|
@lazyproperty
|
||||||
def auto_config(self):
|
def auto_config(self):
|
||||||
platform = self.platform
|
platform = self.platform
|
||||||
|
|
|
@ -162,7 +162,8 @@ class RDPFileClientProtocolURLMixin:
|
||||||
def get_smart_endpoint(self, protocol, asset=None):
|
def get_smart_endpoint(self, protocol, asset=None):
|
||||||
target_ip = asset.get_target_ip() if asset else ''
|
target_ip = asset.get_target_ip() if asset else ''
|
||||||
endpoint = EndpointRule.match_endpoint(
|
endpoint = EndpointRule.match_endpoint(
|
||||||
target_instance=asset, target_ip=target_ip, protocol=protocol, request=self.request
|
target_instance=asset, target_ip=target_ip,
|
||||||
|
protocol=protocol, request=self.request
|
||||||
)
|
)
|
||||||
return endpoint
|
return endpoint
|
||||||
|
|
||||||
|
|
|
@ -27,12 +27,13 @@ class _ConnectionTokenUserSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
class _ConnectionTokenAssetSerializer(serializers.ModelSerializer):
|
class _ConnectionTokenAssetSerializer(serializers.ModelSerializer):
|
||||||
protocols = AssetProtocolsSerializer(many=True, required=False, label=_('Protocols'))
|
protocols = AssetProtocolsSerializer(many=True, required=False, label=_('Protocols'))
|
||||||
|
info = serializers.DictField()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Asset
|
model = Asset
|
||||||
fields = [
|
fields = [
|
||||||
'id', 'name', 'address', 'protocols', 'category',
|
'id', 'name', 'address', 'protocols', 'category',
|
||||||
'type', 'org_id', 'spec_info', 'secret_info',
|
'type', 'org_id', 'info', 'secret_info',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue