diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile index cea24fad..51f3eb34 100644 --- a/luci-app-amlogic/Makefile +++ b/luci-app-amlogic/Makefile @@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-amlogic -PKG_VERSION:=3.1.194 +PKG_VERSION:=3.1.195 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 License diff --git a/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_backup.lua b/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_backup.lua index 7b0819fa..d523811e 100644 --- a/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_backup.lua +++ b/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_backup.lua @@ -35,7 +35,7 @@ my.template = "amlogic/other_button" my.render = function(self, section, scope) self.section = true scope.display = "" - self.inputtitle = translate("Open the List") + self.inputtitle = translate("Open List") self.inputstyle = "save" Button.render(self, section, scope) end diff --git a/luci-app-amlogic/po/zh-cn/amlogic.po b/luci-app-amlogic/po/zh-cn/amlogic.po index 27aacb9c..79970290 100644 --- a/luci-app-amlogic/po/zh-cn/amlogic.po +++ b/luci-app-amlogic/po/zh-cn/amlogic.po @@ -248,7 +248,7 @@ msgstr "备份当前 OpenWrt 的相关配置信息(openwrt_config.tar.gz)。使 msgid "Edit List:" msgstr "编辑列表:" -msgid "Open the List" +msgid "Open List" msgstr "打开列表" msgid "Backup Configuration - Custom List" diff --git a/luci-app-openclash/Makefile b/luci-app-openclash/Makefile index d43f6e09..2f3edc18 100644 --- a/luci-app-openclash/Makefile +++ b/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.45.128 +PKG_VERSION:=0.45.129 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong diff --git a/luci-app-openclash/luasrc/view/openclash/tblsection.htm b/luci-app-openclash/luasrc/view/openclash/tblsection.htm index 0b0360ec..6ef77ca7 100644 --- a/luci-app-openclash/luasrc/view/openclash/tblsection.htm +++ b/luci-app-openclash/luasrc/view/openclash/tblsection.htm @@ -236,15 +236,15 @@ local sectiontype = "_"..self.config.."_"..string.match(self.sectiontype, "[%w_] -%> <%- if self.sortable then -%> - - + + <%- end -%> <%- if self.extedit or self.addremove then -%> <%- if self.extedit then -%> - onclick="location.href='<%=self.extedit:format(section)%>';return switch_to_tab<%=sectiontype%>()" <%- elseif type(self.extedit) == "function" then @@ -252,7 +252,7 @@ local sectiontype = "_"..self.config.."_"..string.match(self.sectiontype, "[%w_] <%- end %> alt="<%:Edit%>" title="<%:Edit%>" /> <%- end; if self.addremove then %> - + <%- end -%> <%- end -%> @@ -282,11 +282,11 @@ local sectiontype = "_"..self.config.."_"..string.match(self.sectiontype, "[%w_] <% if self.template_addremove then include(self.template_addremove) else -%>
<% if self.anonymous then %> - + <% else %> <% if self.invalid_cts then -%>
<% end %> - + <% if self.invalid_cts then -%>
<%:Invalid%>
<%- end %> @@ -373,4 +373,4 @@ local sectiontype = "_"..self.config.."_"..string.match(self.sectiontype, "[%w_] }; }; //]]> - \ No newline at end of file + diff --git a/luci-app-openclash/luasrc/view/openclash/tblsection_dns.htm b/luci-app-openclash/luasrc/view/openclash/tblsection_dns.htm index ad15bbff..6e0b6412 100644 --- a/luci-app-openclash/luasrc/view/openclash/tblsection_dns.htm +++ b/luci-app-openclash/luasrc/view/openclash/tblsection_dns.htm @@ -181,15 +181,15 @@ local sectiontype = "_"..self.config.."_"..string.match(self.sectiontype, "[%w_] -%> <%- if self.sortable then -%> - - + + <%- end -%> <%- if self.extedit or self.addremove then -%> <%- if self.extedit then -%> - onclick="location.href='<%=self.extedit:format(section)%>';return switch_to_tab<%=sectiontype%>()" <%- elseif type(self.extedit) == "function" then @@ -197,7 +197,7 @@ local sectiontype = "_"..self.config.."_"..string.match(self.sectiontype, "[%w_] <%- end %> alt="<%:Edit%>" title="<%:Edit%>" /> <%- end; if self.addremove then %> - + <%- end -%> <%- end -%> @@ -227,11 +227,11 @@ local sectiontype = "_"..self.config.."_"..string.match(self.sectiontype, "[%w_] <% if self.template_addremove then include(self.template_addremove) else -%>
<% if self.anonymous then %> - + <% else %> <% if self.invalid_cts then -%>
<% end %> - + <% if self.invalid_cts then -%>
<%:Invalid%>
<%- end %> @@ -318,4 +318,4 @@ local sectiontype = "_"..self.config.."_"..string.match(self.sectiontype, "[%w_] }; }; //]]> - \ No newline at end of file + diff --git a/luci-app-openclash/root/etc/init.d/openclash b/luci-app-openclash/root/etc/init.d/openclash index dc205f3a..c9454549 100644 --- a/luci-app-openclash/root/etc/init.d/openclash +++ b/luci-app-openclash/root/etc/init.d/openclash @@ -1515,11 +1515,12 @@ if [ -n "$FW4" ]; then fi fi + DNSPORT=$(uci -q get dhcp.@dnsmasq[0].port) + if [ -z "$DNSPORT" ]; then + DNSPORT=$(netstat -nlp |grep -E '127.0.0.1:.*dnsmasq' |awk -F '127.0.0.1:' '{print $2}' |awk '{print $1}' |head -1 || echo 53) + fi + if [ "$enable_redirect_dns" -eq 1 ]; then - DNSPORT=$(uci -q get dhcp.@dnsmasq[0].port) - if [ -z "$DNSPORT" ]; then - DNSPORT=$(netstat -nlp |grep -E '127.0.0.1:.*dnsmasq' |awk -F '127.0.0.1:' '{print $2}' |awk '{print $1}' |head -1 || echo 53) - fi if [ -z "$(nft list chain inet fw4 dstnat |grep 'OpenClash DNS Hijack')" ]; then if [ "$lan_ac_mode" != "1" ]; then ACBLACKDNSFILTER="" @@ -1568,6 +1569,7 @@ if [ -n "$FW4" ]; then nft insert rule inet fw4 nat_output position 0 udp dport 53 ip daddr {127.0.0.1} meta skuid != 65534 counter redirect to "$dns_port" comment \"OpenClash DNS Hijack\" fi fi + if [ "$en_mode" = "fake-ip" ] && [ "$china_ip_route" = "1" ] && [ "$enable_redirect_dns" != "2" ]; then LOG_OUT "Tip: Bypass the China IP May Cause the Dnsmasq Load For a Long Time After Restart in FAKE-IP Mode, Hijack the DNS to Core Untill the Dnsmasq Works Well..." nft insert rule inet fw4 dstnat position 0 tcp dport 53 counter redirect to "$dns_port" comment \"OpenClash DNS Hijack\" @@ -2288,11 +2290,12 @@ if [ -z "$FW4" ]; then fi fi + DNSPORT=$(uci -q get dhcp.@dnsmasq[0].port) + if [ -z "$DNSPORT" ]; then + DNSPORT=$(netstat -nlp |grep -E '127.0.0.1:.*dnsmasq' |awk -F '127.0.0.1:' '{print $2}' |awk '{print $1}' |head -1 || echo 53) + fi + if [ "$enable_redirect_dns" -eq 1 ]; then - DNSPORT=$(uci -q get dhcp.@dnsmasq[0].port) - if [ -z "$DNSPORT" ]; then - DNSPORT=$(netstat -nlp |grep -E '127.0.0.1:.*dnsmasq' |awk -F '127.0.0.1:' '{print $2}' |awk '{print $1}' |head -1 || echo 53) - fi if [ -z "$(iptables -t nat -nL PREROUTING --line-number |grep 'OpenClash DNS Hijack')" ]; then if [ "$lan_ac_mode" != "1" ]; then ACBLACKDNSFILTER="" @@ -2341,6 +2344,7 @@ if [ -z "$FW4" ]; then iptables -t nat -I OUTPUT -p tcp --dport 53 -d 127.0.0.1 -m owner ! --uid-owner 65534 -j REDIRECT --to-ports "$dns_port" -m comment --comment "OpenClash DNS Hijack" fi fi + if [ "$en_mode" = "fake-ip" ] && [ "$china_ip_route" = "1" ] && [ "$enable_redirect_dns" != "2" ]; then LOG_OUT "Tip: Bypass the China IP May Cause the Dnsmasq Load For a Long Time After Restart in FAKE-IP Mode, Hijack the DNS to Core Untill the Dnsmasq Works Well..." iptables -t nat -I PREROUTING -p udp --dport 53 -j REDIRECT --to-ports "$dns_port" -m comment --comment "OpenClash DNS Hijack" diff --git a/luci-app-openclash/root/usr/share/openclash/res/game_rules.list b/luci-app-openclash/root/usr/share/openclash/res/game_rules.list index c1f3c4ac..7ef78a73 100644 --- a/luci-app-openclash/root/usr/share/openclash/res/game_rules.list +++ b/luci-app-openclash/root/usr/share/openclash/res/game_rules.list @@ -44,6 +44,7 @@ DayZ-steam,DayZ.rules 暗黑破坏神2:重制版-亚服,Diablo-2-Resurrected.rules 暗黑破坏神3-亚服,Diablo3-Asia.rules 暗黑破坏神3-美服,Diablo3-US.rules +暗黑破坏神4-亚服,DiabloIV-HK.rules 脏弹-Steam,Dirty-Bomb.rules Discord,Discord-All.rules 饥荒-steam,Don't-Starve-steam.rules,Dont-Starve-steam.rules diff --git a/luci-app-openclash/root/usr/share/openclash/res/rule_providers.list b/luci-app-openclash/root/usr/share/openclash/res/rule_providers.list index b68b0415..64e39a26 100644 --- a/luci-app-openclash/root/usr/share/openclash/res/rule_providers.list +++ b/luci-app-openclash/root/usr/share/openclash/res/rule_providers.list @@ -2,7 +2,7 @@ 放行规则-lhie1(建议置顶并直连),lhie1,classical,dler-io/Rules/master/Clash/Provider/,Special.yaml 放行规则-ACL4SSR(建议置顶并直连),ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/,UnBan.yaml 反劫持规则,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Guard/,Hijacking.yaml -国内IP白名单(By lhie1),lhie1,ipcidr,dler-io/Rules/master/Clash/Provider/,Domestic%20IPs.yaml,Domestic IPs.yaml +国内IP白名单(By lhie1),lhie1,ipcidr,dler-io/Rules/master/Clash/Provider/,Domestic IPs.yaml 国内IP白名单,ConnersHua,ipcidr,DivineEngine/Profiles/master/Clash/RuleSet/Extra/,ChinaIP.yaml 国内域名白名单(By lhie1),lhie1,classical,dler-io/Rules/master/Clash/Provider/,Domestic.yaml 国内域名白名单,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/,China.yaml @@ -18,7 +18,7 @@ 数字货币相关,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/,Cryptocurrency.yaml 隐私规则合集,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Guard/,Privacy.yaml ABC,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,ABC.yaml -Abema TV,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Abema%20TV.yaml,Abema TV.yaml +Abema TV,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Abema TV.yaml AbemaTV(By ACL4SSR),ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,AbemaTV.yaml,AbemaTV-ACL4SSR.yaml AbemaTV,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,AbemaTV.yaml Adobe,ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,Adobe.yaml @@ -30,10 +30,10 @@ AppStore,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/A AppStoreConnect,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Apple/,AppStoreConnect.yaml Apple FindMy,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Apple/,FindMy.yaml Apple Music,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Apple/,Music.yaml -Apple News(By lhie1),lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Apple%20News.yaml,Apple News.yaml +Apple News(By lhie1),lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Apple News.yaml Apple News,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Apple/,News.yaml Apple SoftwareUpdate,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Apple/,SoftwareUpdate.yaml -Apple TV(By lhie1),lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Apple%20TV.yaml,Apple TV.yaml +Apple TV(By lhie1),lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Apple TV.yaml Apple TV,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Apple/,TV.yaml Apple TestFlight,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Apple/,TestFlight.yaml Apple iCloud,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Apple/,iCloud.yaml @@ -68,14 +68,14 @@ Deezer,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Streaming Developer,ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,Developer.yaml Discord,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Game/,Discord.yaml DiscoveryPlus,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,DiscoveryPlus.yaml -Disney Plus,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Disney%20Plus.yaml,Disney Plus.yaml +Disney Plus,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Disney Plus.yaml DisneyPlus(By ACL4SSR),ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,DisneyPlus.yaml,DisneyPlus-ACL4SSR.yaml DisneyPlus,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,DisneyPlus.yaml Download,ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/,Download.yaml EHGallery,ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,EHGallery.yaml Epic,ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,Epic.yaml FOX,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,FOX.yaml -Fox Now,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Fox%20Now.yaml,Fox Now.yaml +Fox Now,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Fox Now.yaml Fox+,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Fox+.yaml GFW地址,ConnersHua,ipcidr,DivineEngine/Profiles/master/Clash/RuleSet/Extra/,IP-Blackhole.yaml Google,ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,Google.yaml @@ -106,13 +106,13 @@ KKTV,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMe LINE-TV,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,LINE-TV.yaml Letv,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Letv.yaml LiTV,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,LiTV.yaml -Line TV,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Line%20TV.yaml,Line TV.yaml +Line TV,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Line TV.yaml LocalAreaNetwork,ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/,LocalAreaNetwork.yaml MOO,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,MOO.yaml Microsoft(By ACL4SSR),ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,Microsoft.yaml,Microsoft-ACL4SSR.yaml My5,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,My5.yaml NetEaseMusic,ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,NetEaseMusic.yaml -Netease Music,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Netease%20Music.yaml,Netease Music.yaml +Netease Music,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Netease Music.yaml Netflix(By ACL4SSR),ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,Netflix.yaml,Netflix-ACL4SSR.yaml Netflix(By lhie1),lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Netflix.yaml,Netflix-lhie1.yaml Netflix,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,Netflix.yaml @@ -156,14 +156,14 @@ Telegram,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/T TelegramNL,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Telegram/,TelegramNL.yaml TelegramSG,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Telegram/,TelegramSG.yaml TelegramUS,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Telegram/,TelegramUS.yaml -Tencent Video,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Tencent%20Video.yaml,Tencent Video.yaml +Tencent Video,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,Tencent Video.yaml TikTok,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,TikTok.yaml Twitch,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Live/,Twitch.yaml ViuTV(By lhie1),lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,ViuTV.yaml,ViuTV-lhie1.yaml ViuTV,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,ViuTV.yaml WeTV,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,WeTV.yaml Xbox,ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,Xbox.yaml -YouTube Music,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,YouTube%20Music.yaml,YouTube Music.yaml +YouTube Music,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,YouTube Music.yaml YouTube(By ACL4SSR),ACL4SSR,classical,ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/,YouTube.yaml,YouTube-ACL4SSR.yaml YouTube(By lhie1),lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,YouTube.yaml,YouTube-lhie1.yaml YouTube,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,YouTube.yaml @@ -175,6 +175,6 @@ iCloud-email,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Ext iQIYI,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,iQIYI.yaml IQIYI,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,IQIYI.yaml IQ,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,IQ.yaml -myTV SUPER,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,myTV%20SUPER.yaml,myTV SUPER.yaml +myTV SUPER,lhie1,classical,dler-io/Rules/master/Clash/Provider/Media/,myTV SUPER.yaml myTV-SUPER,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,myTV-SUPER.yaml niconico,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,niconico.yaml \ No newline at end of file