Merge branch 'master' into v2.0

[Update] assets/gathered_user 添加过滤字段

apps/assets/api/gathered_user.py

@@ -18,5 +18,5 @@ class GatheredUserViewSet(OrgModelViewSet):
     permission_classes = [IsOrgAdmin]
     extra_filter_backends = [AssetRelatedByNodeFilterBackend]
 
-    filter_fields = ['asset', 'username', 'present', 'asset__ip', 'asset__hostname']
+    filter_fields = ['asset', 'username', 'present', 'asset__ip', 'asset__hostname', 'asset_id']
     search_fields = ['username', 'asset__ip', 'asset__hostname']

apps/assets/api/system_user.py

@@ -28,7 +28,7 @@ class SystemUserViewSet(OrgBulkModelViewSet):
     System user api set, for add,delete,update,list,retrieve resource
     """
     model = SystemUser
-    filter_fields = ("name", "username")
+    filter_fields = ("name", "username", "protocol")
     search_fields = filter_fields
     serializer_class = serializers.SystemUserSerializer
     serializer_classes = {

apps/audits/api.py

@@ -27,6 +27,7 @@ class FTPLogViewSet(CreateModelMixin,
     ]
     filter_fields = ['user', 'asset', 'system_user', 'filename']
     search_fields = filter_fields
+    ordering = ['-date_start']
 
 
 class UserLoginLogViewSet(ListModelMixin, CommonGenericViewSet):

apps/locale/zh/LC_MESSAGES/django.po

@@ -3755,7 +3755,7 @@ msgstr "腾讯云"
 
 #: xpack/plugins/cloud/serializers.py:53
 msgid "History count"
-msgstr "用户数量"
+msgstr "执行次数"
 
 #: xpack/plugins/cloud/serializers.py:54
 msgid "Instance count"

utils/example_api.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+import requests
+
+# 私有token页面上目前不允许创建，只能后台生成，见 https://docs.jumpserver.org/zh/master/dev/rest_api/
+private_token = '10659d70a223235b8f76d45a3023eca1147488d7'
+
+
+def do_request(url, data=None, method='get', params=None, org_id=''):
+    authorization = 'Token {}'.format(private_token)
+    headers = {'Authorization': authorization, 'Content-Type': 'application/json'}
+    if org_id:
+        headers['X-JMS-ORG'] = org_id
+    resp = requests.request(method=method, url=url, data=data, params=params, headers=headers)
+    return resp
+
+
+def get_assets_list():
+    url = 'http://localhost:8080/api/v1/assets/assets/?limit=10'
+    resp = do_request(url)
+    print(resp.status_code)
+    print(resp.json())
+    print(resp)
+
+
+if __name__ == '__main__':
+    get_assets_list()