From be9e52e3bc33e970de2b863cf8da07d5e06561eb Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 29 Dec 2019 09:43:17 +0800 Subject: [PATCH] luci-app-ssr-plus-Jo: move to service --- .../luasrc/controller/shadowsocksr.lua | 42 +++++++++---------- .../luasrc/view/shadowsocksr/check.htm | 2 +- .../luasrc/view/shadowsocksr/checkport.htm | 2 +- .../luasrc/view/shadowsocksr/ping.htm | 4 +- .../luasrc/view/shadowsocksr/refresh.htm | 2 +- .../luasrc/view/shadowsocksr/server_list.htm | 2 +- .../luasrc/view/shadowsocksr/status.htm | 2 +- .../luasrc/view/shadowsocksr/status2.htm | 2 +- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/controller/shadowsocksr.lua b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/controller/shadowsocksr.lua index f17a2e3883..cb31ef0dc7 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/controller/shadowsocksr.lua +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/controller/shadowsocksr.lua @@ -7,37 +7,37 @@ function index() return end if nixio.fs.access("/usr/bin/ssr-redir") then - entry({"admin", "vpn", "shadowsocksr"},alias("admin", "vpn", "shadowsocksr", "client"), _("ShadowSocksR Plus+"),10).dependent = true - entry({"admin", "vpn", "shadowsocksr", "client"},cbi("shadowsocksr/client"),_("SSR Client"),10).leaf = true - entry({"admin", "vpn", "shadowsocksr", "servers"}, cbi("shadowsocksr/servers"), _("Severs Nodes"), 11).leaf = true - entry({"admin", "vpn", "shadowsocksr", "servers"},arcombine(cbi("shadowsocksr/servers"), cbi("shadowsocksr/client-config")),_("Severs Nodes"), 11).leaf = true + entry({"admin", "service", "shadowsocksr"},alias("admin", "service", "shadowsocksr", "client"), _("ShadowSocksR Plus+"),10).dependent = true + entry({"admin", "service", "shadowsocksr", "client"},cbi("shadowsocksr/client"),_("SSR Client"),10).leaf = true + entry({"admin", "service", "shadowsocksr", "servers"}, cbi("shadowsocksr/servers"), _("Severs Nodes"), 11).leaf = true + entry({"admin", "service", "shadowsocksr", "servers"},arcombine(cbi("shadowsocksr/servers"), cbi("shadowsocksr/client-config")),_("Severs Nodes"), 11).leaf = true - entry({"admin", "vpn", "shadowsocksr", "subscription"},cbi("shadowsocksr/subscription"), _("Subscription Managenent"),12).leaf = true - entry({"admin", "vpn", "shadowsocksr", "control"},cbi("shadowsocksr/control"),_("Access Control"),13).leaf = true + entry({"admin", "service", "shadowsocksr", "subscription"},cbi("shadowsocksr/subscription"), _("Subscription Managenent"),12).leaf = true + entry({"admin", "service", "shadowsocksr", "control"},cbi("shadowsocksr/control"),_("Access Control"),13).leaf = true - entry({"admin", "vpn", "shadowsocksr", "list"},cbi("shadowsocksr/list"),_("GFW List"),15).leaf = true -entry({"admin", "vpn", "shadowsocksr", "appointlist"},form("shadowsocksr/appointlist"),_("Appointlist List"), 17).leaf = true + entry({"admin", "service", "shadowsocksr", "list"},cbi("shadowsocksr/list"),_("GFW List"),15).leaf = true +entry({"admin", "service", "shadowsocksr", "appointlist"},form("shadowsocksr/appointlist"),_("Appointlist List"), 17).leaf = true - entry({"admin", "vpn", "shadowsocksr", "automatic"},cbi("shadowsocksr/automatic"), _("Automatic Switching"),20).leaf = true - entry({"admin", "vpn", "shadowsocksr", "advanced"},cbi("shadowsocksr/advanced"), _("Advanced Settings"),21).leaf = true + entry({"admin", "service", "shadowsocksr", "automatic"},cbi("shadowsocksr/automatic"), _("Automatic Switching"),20).leaf = true + entry({"admin", "service", "shadowsocksr", "advanced"},cbi("shadowsocksr/advanced"), _("Advanced Settings"),21).leaf = true elseif nixio.fs.access("/usr/bin/ssr-server") then - entry({"admin", "vpn", "shadowsocksr"},alias("admin", "vpn", "shadowsocksr", "server"), _("ShadowSocksR"),10).dependent = true + entry({"admin", "service", "shadowsocksr"},alias("admin", "service", "shadowsocksr", "server"), _("ShadowSocksR"),10).dependent = true else return end if nixio.fs.access("/usr/bin/ssr-server") then - entry({"admin", "vpn", "shadowsocksr", "server"},arcombine(cbi("shadowsocksr/server"), cbi("shadowsocksr/server-config")),_("SSR Server"),22).leaf = true + entry({"admin", "service", "shadowsocksr", "server"},arcombine(cbi("shadowsocksr/server"), cbi("shadowsocksr/server-config")),_("SSR Server"),22).leaf = true end - entry({"admin", "vpn", "shadowsocksr", "status"},form("shadowsocksr/status"),_("Status"), 23).leaf = true - entry({"admin", "vpn", "shadowsocksr", "log"}, cbi("shadowsocksr/log"), _("Log"), 30).leaf = true + entry({"admin", "service", "shadowsocksr", "status"},form("shadowsocksr/status"),_("Status"), 23).leaf = true + entry({"admin", "service", "shadowsocksr", "log"}, cbi("shadowsocksr/log"), _("Log"), 30).leaf = true - entry({"admin", "vpn", "shadowsocksr", "refresh"}, call("refresh_data")) - entry({"admin", "vpn", "shadowsocksr", "checkport"}, call("check_port")) - entry({"admin", "vpn", "shadowsocksr", "checkports"}, call("check_ports")) - entry({"admin", "vpn", "shadowsocksr", "run"}, call("act_status")) - entry({"admin", "vpn", "shadowsocksr", "change"}, call("change_node")) - entry({"admin", "vpn", "shadowsocksr", "allserver"}, call("get_servers")) - entry({"admin", "vpn", "shadowsocksr", "ping"}, call("act_ping")).leaf=true + entry({"admin", "service", "shadowsocksr", "refresh"}, call("refresh_data")) + entry({"admin", "service", "shadowsocksr", "checkport"}, call("check_port")) + entry({"admin", "service", "shadowsocksr", "checkports"}, call("check_ports")) + entry({"admin", "service", "shadowsocksr", "run"}, call("act_status")) + entry({"admin", "service", "shadowsocksr", "change"}, call("change_node")) + entry({"admin", "service", "shadowsocksr", "allserver"}, call("get_servers")) + entry({"admin", "service", "shadowsocksr", "ping"}, call("act_ping")).leaf=true end diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/check.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/check.htm index e747afa1fd..ca749d6963 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/check.htm +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/check.htm @@ -6,7 +6,7 @@ btn.disabled = true; btn.value = '<%:Check...%>'; murl=urlname; - XHR.get('<%=luci.dispatcher.build_url("admin", "vpn", "shadowsocksr","check")%>', + XHR.get('<%=luci.dispatcher.build_url("admin", "service", "shadowsocksr","check")%>', { set:murl }, function(x,rv) { diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/checkport.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/checkport.htm index 1db2c79c74..3cd1a4d1ae 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/checkport.htm +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/checkport.htm @@ -5,7 +5,7 @@ { btn.disabled = true; btn.value = '<%:Check...%>'; - XHR.get('<%=luci.dispatcher.build_url("admin", "vpn", "shadowsocksr","checkports")%>', + XHR.get('<%=luci.dispatcher.build_url("admin", "service", "shadowsocksr","checkports")%>', null, function(x,rv) { diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/ping.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/ping.htm index 370d4f6e79..a567f52206 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/ping.htm +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/ping.htm @@ -7,7 +7,7 @@ //"+result.ping+" ms" : " 检测失败 "); } ); - XHR.poll(10,'/cgi-bin/luci/admin/vpn/shadowsocksr/ping',{ + XHR.poll(10,'/cgi-bin/luci/admin/service/shadowsocksr/ping',{ index: i, domain: pings[i].getAttribute("hint") }, diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/refresh.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/refresh.htm index 7e260023d6..d048d40531 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/refresh.htm +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/refresh.htm @@ -7,7 +7,7 @@ btn.disabled = true; btn.value = '<%:Refresh...%> '; murl=dataname; - XHR.get('<%=luci.dispatcher.build_url("admin", "vpn", "shadowsocksr","refresh")%>', + XHR.get('<%=luci.dispatcher.build_url("admin", "service", "shadowsocksr","refresh")%>', { set:murl }, function(x,rv) { diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/server_list.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/server_list.htm index a5a4d9cb09..18b699de41 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/server_list.htm +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/server_list.htm @@ -11,7 +11,7 @@ local dsp = require "luci.dispatcher" //', { + XHR.get('<%=dsp.build_url("admin/service/shadowsocksr/ping")%>', { index: i, domain: pings[i].getAttribute("hint") }, diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm index e5b8a9b4e6..f25cb30987 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm @@ -172,7 +172,7 @@