From 14b1e3fa1367d966fcc7a05caa3a8117f13f088e Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 16 Aug 2018 17:08:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0backup?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/backup_db.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100755 utils/backup_db.sh

diff --git a/utils/backup_db.sh b/utils/backup_db.sh
new file mode 100755
index 000000000..21ed938a8
--- /dev/null
+++ b/utils/backup_db.sh
@@ -0,0 +1,10 @@
+#!/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

From 2dbd6b6f6e97d8676e5a3cee76c748db8e39c55c Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 16 Aug 2018 18:29:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=B5=84=E4=BA=A7=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/assets/utils.py b/apps/assets/utils.py
index 9cee82a46..749e4c3c3 100644
--- a/apps/assets/utils.py
+++ b/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):