From a99a8179b4bcc888d886ba6b9ee7bce65c96ea9c Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Wed, 9 Oct 2019 01:18:42 -0700 Subject: [PATCH] luci-ssr-plus: add ss/v2ray URI import support --- package/lean/luci-app-ssr-plus/Makefile | 2 +- .../model/cbi/shadowsocksr/client-config.lua | 3 +- .../luasrc/view/shadowsocksr/ssrurl.htm | 341 +++++++++++------- 3 files changed, 204 insertions(+), 142 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index ce45a7949..77dc14cce 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=1 -PKG_RELEASE:=101 +PKG_RELEASE:=102 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua index bf64611a1..f6862054a 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -115,11 +115,10 @@ s = m:section(NamedSection, sid, "servers") s.anonymous = true s.addremove = false -o = s:option(DummyValue,"ssr_url","SSR URL") +o = s:option(DummyValue,"ssr_url","SS/SSR/V2RAY URL") o.rawhtml = true o.template = "shadowsocksr/ssrurl" o.value =sid -o:depends("type", "ssr") o = s:option(ListValue, "type", translate("Server Node Type")) o:value("ssr", translate("ShadowsocksR")) 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 6bcc8bbc7..d1c74eb60 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 @@ -1,139 +1,202 @@ -<%+cbi/valueheader%> - - - - - -<%:ssr://%> - -<%+cbi/valuefooter%> +<%+cbi/valueheader%> + + + + + + +<%+cbi/valuefooter%>