From 42e7ca6a18ae8f61bd8e8c6d1032c3ab4b96aa29 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 11 Oct 2021 11:18:03 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E8=B5=84=E4=BA=A7=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=85=81=E8=AE=B8api=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/system_user.py | 5 ++--- apps/assets/serializers/asset.py | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/assets/api/system_user.py b/apps/assets/api/system_user.py index 674ff2208..e4d1cba55 100644 --- a/apps/assets/api/system_user.py +++ b/apps/assets/api/system_user.py @@ -91,7 +91,7 @@ class SystemUserAssetAuthInfoApi(generics.RetrieveAPIView): asset_id = self.kwargs.get('asset_id') user_id = self.request.query_params.get("user_id") username = self.request.query_params.get("username") - instance.load_asset_more_auth(asset_id=asset_id, user_id=user_id, username=username) + instance.load_asset_more_auth(asset_id, user_id, username) return instance @@ -107,8 +107,7 @@ class SystemUserAppAuthInfoApi(generics.RetrieveAPIView): instance = super().get_object() app_id = self.kwargs.get('app_id') user_id = self.request.query_params.get("user_id") - if user_id: - instance.load_app_more_auth(app_id, user_id) + instance.load_app_more_auth(app_id, user_id) return instance diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py index 051db7330..7f7e6fb53 100644 --- a/apps/assets/serializers/asset.py +++ b/apps/assets/serializers/asset.py @@ -74,11 +74,11 @@ class AssetSerializer(BulkOrgResourceModelSerializer): model = Asset fields_mini = ['id', 'hostname', 'ip', 'platform', 'protocols'] fields_small = fields_mini + [ - 'protocol', 'port', 'protocols', 'is_active', 'public_ip', - 'comment', + 'protocol', 'port', 'protocols', 'is_active', + 'public_ip', 'number', 'comment', ] hardware_fields = [ - 'number', 'vendor', 'model', 'sn', 'cpu_model', 'cpu_count', + 'vendor', 'model', 'sn', 'cpu_model', 'cpu_count', 'cpu_cores', 'cpu_vcpus', 'memory', 'disk_total', 'disk_info', 'os', 'os_version', 'os_arch', 'hostname_raw', 'hardware_info', 'connectivity', 'date_verified'