refresh patch

This commit is contained in:
actions 2024-04-25 09:52:03 +08:00
parent fa866c44e7
commit fe1bcd047b

View File

@ -1,5 +1,5 @@
diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile
index dbed859..8f22869 100644 index f9922d6..016804a 100644
--- a/luci-app-passwall/Makefile --- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile
@@ -171,7 +171,6 @@ define Package/$(PKG_NAME)/conffiles @@ -171,7 +171,6 @@ define Package/$(PKG_NAME)/conffiles
@ -60,7 +60,7 @@ index 8a59a43..9d47562 100644
-- [[ App Settings ]]-- -- [[ App Settings ]]--
s = m:section(TypedSection, "global_app", translate("App Update"), s = m:section(TypedSection, "global_app", translate("App Update"),
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
index 9923b8c..a57de31 100644 index 7f26ed7..ba3d2c0 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
@@ -9,7 +9,6 @@ local has_chnlist = api.fs.access("/usr/share/passwall/rules/chnlist") @@ -9,7 +9,6 @@ local has_chnlist = api.fs.access("/usr/share/passwall/rules/chnlist")
@ -71,7 +71,7 @@ index 9923b8c..a57de31 100644
local nodes_table = {} local nodes_table = {}
for k, e in ipairs(api.get_valid_nodes()) do for k, e in ipairs(api.get_valid_nodes()) do
@@ -330,6 +329,12 @@ o:value("8.8.8.8", "8.8.8.8 (Google)") @@ -326,6 +325,12 @@ o:value("8.8.8.8", "8.8.8.8 (Google)")
o:value("9.9.9.9", "9.9.9.9 (Quad9-Recommended)") o:value("9.9.9.9", "9.9.9.9 (Quad9-Recommended)")
o:value("208.67.220.220", "208.67.220.220 (OpenDNS)") o:value("208.67.220.220", "208.67.220.220 (OpenDNS)")
o:value("208.67.222.222", "208.67.222.222 (OpenDNS)") o:value("208.67.222.222", "208.67.222.222 (OpenDNS)")
@ -82,7 +82,7 @@ index 9923b8c..a57de31 100644
+ end + end
+end +end
o:depends({dns_mode = "dns2socks"}) o:depends({dns_mode = "dns2socks"})
o:depends({dns_mode = "dns2tcp"}) o:depends({dns_mode = "tcp"})
o:depends({dns_mode = "udp"}) o:depends({dns_mode = "udp"})
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua
index 5228baa..c3bc5fa 100644 index 5228baa..c3bc5fa 100644
@ -403,7 +403,7 @@ index 24662de..77b6a0b 100644
</div> </div>
</div> </div>
diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config
index b9ad81e..2dcafa3 100644 index 67db6af..0a63147 100644
--- a/luci-app-passwall/root/usr/share/passwall/0_default_config --- a/luci-app-passwall/root/usr/share/passwall/0_default_config
+++ b/luci-app-passwall/root/usr/share/passwall/0_default_config +++ b/luci-app-passwall/root/usr/share/passwall/0_default_config
@@ -32,7 +32,7 @@ config global_haproxy @@ -32,7 +32,7 @@ config global_haproxy
@ -416,10 +416,10 @@ index b9ad81e..2dcafa3 100644
config global_forwarding config global_forwarding
option tcp_no_redir_ports 'disable' option tcp_no_redir_ports 'disable'
diff --git a/luci-app-passwall/root/usr/share/passwall/rules/direct_host b/luci-app-passwall/root/usr/share/passwall/rules/direct_host diff --git a/luci-app-passwall/root/usr/share/passwall/rules/direct_host b/luci-app-passwall/root/usr/share/passwall/rules/direct_host
index bc16864..b4165b8 100644 index a3b1464..ab18acc 100644
--- a/luci-app-passwall/root/usr/share/passwall/rules/direct_host --- a/luci-app-passwall/root/usr/share/passwall/rules/direct_host
+++ b/luci-app-passwall/root/usr/share/passwall/rules/direct_host +++ b/luci-app-passwall/root/usr/share/passwall/rules/direct_host
@@ -3,8 +3,12 @@ microsoft.com @@ -4,8 +4,12 @@ microsoft.com
dyndns.com dyndns.com
douyucdn.cn douyucdn.cn
douyucdn2.cn douyucdn2.cn
@ -432,7 +432,7 @@ index bc16864..b4165b8 100644
#steam #steam
steamcontent.com steamcontent.com
dl.steam.clngaa.com dl.steam.clngaa.com
@@ -18,6 +22,15 @@ cdn-qc.content.steamchina.com @@ -19,6 +23,15 @@ cdn-qc.content.steamchina.com
cdn-ali.content.steamchina.com cdn-ali.content.steamchina.com
epicgames-download1-1251447533.file.myqcloud.com epicgames-download1-1251447533.file.myqcloud.com