fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "luci-app-ssr-plus-Jo: move to service"

Browse Source 
This reverts commit be9e52e3bc.
This commit is contained in:
CN_SZTL 2019-12-30 17:28:13 +08:00
parent 3380b3461f
commit 303979475b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
9 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/ctcgfw/luci-app-ssr-plus-Jo/Makefile
View File

@ -13,7 +13,7 @@ PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Socks \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_dnscrypt_proxy \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Chinadns \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_haproxy \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_privoxy \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_simple-obfs\
@ -66,8 +66,8 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder
bool "dnsforwarder"
default n
config PACKAGE_$(PKG_NAME)_INCLUDE_Chinadns
bool "chiandns"
config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS
bool "chinadns"
default n
config PACKAGE_$(PKG_NAME)_INCLUDE_haproxy
@ -120,7 +120,7 @@ define Package/luci-app-ssr-plus-Jo
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Socks:shadowsocks-libev-ss-local \
+PACKAGE_$(PKG_NAME)_INCLUDE_dnscrypt_proxy:dnscrypt-proxy-full \
+PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder:dnsforwarder \
+PACKAGE_$(PKG_NAME)_INCLUDE_Chinadns:openwrt_chinadns \
+PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS:openwrt_chinadns \
+PACKAGE_$(PKG_NAME)_INCLUDE_haproxy:haproxy \
+PACKAGE_$(PKG_NAME)_INCLUDE_privoxy:privoxy \
+PACKAGE_$(PKG_NAME)_INCLUDE_simple-obfs:simple-obfs \

42
package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/controller/shadowsocksr.lua
View File

@ -7,37 +7,37 @@ function index()
return
end
if nixio.fs.access("/usr/bin/ssr-redir") then
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"},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", "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", "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", "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", "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", "automatic"},cbi("shadowsocksr/automatic"), _("Automatic Switching"),20).leaf = true
entry({"admin", "service", "shadowsocksr", "advanced"},cbi("shadowsocksr/advanced"), _("Advanced Settings"),21).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
elseif nixio.fs.access("/usr/bin/ssr-server") then
entry({"admin", "service", "shadowsocksr"},alias("admin", "service", "shadowsocksr", "server"), _("ShadowSocksR"),10).dependent = true
entry({"admin", "vpn", "shadowsocksr"},alias("admin", "vpn", "shadowsocksr", "server"), _("ShadowSocksR"),10).dependent = true
else
return
end
if nixio.fs.access("/usr/bin/ssr-server") then
entry({"admin", "service", "shadowsocksr", "server"},arcombine(cbi("shadowsocksr/server"), cbi("shadowsocksr/server-config")),_("SSR Server"),22).leaf = true
entry({"admin", "vpn", "shadowsocksr", "server"},arcombine(cbi("shadowsocksr/server"), cbi("shadowsocksr/server-config")),_("SSR Server"),22).leaf = true
end
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", "status"},form("shadowsocksr/status"),_("Status"), 23).leaf = true
entry({"admin", "vpn", "shadowsocksr", "log"}, cbi("shadowsocksr/log"), _("Log"), 30).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
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
end

2
package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/check.htm
View File

@ -6,7 +6,7 @@
btn.disabled = true;
btn.value = '<%:Check...%>';
murl=urlname;
XHR.get('<%=luci.dispatcher.build_url("admin", "service", "shadowsocksr","check")%>',
XHR.get('<%=luci.dispatcher.build_url("admin", "vpn", "shadowsocksr","check")%>',
{ set:murl },
function(x,rv)
{

2
package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/checkport.htm
View File

@ -5,7 +5,7 @@
{
btn.disabled = true;
btn.value = '<%:Check...%>';
XHR.get('<%=luci.dispatcher.build_url("admin", "service", "shadowsocksr","checkports")%>',
XHR.get('<%=luci.dispatcher.build_url("admin", "vpn", "shadowsocksr","checkports")%>',
null,
function(x,rv)
{

4
package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/ping.htm
View File

@ -7,7 +7,7 @@
//<![CDATA[
var pings = document.getElementsByClassName('pingtime');
for(var i = 0; i < pings.length; i++) {
XHR.get('/cgi-bin/luci/admin/service/shadowsocksr/ping', {
XHR.get('/cgi-bin/luci/admin/vpn/shadowsocksr/ping', {
index: i,
domain: pings[i].getAttribute("hint")
},
@ -15,7 +15,7 @@
pings[result.index].innerHTML = (result.ping ? "<b><font color=green>"+result.ping+"</font></b> ms" : "<b><font color=red> 检测失败 </font></b>");
}
);
XHR.poll(10,'/cgi-bin/luci/admin/service/shadowsocksr/ping',{
XHR.poll(10,'/cgi-bin/luci/admin/vpn/shadowsocksr/ping',{
index: i,
domain: pings[i].getAttribute("hint")
},

2
package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/refresh.htm
View File

@ -7,7 +7,7 @@
btn.disabled = true;
btn.value = '<%:Refresh...%> ';
murl=dataname;
XHR.get('<%=luci.dispatcher.build_url("admin", "service", "shadowsocksr","refresh")%>',
XHR.get('<%=luci.dispatcher.build_url("admin", "vpn", "shadowsocksr","refresh")%>',
{ set:murl },
function(x,rv)
{

2
package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/server_list.htm
View File

@ -11,7 +11,7 @@ local dsp = require "luci.dispatcher"
//<![CDATA[
var pings = document.getElementsByClassName('pingtime');
for(var i = 0; i < pings.length; i++) {
XHR.get('<%=dsp.build_url("admin/service/shadowsocksr/ping")%>', {
XHR.get('<%=dsp.build_url("admin/vpn/shadowsocksr/ping")%>', {
index: i,
domain: pings[i].getAttribute("hint")
},

2
package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm
View File

@ -172,7 +172,7 @@
</style>
<script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=url([[admin]], [[service]], [[shadowsocksr]], [[run]])%>', null,
XHR.poll(5, '<%=url([[admin]], [[vpn]], [[shadowsocksr]], [[run]])%>', null,
function (x, data) {
var tb = document.getElementById('shadowsocksr_status');
var tb1 = document.getElementById('google_status');

2
package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm
View File

@ -164,7 +164,7 @@
</div>
</style>
<script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=url([[admin]], [[service]], [[shadowsocksr]], [[run]])%>', null,
XHR.poll(5, '<%=url([[admin]], [[vpn]], [[shadowsocksr]], [[run]])%>', null,
function (x, data) {
var tb = document.getElementById('shadowsocksr_status');
var tb1 = document.getElementById('google_status');