From 1c2cba64ecdff164578866d27b9996a8ad970091 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 21 Jan 2016 18:17:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=AB=AF=E5=8F=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jumpserver/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jumpserver/api.py b/jumpserver/api.py index 68a013870..d524309ba 100644 --- a/jumpserver/api.py +++ b/jumpserver/api.py @@ -64,7 +64,6 @@ def get_asset_info(asset): info = {'hostname': asset.hostname, 'ip': asset.ip} if asset.use_default_auth: if default: - info['port'] = int(default.field2) info['username'] = default.field1 try: info['password'] = CRYPTOR.decrypt(default.field3) @@ -73,10 +72,11 @@ def get_asset_info(asset): if os.path.isfile(default.field4): info['ssh_key'] = default.field4 else: - info['port'] = int(asset.port) info['username'] = asset.username info['password'] = CRYPTOR.decrypt(asset.password) + info['port'] = int(asset.port) + return info