2022-08-21 14:57:58 +00:00
|
|
|
diff --git a/package/other/helloworld/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/package/other/helloworld/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
|
|
|
|
index 50ee568..6d44871 100644
|
2022-01-14 12:31:43 +00:00
|
|
|
--- a/package/other/helloworld/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
|
|
|
|
+++ b/package/other/helloworld/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
|
2022-08-21 14:57:58 +00:00
|
|
|
@@ -319,6 +319,13 @@ o = s:option(Value, "obfs_param", translate("Obfs param (optional)"))
|
2022-01-05 12:38:11 +00:00
|
|
|
o:depends("type", "ssr")
|
2022-08-21 14:57:58 +00:00
|
|
|
o:depends({type = "v2ray", v2ray_protocol = "shadowsocksr"})
|
2022-01-05 12:38:11 +00:00
|
|
|
|
|
|
|
+-- AlterId
|
|
|
|
+o = s:option(Value, "alter_id", translate("AlterId"))
|
|
|
|
+o.datatype = "port"
|
|
|
|
+o.default = 16
|
|
|
|
+o.rmempty = true
|
|
|
|
+o:depends({type = "v2ray", v2ray_protocol = "vmess"})
|
|
|
|
+
|
2022-08-21 14:57:58 +00:00
|
|
|
-- [[ Hysteria ]]--
|
|
|
|
o = s:option(ListValue, "hysteria_protocol", translate("Protocol"))
|
|
|
|
o:depends("type", "hysteria")
|
|
|
|
diff --git a/package/other/helloworld/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm b/package/other/helloworld/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm
|
|
|
|
index cab2690..95d2ff1 100644
|
2022-01-14 12:31:43 +00:00
|
|
|
--- a/package/other/helloworld/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm
|
|
|
|
+++ b/package/other/helloworld/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm
|
2022-08-21 14:57:58 +00:00
|
|
|
@@ -244,6 +244,7 @@ function import_ssr_url(btn, urlname, sid) {
|
|
|
|
}
|
|
|
|
document.getElementsByName('cbid.shadowsocksr.' + sid + '.server')[0].value = serverPart[0];
|
|
|
|
document.getElementsByName('cbid.shadowsocksr.' + sid + '.server_port')[0].value = port || '443';
|
2022-01-05 12:38:11 +00:00
|
|
|
+ document.getElementsByName('cbid.shadowsocksr.' + sid + '.alter_id')[0].value = ssm.aid;
|
2022-08-21 14:57:58 +00:00
|
|
|
document.getElementsByName('cbid.shadowsocksr.' + sid + '.password')[0].value = password;
|
|
|
|
document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls')[0].checked = true;
|
|
|
|
document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls')[0].dispatchEvent(event);
|
|
|
|
diff --git a/package/other/helloworld/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/package/other/helloworld/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
|
|
|
|
index 45f710a..32d3f3f 100755
|
2022-01-14 12:31:43 +00:00
|
|
|
--- a/package/other/helloworld/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
|
|
|
|
+++ b/package/other/helloworld/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
|
2022-08-21 14:57:58 +00:00
|
|
|
@@ -20,6 +20,7 @@ function vmess_vless()
|
2022-01-05 12:38:11 +00:00
|
|
|
users = {
|
|
|
|
{
|
|
|
|
id = server.vmess_id,
|
|
|
|
+ alterId = (server.v2ray_protocol == "vmess" or not server.v2ray_protocol) and tonumber(server.alter_id) or nil,
|
|
|
|
security = (server.v2ray_protocol == "vmess" or not server.v2ray_protocol) and server.security or nil,
|
|
|
|
encryption = (server.v2ray_protocol == "vless") and server.vless_encryption or nil,
|
|
|
|
flow = (server.xtls == '1') and (server.vless_flow and server.vless_flow or "xtls-rprx-splice") or nil
|
2022-08-21 14:57:58 +00:00
|
|
|
diff --git a/package/other/helloworld/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/package/other/helloworld/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
|
|
|
|
index 66219c3..8b62d38 100755
|
2022-01-14 12:31:43 +00:00
|
|
|
--- a/package/other/helloworld/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
|
|
|
|
+++ b/package/other/helloworld/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
|
2022-08-21 14:57:58 +00:00
|
|
|
@@ -176,6 +176,7 @@ local function processData(szType, content)
|
2022-01-05 12:38:11 +00:00
|
|
|
result.server = info.add
|
|
|
|
result.server_port = info.port
|
|
|
|
result.transport = info.net
|
|
|
|
+ result.alter_id = info.aid
|
|
|
|
result.vmess_id = info.id
|
|
|
|
result.alias = info.ps
|
2022-08-21 14:57:58 +00:00
|
|
|
result.packet_encoding = packet_encoding
|