From 26978ac4558a7af670b6126915b622e1f2e19857 Mon Sep 17 00:00:00 2001 From: vapao Date: Sat, 26 Jun 2021 18:02:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E7=AE=A1=E7=90=86#=E6=9B=B4?= =?UTF-8?q?=E6=96=B0excel=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_api/apps/host/views.py | 10 +--------- spug_web/public/resource/主机导入模板.xlsx | Bin 8778 -> 8760 bytes 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/spug_api/apps/host/views.py b/spug_api/apps/host/views.py index 0f721ca..e865bc9 100644 --- a/spug_api/apps/host/views.py +++ b/spug_api/apps/host/views.py @@ -96,7 +96,6 @@ class HostView(View): def post_import(request): - password = request.POST.get('password') group_id = request.POST.get('group_id') file = request.FILES['file'] ws = load_workbook(file, read_only=True)['Sheet1'] @@ -112,8 +111,7 @@ def post_import(request): hostname=row[1].value, port=row[2].value, username=row[3].value, - password=row[4].value, - desc=row[5].value + desc=row[4].value ) if Host.objects.filter(hostname=data.hostname, port=data.port, username=data.username).exists(): summary['skip'].append(i) @@ -121,12 +119,6 @@ def post_import(request): if Host.objects.filter(name=data.name).exists(): summary['repeat'].append(i) continue - try: - password = data.pop('password') or password - if valid_ssh(data.hostname, data.port, data.username, password, None, False) is False: - data.is_verified = True - except Exception: - pass host = Host.objects.create(created_by=request.user, **data) host.groups.add(group_id) summary['success'].append(i) diff --git a/spug_web/public/resource/主机导入模板.xlsx b/spug_web/public/resource/主机导入模板.xlsx index dddc3edf6c96c3c08e4c62e00b26d42d29f725f3..415e78ace78e066b6cae071e7d2bc7195193bf89 100644 GIT binary patch delta 4763 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