From 4504e76623e991d80252f049160040bd3eec1eab Mon Sep 17 00:00:00 2001 From: yumoqing Date: Tue, 14 Oct 2025 14:54:24 +0800 Subject: [PATCH] bugfix --- wwwroot/sagelog.ui | 25 +++++++++++++++++++++++++ wwwroot/sagelog.xterm | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 wwwroot/sagelog.ui create mode 100644 wwwroot/sagelog.xterm diff --git a/wwwroot/sagelog.ui b/wwwroot/sagelog.ui new file mode 100644 index 0000000..6795036 --- /dev/null +++ b/wwwroot/sagelog.ui @@ -0,0 +1,25 @@ +{ + "widgettype":"PopupWindow", + "options":{ + "auto_open":true, + "auto_destroy":true, + "archor":"cc", + "cwidth":45, + "cheight":40, + "movable":true, + "icon":"{{entire_url('imgs/terminal.svg')}}", + "title":"大平台日志", + "content":{ + "widgettype":"Wterm", + "options":{ + "height":"100%", + "width":"100%", + "term_options":{ + "fontSize":24 + }, + "ws_url":"{{entire_url('/wss/msp/sagelog.xterm')}}?id=none" + } + } + } +} + diff --git a/wwwroot/sagelog.xterm b/wwwroot/sagelog.xterm new file mode 100644 index 0000000..87484d4 --- /dev/null +++ b/wwwroot/sagelog.xterm @@ -0,0 +1,32 @@ +debug(f'{params_kw=},') +async def gethostinfo(sor, ns): + sql="""select a.* +from hostdev a +where a.id= ${id}$ +""" + recs = await sor.sqlExe(sql,ns.copy()) + if len(recs) > 0: + r = recs[0] + r.username = r.user + if r.client_key: + r.client_keys = [password_decode(r.client_key)] + if r.passwd: + r.password = password_decode(r.passwd) + if r.passphrase: + r.passphrase = password_decode(r.passphrase) + if r.jumperid: + r.jumperservers = await gethostinfo(sor, {'id':r.jumperid}) + return DictObject(**r) + +db = DBPools() +userid = await get_user() +dbname = get_module_dbname('msp') +async with db.sqlorContext(dbname) as sor: + ns = { + "id":"JFWxNcA_wsdFJ4ZO-4PKr" + } + r = await gethostinfo(sor, ns) + r.cmdargs = [ "~/bin/sagelog" ] + r.noinput = True + return r +return None