Merge pull request #1805 from jumpserver/dev

Dev

apps/perms/templates/perms/asset_permission_create_update.html

@@ -94,8 +94,11 @@ $(document).ready(function () {
         autoclose: true
     });
     $("#id_assets").parent().find(".select2-selection").on('click', function (e) {
-        e.preventDefault();
-        $("#asset_list_modal").modal();
+        if ($(e.target).attr('class') !== 'select2-selection__choice__remove'){
+            e.preventDefault();
+            e.stopPropagation();
+            $("#asset_list_modal").modal();
+        }
     })
 })
 .on('click', '#btn_asset_modal_confirm', function () {

jms

@@ -122,7 +122,9 @@ def start_gunicorn():
     cmd = [
         'gunicorn', 'jumpserver.wsgi',
         '-b', bind,
-        '-k', 'eventlet',
+        #'-k', 'eventlet',
+        '-k', 'gthread',
+        '--threads', '10',
         '-w', str(WORKERS),
         '--access-logformat', log_format,
         '-p', pid_file,