Skip to content

J
jumpserver
Commit 231f9619 authored by wangyong's avatar wangyong
Browse files
Options

fix asset upload bug

parent 300e1061
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
jasset/asset_api.py
View file @ 231f9619
...@@ -290,6 +290,8 @@ def excel_to_db(excel_file): ...@@ -290,6 +290,8 @@ def excel_to_db(excel_file):
ip, port, hostname, use_default_auth, username, password, group = row ip, port, hostname, use_default_auth, username, password, group = row
if get_object(Asset, hostname=hostname): if get_object(Asset, hostname=hostname):
continue continue
if isinstance(password, int) or isinstance(password, float):
password = unicode(int(password))
use_default_auth = 1 if use_default_auth == u'默认' else 0 use_default_auth = 1 if use_default_auth == u'默认' else 0
password_encode = CRYPTOR.encrypt(password) if password else '' password_encode = CRYPTOR.encrypt(password) if password else ''
if hostname: if hostname:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment