From 3036d92f2e5cc9d0e09fbfa90478fa95bd6f9211 Mon Sep 17 00:00:00 2001 From: Max Zhao Date: Wed, 19 Feb 2020 18:45:56 +0800 Subject: [PATCH] luci-app-ssr-plus: fix trojan url import (#3195) --- .../luasrc/view/shadowsocksr/ssrurl.htm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm index 4dcff12ef..2aac82e0e 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm +++ b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm @@ -211,16 +211,16 @@ } else { url0 = ssu[1] } - var sstr = b64decsafe(url0); + var sstr = url0; document.getElementById('cbid.shadowsocksr.' + sid + '.type').value = "trojan"; document.getElementById('cbid.shadowsocksr.' + sid + '.type').dispatchEvent(event); var team = sstr.split('@'); - console.log(param); - var part1 = team[0].split(':'); - var part2 = team[1].split(':'); - document.getElementById('cbid.shadowsocksr.' + sid + '.server').value = part2[0]; - document.getElementById('cbid.shadowsocksr.' + sid + '.server_port').value = part2[1]; - document.getElementById('cbid.shadowsocksr.' + sid + '.password').value = part1[1]; + var password = team[0] + var serverPart = team[1].split(':'); + var port = serverPart[1].split('?')[0]; + document.getElementById('cbid.shadowsocksr.' + sid + '.server').value = serverPart[0]; + document.getElementById('cbid.shadowsocksr.' + sid + '.server_port').value = port; + document.getElementById('cbid.shadowsocksr.' + sid + '.password').value = password; if (param != undefined) { document.getElementById('cbid.shadowsocksr.' + sid + '.alias').value = decodeURI(param); } -- GitLab