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