update 2023-04-18 23:36:54

gn/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gn
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git
-PKG_SOURCE_DATE:=2023-02-17
-PKG_SOURCE_VERSION:=b25a2f8c2d33f02082f0f258350f5e22c0973108
+PKG_SOURCE_DATE:=2023-04-05
+PKG_SOURCE_VERSION:=28b7b6c507eb808567e3aea446cd259f7691fddc
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=BSD 3-Clause

gn/src/out/last_commit_position.h

@@ -3,7 +3,7 @@
 #ifndef OUT_LAST_COMMIT_POSITION_H_
 #define OUT_LAST_COMMIT_POSITION_H_
 
-#define LAST_COMMIT_POSITION_NUM 2081
-#define LAST_COMMIT_POSITION "2081 (b25a2f8c2d33)"
+#define LAST_COMMIT_POSITION_NUM 2085
+#define LAST_COMMIT_POSITION "2085 (28b7b6c507eb)"
 
 #endif  // OUT_LAST_COMMIT_POSITION_H_

luci-app-advanced/README.md

@@ -7,24 +7,38 @@ luci-app-advanced 高级设置，包括smartdns，openclash，防火墙，DHCP
 
 ![screenshots](https://raw.githubusercontent.com/sirpdboy/openwrt/master/doc/说明2.jpg)
 
+
+
+## 使用与授权相关说明
+ 
+- 本人开源的所有源码，任何引用需注明本处出处，如需修改二次发布必告之本人，未经许可不得做于任何商用用途。
+
+
 # My other project
 
-网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
+- 网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
 
-定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
+- 定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
 
-关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
+- 关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
 
-opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
+- opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
 
-opentoks 主题: https://github.com/sirpdboy/luci-theme-opentoks [仿KOOLSAHRE主题]
+- kucat 主题: https://github.com/sirpdboy/luci-theme-kucat
 
-btmob 主题: https://github.com/sirpdboy/luci-theme-btmob
+- 家长控制: https://github.com/sirpdboy/luci-theme-parentcontrol
 
-系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
+- 系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
 
-ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
+- ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
 
+- 进阶设置（系统高级设置+主题设置kucat/agron/opentopd）: https://github.com/sirpdboy/luci-app-advancedplus
+
+- 设置向导: https://github.com/sirpdboy/luci-app-wizard
+
+- 分区扩容: https://github.com/sirpdboy/luci-app-partexp
+
+- lukcy大吉: https://github.com/sirpdboy/luci-app-lukcy
 
 ## 捐助
 
@@ -37,4 +51,3 @@ ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
 <a href="#readme">
     <img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="图飞了😂" title="返回顶部" align="right"/>
 </a>
-

luci-app-advanced/luasrc/model/cbi/advanced.lua

@@ -6,38 +6,6 @@ m.apply_on_parse=true
 s=m:section(TypedSection,"advanced")
 s.anonymous=true
 
-if nixio.fs.access("/bin/nuc")then
-  s:tab("mode",translate("模式设置"),translate("<br />可以在这里切换旁路由和正常模式，重置你的网络设置。<br /><font color=\"Red\"><strong>点击后会立即重启设备，没有确认过程，请谨慎操作！</strong></font><br/>"))
-  o=s:taboption("mode",Button,"nucmode",translate("切换为旁路由模式"),translate("<font color=\"green\"><strong>本模式适合于单口和多网口主机，自动将网口全桥接好！<br />默认gateway是：192.168.1.1，ipaddr是192.168.1.2。用本机接口LAN接上级LAN当旁路由，主路由关闭DHCP服务。应用生效会重启软路由！</strong></font><br/>"))
-  o.inputtitle = translate("Apply")
-  o.inputstyle = "reset"
-  o.write = function()
-    luci.sys.exec("/bin/nuc &> /dev/null &")
-  end
-  o=s:taboption("mode",Button,"normalmode",translate("切换成路由模式"),translate("<font color=\"green\"><strong>本模式适合于有两个网口或以上的设备使用，如多网口软路由或者虚拟了两个以上网口的虚拟机使用！应用生效会重启软路由！。</strong></font><br/>"))
-  o.inputtitle = translate("Apply")
-  o.inputstyle = "reset"
-  o.write = function()
-   luci.sys.exec("/bin/normalmode &> /dev/null &")
-  end
-
-	o=s:taboption("mode",Button,"ipmode6",translate("设置为IPV6网络"),translate("<font color=\"green\"><strong>点击应用切换到IPV6模式！保存应用后即刻有效！</strong></font><br/>"))
-
-	o.inputtitle = translate("Apply")
-	o.inputstyle = "add"
-	o.write = function(self, section)
-  		luci.sys.exec("ipmode6  &> /dev/null &")
-	end
-
-	o=s:taboption("mode",Button,"ipmode4",translate("设置为IPV4网络"),translate("<font color=\"green\"><strong>点击应用切换到IPV4模式！保存应用后即刻有效！</strong></font><br/>"))
-
-	o.inputtitle = translate("Apply")
-	o.inputstyle = "add"
-	o.write = function(self, section)
-  		luci.sys.exec("ipmode4  &> /dev/null &")
-	end
-
-end
 if nixio.fs.access("/etc/dnsmasq.conf")then
 
 s:tab("dnsmasqconf",translate("dnsmasq"),translate("本页是配置/etc/dnsmasq.conf的文档内容。应用保存后自动重启生效"))
@@ -127,6 +95,7 @@ e.remove("/tmp/hosts.tmp")
 end
 end
 end
+
 if nixio.fs.access("/etc/config/arpbind")then
 s:tab("arpbindconf",translate("ARP绑定"),translate("本页是配置/etc/config/arpbind包含APR绑定MAC地址文档内容。应用保存后自动重启生效"))
 conf=s:taboption("arpbindconf",Value,"arpbindconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -148,6 +117,7 @@ e.remove("/tmp/arpbind")
 end
 end
 end
+
 if nixio.fs.access("/etc/config/firewall")then
 s:tab("firewallconf",translate("防火墙"),translate("本页是配置/etc/config/firewall包含防火墙协议设置文档内容。应用保存后自动重启生效"))
 conf=s:taboption("firewallconf",Value,"firewallconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -169,6 +139,7 @@ e.remove("/tmp/firewall")
 end
 end
 end
+
 if nixio.fs.access("/etc/config/mwan3")then
 s:tab("mwan3conf",translate("负载均衡"),translate("本页是配置/etc/config/mwan3包含负载均衡设置文档内容。应用保存后自动重启生效"))
 conf=s:taboption("mwan3conf",Value,"mwan3conf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -211,6 +182,7 @@ e.remove("/tmp/dhcp")
 end
 end
 end
+
 if nixio.fs.access("/etc/config/ddns")then
 s:tab("ddnsconf",translate("DDNS"),translate("本页是配置/etc/config/ddns包含动态域名设置文档内容。应用保存后自动重启生效"))
 conf=s:taboption("ddnsconf",Value,"ddnsconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -233,48 +205,50 @@ end
 end
 end
 
-if nixio.fs.access("/etc/config/timecontrol")then
-s:tab("timecontrolconf",translate("时间控制"),translate("本页是配置/etc/config/timecontrol包含上网时间控制配置文档内容。应用保存后自动重启生效"))
-conf=s:taboption("timecontrolconf",Value,"timecontrolconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
+if nixio.fs.access("/etc/config/parentcontrol")then
+s:tab("parentcontrolconf",translate("家长控制"),translate("本页是配置/etc/config/parentcontrol包含家长控制配置文档内容。应用保存后自动重启生效"))
+conf=s:taboption("parentcontrolconf",Value,"parentcontrolconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
 conf.template="cbi/tvalue"
 conf.rows=20
 conf.wrap="off"
 conf.cfgvalue=function(t,t)
-return e.readfile("/etc/config/timecontrol")or""
+return e.readfile("/etc/config/parentcontrol")or""
 end
 conf.write=function(a,a,t)
 if t then
 t=t:gsub("\r\n?","\n")
-e.writefile("/tmp/timecontrol",t)
-if(luci.sys.call("cmp -s /tmp/timecontrol /etc/config/timecontrol")==1)then
-e.writefile("/etc/config/timecontrol",t)
-luci.sys.call("/etc/init.d/timecontrol restart >/dev/null")
+e.writefile("/tmp/parentcontrol",t)
+if(luci.sys.call("cmp -s /tmp/parentcontrol /etc/config/parentcontrol")==1)then
+e.writefile("/etc/config/parentcontrol",t)
+luci.sys.call("/etc/init.d/parentcontrol restart >/dev/null")
 end
-e.remove("/tmp/timecontrol")
+e.remove("/tmp/parentcontrol")
 end
 end
 end
-if nixio.fs.access("/etc/config/rebootschedule")then
-s:tab("rebootscheduleconf",translate("定时设置"),translate("本页是配置/etc/config/rebootschedule包含定时设置任务配置文档内容。应用保存后自动重启生效"))
-conf=s:taboption("rebootscheduleconf",Value,"rebootscheduleconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
+
+if nixio.fs.access("/etc/config/autotimeset")then
+s:tab("autotimesetconf",translate("定时设置"),translate("本页是配置/etc/config/autotimeset包含定时设置任务配置文档内容。应用保存后自动重启生效"))
+conf=s:taboption("autotimesetconf",Value,"autotimesetconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
 conf.template="cbi/tvalue"
 conf.rows=20
 conf.wrap="off"
 conf.cfgvalue=function(t,t)
-return e.readfile("/etc/config/rebootschedule")or""
+return e.readfile("/etc/config/autotimeset")or""
 end
 conf.write=function(a,a,t)
 if t then
 t=t:gsub("\r\n?","\n")
-e.writefile("/tmp/rebootschedule",t)
-if(luci.sys.call("cmp -s /tmp/rebootschedule /etc/config/rebootschedule")==1)then
-e.writefile("/etc/config/rebootschedule",t)
-luci.sys.call("/etc/init.d/rebootschedule restart >/dev/null")
+e.writefile("/tmp/autotimeset",t)
+if(luci.sys.call("cmp -s /tmp/autotimeset /etc/config/autotimeset")==1)then
+e.writefile("/etc/config/autotimeset",t)
+luci.sys.call("/etc/init.d/autotimeset restart >/dev/null")
 end
-e.remove("/tmp/rebootschedule")
+e.remove("/tmp/autotimeset")
 end
 end
 end
+
 if nixio.fs.access("/etc/config/wolplus")then
 s:tab("wolplusconf",translate("网络唤醒"),translate("本页是配置/etc/config/wolplus包含网络唤醒配置文档内容。应用保存后自动重启生效"))
 conf=s:taboption("wolplusconf",Value,"wolplusconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -318,6 +292,29 @@ e.remove("/tmp/smartdns")
 end
 end
 end
+
+if nixio.fs.access("/etc/config/bypass")then
+s:tab("bypassconf",translate("BYPASS"),translate("本页是配置/etc/config/bypass包含bypass配置文档内容。应用保存后自动重启生效"))
+conf=s:taboption("bypassconf",Value,"bypassconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
+conf.template="cbi/tvalue"
+conf.rows=20
+conf.wrap="off"
+conf.cfgvalue=function(t,t)
+return e.readfile("/etc/config/bypass")or""
+end
+conf.write=function(a,a,t)
+if t then
+t=t:gsub("\r\n?","\n")
+e.writefile("/tmp/bypass",t)
+if(luci.sys.call("cmp -s /tmp/bypass /etc/config/bypass")==1)then
+e.writefile("/etc/config/bypass",t)
+luci.sys.call("/etc/init.d/bypass restart >/dev/null")
+end
+e.remove("/tmp/bypass")
+end
+end
+end
+
 if nixio.fs.access("/etc/config/openclash")then
 s:tab("openclashconf",translate("openclash"),translate("本页是配置/etc/config/openclash的文档内容。应用保存后自动重启生效"))
 conf=s:taboption("openclashconf",Value,"openclashconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -340,5 +337,4 @@ end
 end
 end
 
-
 return m

luci-app-autotimeset/README.md

@@ -8,6 +8,8 @@
 
 ## 功能说明：
 
+### 定时设置1.9版
+#### 2023.4.1 定时设置1.9版：加入定时断网重连、定时检测WAN3重启等服务。
 
 ### 定时设置1.6版
 #### 2023.1.15 定时设置1.6版：重新代码制作优化。在之前的版本上新增加：定时清理内存、定时清理系统垃圾、定时断网、定时重启网络共享、定时重拨 等 8大功能
@@ -62,28 +64,38 @@
 
 源码来源：https://github.com/sirpdboy/luci-app-autotimeset
 
-你可以随意使用其中的源码，但请注明出处。
 
-![screenshots](https://raw.githubusercontent.com/sirpdboy/openwrt/master/doc/说明2.jpg)
+
+## 使用与授权相关说明
+ 
+- 本人开源的所有源码，任何引用需注明本处出处，如需修改二次发布必告之本人，未经许可不得做于任何商用用途。
+
 
 # My other project
 
-网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
+- 网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
 
-定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
+- 定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
 
-关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
+- 关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
 
-opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
+- opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
 
-opentoks 主题: https://github.com/sirpdboy/luci-theme-opentoks [仿KOOLSAHRE主题]
+- kucat 主题: https://github.com/sirpdboy/luci-theme-kucat
 
-btmob 主题: https://github.com/sirpdboy/luci-theme-btmob
+- 家长控制: https://github.com/sirpdboy/luci-theme-parentcontrol
 
-系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
+- 系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
 
-ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
+- ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
 
+- 进阶设置（系统高级设置+主题设置kucat/agron/opentopd）: https://github.com/sirpdboy/luci-app-advancedplus
+
+- 设置向导: https://github.com/sirpdboy/luci-app-wizard
+
+- 分区扩容: https://github.com/sirpdboy/luci-app-partexp
+
+- lukcy大吉: https://github.com/sirpdboy/luci-app-lukcy
 
 ## 捐助
 
@@ -96,4 +108,3 @@ ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
 <a href="#readme">
     <img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="图飞了😂" title="返回顶部" align="right"/>
 </a>
-

luci-app-netspeedtest/README.md

@@ -117,19 +117,37 @@ luci-app-netspeedtest 网络速度诊断测试（包括：内网网页版测速
 ![screenshots](https://raw.githubusercontent.com/sirpdboy/openwrt/master/doc/netspeedtest4.jpg)
 
 
-## 其它
-- 我的其它项目：
+
+## 使用与授权相关说明
+ 
+- 本人开源的所有源码，任何引用需注明本处出处，如需修改二次发布必告之本人，未经许可不得做于任何商用用途。
+
+
+# My other project
+
 - 网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
+
 - 定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
+
 - 关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
-- btmob 主题: https://github.com/sirpdboy/luci-theme-btmob
+
+- opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
+
+- kucat 主题: https://github.com/sirpdboy/luci-theme-kucat
+
+- 家长控制: https://github.com/sirpdboy/luci-theme-parentcontrol
+
 - 系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
+
 - ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
-- Lucky(大吉): https://github.com/sirpdboy/luci-app-lucky
 
-## 感谢
+- 进阶设置（系统高级设置+主题设置kucat/agron/opentopd）: https://github.com/sirpdboy/luci-app-advancedplus
 
-感谢sivel、superspeed、user1121114685、ZeaKyX、佐须之男、lean等。因为有你们珠玉在前！
+- 设置向导: https://github.com/sirpdboy/luci-app-wizard
+
+- 分区扩容: https://github.com/sirpdboy/luci-app-partexp
+
+- lukcy大吉: https://github.com/sirpdboy/luci-app-lukcy
 
 ## 捐助
 

luci-app-partexp/README.md

@@ -70,25 +70,38 @@ luci-app-partexp 一键自动格式化分区、扩容、自动挂载插件
 ![screenshots](https://raw.githubusercontent.com/sirpdboy/openwrt/master/doc/partexp.jpg)
 
 
+
+
+## 使用与授权相关说明
+ 
+- 本人开源的所有源码，任何引用需注明本处出处，如需修改二次发布必告之本人，未经许可不得做于任何商用用途。
+
+
 # My other project
 
-网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
+- 网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
 
-定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
+- 定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
 
-关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
+- 关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
 
-opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
+- opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
 
-opentoks 主题: https://github.com/sirpdboy/luci-theme-opentoks [仿KOOLSAHRE主题]
+- kucat 主题: https://github.com/sirpdboy/luci-theme-kucat
 
-btmob 主题: https://github.com/sirpdboy/luci-theme-btmob
+- 家长控制: https://github.com/sirpdboy/luci-theme-parentcontrol
 
-系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
+- 系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
 
-ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
+- ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
 
-lucky大吉: https://github.com/sirpdboy/luci-app-lucky
+- 进阶设置（系统高级设置+主题设置kucat/agron/opentopd）: https://github.com/sirpdboy/luci-app-advancedplus
+
+- 设置向导: https://github.com/sirpdboy/luci-app-wizard
+
+- 分区扩容: https://github.com/sirpdboy/luci-app-partexp
+
+- lukcy大吉: https://github.com/sirpdboy/luci-app-lukcy
 
 ## 捐助
 

luci-app-passwall/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
-PKG_VERSION:=4.64-4
+PKG_VERSION:=4.64-5
 PKG_RELEASE:=
 
 PKG_CONFIG_DEPENDS:= \

luci-app-passwall/luasrc/passwall/api.lua

@@ -612,38 +612,41 @@ local function auto_get_arch()
 end
 
 function parseURL(url)
-    local pattern = "^(%w+)://"
-    local protocol = url:match(pattern)
+	if not url or url == "" then
+		return nil
+	end
+	local pattern = "^(%w+)://"
+	local protocol = url:match(pattern)
 
-    if not protocol then
-        --error("Invalid URL: " .. url)
-        return nil
-    end
+	if not protocol then
+		--error("Invalid URL: " .. url)
+		return nil
+	end
 
-    local auth_host_port = url:sub(#protocol + 4)
-    local auth_pattern = "^([^@]+)@"
-    local auth = auth_host_port:match(auth_pattern)
-    local username, password
+	local auth_host_port = url:sub(#protocol + 4)
+	local auth_pattern = "^([^@]+)@"
+	local auth = auth_host_port:match(auth_pattern)
+	local username, password
 
-    if auth then
-        username, password = auth:match("^([^:]+):([^:]+)$")
-        auth_host_port = auth_host_port:sub(#auth + 2)
-    end
+	if auth then
+		username, password = auth:match("^([^:]+):([^:]+)$")
+		auth_host_port = auth_host_port:sub(#auth + 2)
+	end
 
-    local host, port = auth_host_port:match("^([^:]+):(%d+)$")
+	local host, port = auth_host_port:match("^([^:]+):(%d+)$")
 
-    if not host or not port then
-        --error("Invalid URL: " .. url)
-        return nil
-    end
+	if not host or not port then
+		--error("Invalid URL: " .. url)
+		return nil
+	end
 
-    return {
-        protocol = protocol,
-        username = username,
-        password = password,
-        host = host,
-        port = tonumber(port)
-    }
+	return {
+		protocol = protocol,
+		username = username,
+		password = password,
+		host = host,
+		port = tonumber(port)
+	}
 end
 
 local default_file_tree = {

luci-app-passwall/luasrc/passwall/util_xray.lua

@@ -675,7 +675,7 @@ function gen_config(var)
 			local preproxy_node = preproxy_enabled and preproxy_node_id and uci:get_all(appname, preproxy_node_id) or nil
 			local preproxy_is_balancer
 
-			if not preproxy_node and api.parseURL(preproxy_node_id) then
+			if not preproxy_node and preproxy_node_id and api.parseURL(preproxy_node_id) then
 				local parsed1 = api.parseURL(preproxy_node_id)
 				local _node = {
 					type = "Xray",

luci-app-passwall/root/usr/share/passwall/rules/chnroute

@@ -467,6 +467,7 @@
 103.130.152.0/24
 103.130.160.0/22
 103.130.228.0/22
+103.131.138.0/23
 103.131.152.0/22
 103.131.168.0/22
 103.131.176.0/22
@@ -485,6 +486,7 @@
 103.132.188.0/22
 103.132.208.0/22
 103.132.212.0/22
+103.132.22.0/23
 103.132.234.0/23
 103.132.60.0/22
 103.132.64.0/22
@@ -1894,6 +1896,7 @@
 103.247.168.0/22
 103.247.172.0/22
 103.247.176.0/22
+103.247.191.0/24
 103.247.200.0/22
 103.247.212.0/22
 103.248.0.0/23

luci-app-passwall/root/usr/share/passwall/rules/chnroute6

@@ -394,6 +394,8 @@
 2400:ef40::/32
 2400:f480::/32
 2400:f5c0::/32
+2400:f6e0::/32
+2400:f720::/32
 2400:f7c0::/32
 2400:f840::/32
 2400:f980::/32

luci-app-poweroffdevice/README.md

@@ -58,31 +58,38 @@ poweroffdevice是一款基于OPNEWRT编译的关机源码插件。
 
 源码来源：https://github.com/sirpdboy/luci-app-poweroffdevice
 
-### 你可以随意使用其中的源码，但请注明出处。
 
 
-你可以随意使用其中的源码，但请注明出处。
-============================
+## 使用与授权相关说明
+ 
+- 本人开源的所有源码，任何引用需注明本处出处，如需修改二次发布必告之本人，未经许可不得做于任何商用用途。
 
 
 # My other project
 
-网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
+- 网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
 
-定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
+- 定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
 
-关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
+- 关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
 
-opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
+- opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
 
-opentoks 主题: https://github.com/sirpdboy/luci-theme-opentoks [仿KOOLSAHRE主题]
+- kucat 主题: https://github.com/sirpdboy/luci-theme-kucat
 
-btmob 主题: https://github.com/sirpdboy/luci-theme-btmob
+- 家长控制: https://github.com/sirpdboy/luci-theme-parentcontrol
 
-系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
+- 系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
 
-ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
+- ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
 
+- 进阶设置（系统高级设置+主题设置kucat/agron/opentopd）: https://github.com/sirpdboy/luci-app-advancedplus
+
+- 设置向导: https://github.com/sirpdboy/luci-app-wizard
+
+- 分区扩容: https://github.com/sirpdboy/luci-app-partexp
+
+- lukcy大吉: https://github.com/sirpdboy/luci-app-lukcy
 
 ## 捐助
 

luci-app-xray/README.md

@@ -37,7 +37,7 @@ Focus on making the most of Xray (HTTP/HTTPS/Socks/TProxy inbounds, multiple pro
 
 Choose one below:
 
-* Add `src-git-full luci-app-xray https://github.com/yichya/luci-app-xray` to `feeds.conf.default` and run `./scripts/feeds update -a; ./scripts/feeds install -a` 
+* Add `src-git-full luci_app_xray https://github.com/yichya/luci-app-xray` to `feeds.conf.default` and run `./scripts/feeds update -a; ./scripts/feeds install -a` 
 * Clone this repository under `package`
 
 Then find `luci-app-xray` under `Extra Packages`.

luci-theme-design/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Design Theme
 LUCI_DEPENDS:=
-PKG_VERSION:=5.7.4-20230417
+PKG_VERSION:=5.7.5-20230418
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

luci-theme-design/dev/style.css

@@ -2707,7 +2707,7 @@ header > .container > .pull-right > * {
     border-bottom: var(--sectionBorder);
     border-left: var(--sectionBorder);
     border-right: var(--sectionBorder);
-    /* background-color: var(--sectionbgColor); */
+    background-color: var(--sectionbgColor);
     border-radius: 10px;
 }
 

luci-theme-opentopd/README.md

@@ -143,24 +143,38 @@ opentopd是一款基于luci-theme-material构建,使用HTML5、CSS3编写的Luci
 ### 你可以随意使用其中的源码，但请注明出处。
 
 
+
+
+## 使用与授权相关说明
+ 
+- 本人开源的所有源码，任何引用需注明本处出处，如需修改二次发布必告之本人，未经许可不得做于任何商用用途。
+
+
 # My other project
 
-网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
+- 网络速度测试 ：https://github.com/sirpdboy/NetSpeedTest
 
-定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
+- 定时设置插件 : https://github.com/sirpdboy/luci-app-autotimeset
 
-关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
+- 关机功能插件 : https://github.com/sirpdboy/luci-app-poweroffdevice
 
-opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
+- opentopd主题 : https://github.com/sirpdboy/luci-theme-opentopd
 
-opentoks 主题: https://github.com/sirpdboy/luci-theme-opentoks [仿KOOLSAHRE主题]
+- kucat 主题: https://github.com/sirpdboy/luci-theme-kucat
 
-btmob 主题: https://github.com/sirpdboy/luci-theme-btmob
+- 家长控制: https://github.com/sirpdboy/luci-theme-parentcontrol
 
-系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
+- 系统高级设置 : https://github.com/sirpdboy/luci-app-advanced
 
-ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
+- ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
 
+- 进阶设置（系统高级设置+主题设置kucat/agron/opentopd）: https://github.com/sirpdboy/luci-app-advancedplus
+
+- 设置向导: https://github.com/sirpdboy/luci-app-wizard
+
+- 分区扩容: https://github.com/sirpdboy/luci-app-partexp
+
+- lukcy大吉: https://github.com/sirpdboy/luci-app-lukcy
 
 ## 捐助
 
@@ -173,4 +187,3 @@ ddns-go动态域名: https://github.com/sirpdboy/luci-app-ddns-go
 <a href="#readme">
     <img src="https://img.shields.io/badge/-返回顶部-orange.svg" alt="图飞了😂" title="返回顶部" align="right"/>
 </a>
-