Merge pull request #1702 from jumpserver/dev

Dev

apps/assets/utils.py

@@ -13,7 +13,7 @@ def get_assets_by_id_list(id_list):
 
 
 def get_assets_by_fullname_list(hostname_list):
-    return Asset.objects.get_queryset_by_fullname_list(hostname_list)
+    return Asset.get_queryset_by_fullname_list(hostname_list)
 
 
 def get_system_user_by_name(name):

utils/backup_db.sh

+#!/bin/bash
+#
+
+backup_dir='../data/backup/'
+
+if [ ! -d $backup_dir ];then
+    mkdir $backup_dir
+fi
+
+mysqldump -uroot -h127.0.0.1 -p jumpserver > ${backup_dir}/jumpserver_$(date +'%Y-%m-%d_%H:%M:%S').sql