Merge pull request #6645 from jumpserver/dev

Dev

apps/applications/api/account.py

@@ -35,7 +35,8 @@ class ApplicationAccountViewSet(JMSModelViewSet):
     http_method_names = ['get', 'put', 'patch', 'options']
 
     def get_queryset(self):
-        queryset = ApplicationPermission.objects.all() \
+        queryset = ApplicationPermission.objects.exclude(system_users__isnull=True) \
+            .exclude(applications__isnull=True) \
             .annotate(uid=Concat(
                 'applications', Value('_'), 'system_users', output_field=CharField()
              )) \

apps/applications/serializers/application.py

@@ -68,6 +68,7 @@ class ApplicationSerializer(ApplicationSerializerMixin, BulkOrgResourceModelSeri
 
 
 class ApplicationAccountSerializer(serializers.Serializer):
+    id = serializers.ReadOnlyField(label=_("Id"), source='uid')
     username = serializers.ReadOnlyField(label=_("Username"))
     password = serializers.CharField(write_only=True, label=_("Password"))
     systemuser = serializers.ReadOnlyField(label=_('System user'))

utils/check_celery.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ "$(ps axu | grep 'celery' | grep -v 'grep' | grep -cv 'defunct')" == "5" ]];then
+  exit 0
+else
+  exit 1
+fi