From 34e2d6ee013375cbf5d8752e717490ca59866baf Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 29 Feb 2020 19:17:48 +0800 Subject: [PATCH] luci-app-vssr: sync with upstream source --- package/ctcgfw/luci-app-vssr/Makefile | 4 +- .../luasrc/model/cbi/vssr/server.lua | 2 +- .../luasrc/model/cbi/vssr/status.lua | 2 +- .../luasrc/view/vssr/status3.htm | 17 +-- .../root/usr/share/vssr/subscribe.lua | 116 ++++++++++++------ 5 files changed, 89 insertions(+), 52 deletions(-) diff --git a/package/ctcgfw/luci-app-vssr/Makefile b/package/ctcgfw/luci-app-vssr/Makefile index c24c47733f..fd11342c2c 100644 --- a/package/ctcgfw/luci-app-vssr/Makefile +++ b/package/ctcgfw/luci-app-vssr/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-vssr -PKG_VERSION:=1.14 -PKG_RELEASE:=20200228-4 +PKG_VERSION:=1.15 +PKG_RELEASE:=20200229-4 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/server.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/server.lua index cd851d720f..7bbbfabe50 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/server.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/server.lua @@ -6,7 +6,7 @@ local vssr = "vssr" local uci = luci.model.uci.cursor() local ipkg = require("luci.model.ipkg") -m = Map(vssr) +m = Map(vssr, translate("SS/SSR/V2RAY Server")) m:section(SimpleSection).template = "vssr/status3" local type = { "ssr", diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua index 3ca90cace3..bcf380415f 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua @@ -1,7 +1,7 @@ -- Copyright (C) 2017 yushi studio -- Licensed to the public under the GNU General Public License v3. -local IPK_Version="20200228.1.14" +local IPK_Version="20200229.1.15" local m, s, o local redir_run=0 local reudp_run=0 diff --git a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm index 2f1f0cfe02..cc64e38b82 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm +++ b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm @@ -1,7 +1,8 @@  -
- -

<%:SS/SSR/V2RAY Server%>

+
+ + <%:Running Status%> +