Commit 1c2cba64 authored by ibuler's avatar ibuler

修改推送默认端口bug

parent 36bfb50a
...@@ -64,7 +64,6 @@ def get_asset_info(asset): ...@@ -64,7 +64,6 @@ def get_asset_info(asset):
info = {'hostname': asset.hostname, 'ip': asset.ip} info = {'hostname': asset.hostname, 'ip': asset.ip}
if asset.use_default_auth: if asset.use_default_auth:
if default: if default:
info['port'] = int(default.field2)
info['username'] = default.field1 info['username'] = default.field1
try: try:
info['password'] = CRYPTOR.decrypt(default.field3) info['password'] = CRYPTOR.decrypt(default.field3)
...@@ -73,10 +72,11 @@ def get_asset_info(asset): ...@@ -73,10 +72,11 @@ def get_asset_info(asset):
if os.path.isfile(default.field4): if os.path.isfile(default.field4):
info['ssh_key'] = default.field4 info['ssh_key'] = default.field4
else: else:
info['port'] = int(asset.port)
info['username'] = asset.username info['username'] = asset.username
info['password'] = CRYPTOR.decrypt(asset.password) info['password'] = CRYPTOR.decrypt(asset.password)
info['port'] = int(asset.port)
return info return info
......
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