zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-passwall2: sync upstream

Browse Source
This commit is contained in:
actions 2024-01-18 01:30:10 +08:00
parent 0ee0cd682e
commit 062730bfde
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall2/Makefile
View File

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2 PKG_NAME:=luci-app-passwall2
PKG_VERSION:=1.23-3 PKG_VERSION:=1.24-1
PKG_RELEASE:= PKG_RELEASE:=
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \

2
luci-app-passwall2/luasrc/passwall2/util_sing-box.lua
View File

@ -1412,7 +1412,7 @@ function gen_config(var)
outbound = "dns-out" outbound = "dns-out"
}) })
local content = flag .. node_id .. jsonc.stringify(dns) local content = flag .. node_id .. jsonc.stringify(route.rules)
if api.cacheFileCompareToLogic(CACHE_TEXT_FILE, content) == false then if api.cacheFileCompareToLogic(CACHE_TEXT_FILE, content) == false then
--clear ipset/nftset --clear ipset/nftset
if direct_ipset then if direct_ipset then

2
luci-app-passwall2/luasrc/passwall2/util_xray.lua
View File

@ -1271,7 +1271,7 @@ function gen_config(var)
dns.hosts = nil dns.hosts = nil
end end
local content = flag .. node_id .. jsonc.stringify(dns) local content = flag .. node_id .. jsonc.stringify(routing.rules)
if api.cacheFileCompareToLogic(CACHE_TEXT_FILE, content) == false then if api.cacheFileCompareToLogic(CACHE_TEXT_FILE, content) == false then
--clear ipset/nftset --clear ipset/nftset
if direct_ipset then if direct_ipset then

4
luci-app-passwall2/luasrc/view/passwall2/global/status.htm
View File

@ -91,7 +91,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
</div> </div>
</div> </div>
<div class="pure-u-2-3"> <div class="pure-u-2-3">
<h4 id="status_node">Xray<br /><span class="red"><%:NOT RUNNING%></span></h4> <h4 id="status_node">Core<br /><span class="red"><%:NOT RUNNING%></span></h4>
</div> </div>
</div> </div>
</div> </div>
@ -145,7 +145,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
if (true) { if (true) {
var status_node = document.getElementById('status_node'); var status_node = document.getElementById('status_node');
if (status_node) { if (status_node) {
var text = 'Xray<br />'; var text = 'Core<br />';
if (data["global_status"]) if (data["global_status"])
text += '<span class="green"><%:RUNNING%></span>'; text += '<span class="green"><%:RUNNING%></span>';
else else

10
luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm
View File

@ -48,9 +48,8 @@ local api = require "luci.passwall2.api"
function add_node() { function add_node() {
var nodes_link = document.getElementById("nodes_link").value; var nodes_link = document.getElementById("nodes_link").value;
if (nodes_link.trim() != "") { if (nodes_link.trim() != "") {
var supports = "ss ssr vmess vless trojan hysteria"; var s = nodes_link.split('://');
var itype = nodes_link.split('://')[0]; if (s.length > 1) {
if (itype.trim() != "" && supports.indexOf(itype) >= 0) {
ajax_add_node(nodes_link); ajax_add_node(nodes_link);
} }
else { else {
@ -81,9 +80,10 @@ local api = require "luci.passwall2.api"
<div id="add_link_div"> <div id="add_link_div">
<div class="cbi-value"> <div class="cbi-value">
<label class="cbi-value-title"><%:SS/SSR/Vmess/VLESS/Trojan/Hysteria Link%></label> <label class="cbi-value-title"><%:Share Link%></label>
<div class="cbi-value-field"> <div class="cbi-value-field">
<textarea id="nodes_link" rows="5" cols="50"></textarea> <p><textarea id="nodes_link" rows="5" cols="50"></textarea></p>
<font color="red"><%:Not a subscription link!!!%></font>
</div> </div>
</div> </div>
<div class="cbi-value"> <div class="cbi-value">

7
luci-app-passwall2/po/zh-cn/passwall2.po
View File

@ -256,8 +256,11 @@ msgstr "添加节点"
msgid "Add the node via the link" msgid "Add the node via the link"
msgstr "通过链接添加节点" msgstr "通过链接添加节点"
msgid "SS/SSR/Vmess/VLESS/Trojan/Hysteria Link" msgid "Share Link"
msgstr "SS/SSR/Vmess/VLESS/Trojan/Hysteria 链接" msgstr "分享链接"
msgid "Not a subscription link!!!"
msgstr "不是订阅链接！！！"
msgid "Please enter the correct link." msgid "Please enter the correct link."
msgstr "请输入正确的链接。" msgstr "请输入正确的链接。"