From 2184cd5665eeeb5bc122258548eb5057720ac027 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Mar 2023 02:12:51 +0800 Subject: [PATCH] update 2023-03-11 02:12:51 --- chinadns-ng/Makefile | 4 +- luci-app-adguardhome/Makefile | 2 +- .../luasrc/model/cbi/AdGuardHome/base.lua | 16 +++---- luci-app-adguardhome/po/zh-cn/AdGuardHome.po | 38 ++++++++------- .../po/zh_Hans/AdGuardHome.po | 38 ++++++++------- .../root/etc/config/AdGuardHome | 12 ++++- .../root/etc/init.d/AdGuardHome | 29 ++++++----- .../root/etc/uci-defaults/40_luci-AdGuardHome | 3 -- .../root/etc/mosdns/rule/geosite_cn.txt | 48 ++++++++++--------- .../root/etc/mosdns/rule/geosite_no_cn.txt | 1 + 10 files changed, 108 insertions(+), 83 deletions(-) diff --git a/chinadns-ng/Makefile b/chinadns-ng/Makefile index 414386f0a..f2d0a297f 100644 --- a/chinadns-ng/Makefile +++ b/chinadns-ng/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=chinadns-ng -PKG_VERSION:=2023.03.10 +PKG_VERSION:=2023.03.10 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zfl9/chinadns-ng/tar.gz/$(PKG_VERSION)? -PKG_HASH:= +PKG_HASH:=skip PKG_LICENSE:=AGPL-3.0-only PKG_LICENSE_FILES:=LICENSE diff --git a/luci-app-adguardhome/Makefile b/luci-app-adguardhome/Makefile index 7cc9c229d..6e6b170de 100644 --- a/luci-app-adguardhome/Makefile +++ b/luci-app-adguardhome/Makefile @@ -8,7 +8,7 @@ PKG_MAINTAINER:= LUCI_TITLE:=LuCI app for AdGuardHome LUCI_PKGARCH:=all -LUCI_DEPENDS:=+ca-certs +curl +wget-ssl +PACKAGE_$(PKG_NAME)_INCLUDE_binary:adguardhome +LUCI_DEPENDS:=+!wget-ssl&&!curl:wget-ssl +xz-utils +xz LUCI_DESCRIPTION:=LuCI support for AdGuardHome diff --git a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua index 67a339480..db0fb95fd 100644 --- a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua +++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua @@ -5,7 +5,7 @@ local m,s,o,o1 local fs=require"nixio.fs" local uci=require"luci.model.uci".cursor() local configpath=uci:get("AdGuardHome","AdGuardHome","configpath") or "/etc/AdGuardHome.yaml" -local binpath=uci:get("AdGuardHome","AdGuardHome","binpath") or "/usr/bin/AdGuardHome" +local binpath = uci:get("AdGuardHome", "AdGuardHome", "binpath") or "/usr/bin/AdGuardHome/AdGuardHome" httpport=uci:get("AdGuardHome","AdGuardHome","httpport") or "3000" m = Map("AdGuardHome", "AdGuard Home") m.description = translate("Free and open source, powerful network-wide ads & trackers blocking DNS server.") @@ -50,7 +50,7 @@ o = s:option(ListValue, "core_version", translate("Core Version")) o:value("latest", translate("Latest Version")) o:value("beta", translate("Beta Version")) o.default = "latest" -o=s:option(Button,"restart",translate("Update")) +o = s:option(Button, "restart", translate("Upgrade Core")) o.inputtitle=translate("Update core version") o.template = "AdGuardHome/AdGuardHome_check" o.showfastconfig=(not fs.access(configpath)) @@ -69,8 +69,8 @@ o.default = "none" o.optional = true ---- bin path o = s:option(Value, "binpath", translate("Bin Path"), translate("AdGuardHome Bin path if no bin will auto download")) -o.default = "/usr/bin/AdGuardHome" -o.datatype = "string" +o.default = "/usr/bin/AdGuardHome/AdGuardHome" +o.datatype = "string" o.optional = false o.rmempty=false o.validate=function(self, value) @@ -122,8 +122,8 @@ return value end ---- work dir o = s:option(Value, "workdir", translate("Work dir"), translate("AdGuardHome work dir include rules,audit log and database")) -o.default = "/etc/AdGuardHome" -o.datatype = "string" +o.default = "/usr/bin/AdGuardHome" +o.datatype = "string" o.optional = false o.rmempty=false o.validate=function(self, value) @@ -212,7 +212,7 @@ o = s:option(Flag, "waitonboot", translate("On boot when network ok restart")) o.default = 1 o.optional = true ---- backup workdir on shutdown -local workdir=uci:get("AdGuardHome","AdGuardHome","workdir") or "/etc/AdGuardHome" +local workdir = uci:get("AdGuardHome", "AdGuardHome", "workdir") or "/usr/bin/AdGuardHome" o = s:option(MultiValue, "backupfile", translate("Backup workdir files when shutdown")) o1 = s:option(Value, "backupwdpath", translate("Backup workdir path")) local name @@ -238,7 +238,7 @@ o.optional=false o.description=translate("Will be restore when workdir/data is empty") ----backup workdir path -o1.default = "/etc/AdGuardHome" +o1.default = "/usr/bin/AdGuardHome" o1.datatype = "string" o1.optional = false o1.validate=function(self, value) diff --git a/luci-app-adguardhome/po/zh-cn/AdGuardHome.po b/luci-app-adguardhome/po/zh-cn/AdGuardHome.po index d57e6e4b6..9446fe825 100644 --- a/luci-app-adguardhome/po/zh-cn/AdGuardHome.po +++ b/luci-app-adguardhome/po/zh-cn/AdGuardHome.po @@ -41,8 +41,8 @@ msgstr "启用" msgid "Browser management port" msgstr "网页管理账号和密码:admin ,端口:" -msgid "Update" -msgstr "更新" +msgid "Upgrade Core" +msgstr "更新核心" #button change msgid "Update core version" @@ -56,16 +56,22 @@ msgstr "已更新" #button hide msgid "Force update" -msgstr "强制更新" +msgstr "强制更新核心" msgid "Fast config" msgstr "快速配置" -# -msgid "core version:" -msgstr "核心版本:" -#description change +msgid "Core Version" +msgstr "核心版本" +msgid "Latest Version" +msgstr "最新版" + +msgid "Beta Version" +msgstr "测试版" + +msgid "Current core version:" +msgstr "当前核心版本:" msgid "no config" msgstr "没有配置文件" @@ -134,17 +140,17 @@ msgid "AdGuardHome work dir include rules,audit log and database" msgstr "AdGuardHome 工作目录包含规则，审计日志和数据库" msgid "Runtime log file" -msgstr "运行日志" +msgstr "运行日志路径" msgid "AdGuardHome runtime Log file if 'syslog': write to system log;if empty no log" -msgstr "AdGuardHome 运行日志 如果填syslog将写入系统日志；如果空则不记录日志" +msgstr "AdGuardHome 运行日志, 如果填 syslog 将写入系统日志; 如果该项为空则不记录运行日志" msgid "Verbose log" -msgstr "详细日志" +msgstr "输出详细日志" #hide div msgid "Add gfwlist" -msgstr "加入gfw列表" +msgstr "添加 GFW 列表" msgid "Add" msgstr "添加" @@ -171,7 +177,7 @@ msgstr "gfw列表域名上游服务器" #hide div msgid "Change browser management password" -msgstr "改变网页登录密码" +msgstr "更改网页登录密码" msgid "Culculate" msgstr "计算" @@ -184,13 +190,13 @@ msgid "loading..." msgstr "载入中" msgid "Please save/apply" -msgstr "请提交" +msgstr "请点击[保存/应用]" msgid "is empty" msgstr "为空" msgid "Press load culculate model and culculate finally save/apply" -msgstr "按载入计算模块 然后计算 最后保存/提交" +msgstr "先输入你想要的密码, 点击[载入计算模块], 然后点击[计算], 最后点击下方[保存&应用]" # msgid "Keep files when system upgrade" @@ -243,8 +249,8 @@ msgstr "自动更新gfw列表并重启adh" msgid "Please change time and args in crontab" msgstr "请在计划任务中修改时间和参数" -msgid "Download links for update" -msgstr "升级用的下载链接" +msgid "Core Update URL" +msgstr "核心更新地址" #/cgi-bin/luci/admin/services/AdGuardHome/log/ msgid "reverse" diff --git a/luci-app-adguardhome/po/zh_Hans/AdGuardHome.po b/luci-app-adguardhome/po/zh_Hans/AdGuardHome.po index d57e6e4b6..9446fe825 100644 --- a/luci-app-adguardhome/po/zh_Hans/AdGuardHome.po +++ b/luci-app-adguardhome/po/zh_Hans/AdGuardHome.po @@ -41,8 +41,8 @@ msgstr "启用" msgid "Browser management port" msgstr "网页管理账号和密码:admin ,端口:" -msgid "Update" -msgstr "更新" +msgid "Upgrade Core" +msgstr "更新核心" #button change msgid "Update core version" @@ -56,16 +56,22 @@ msgstr "已更新" #button hide msgid "Force update" -msgstr "强制更新" +msgstr "强制更新核心" msgid "Fast config" msgstr "快速配置" -# -msgid "core version:" -msgstr "核心版本:" -#description change +msgid "Core Version" +msgstr "核心版本" +msgid "Latest Version" +msgstr "最新版" + +msgid "Beta Version" +msgstr "测试版" + +msgid "Current core version:" +msgstr "当前核心版本:" msgid "no config" msgstr "没有配置文件" @@ -134,17 +140,17 @@ msgid "AdGuardHome work dir include rules,audit log and database" msgstr "AdGuardHome 工作目录包含规则，审计日志和数据库" msgid "Runtime log file" -msgstr "运行日志" +msgstr "运行日志路径" msgid "AdGuardHome runtime Log file if 'syslog': write to system log;if empty no log" -msgstr "AdGuardHome 运行日志 如果填syslog将写入系统日志；如果空则不记录日志" +msgstr "AdGuardHome 运行日志, 如果填 syslog 将写入系统日志; 如果该项为空则不记录运行日志" msgid "Verbose log" -msgstr "详细日志" +msgstr "输出详细日志" #hide div msgid "Add gfwlist" -msgstr "加入gfw列表" +msgstr "添加 GFW 列表" msgid "Add" msgstr "添加" @@ -171,7 +177,7 @@ msgstr "gfw列表域名上游服务器" #hide div msgid "Change browser management password" -msgstr "改变网页登录密码" +msgstr "更改网页登录密码" msgid "Culculate" msgstr "计算" @@ -184,13 +190,13 @@ msgid "loading..." msgstr "载入中" msgid "Please save/apply" -msgstr "请提交" +msgstr "请点击[保存/应用]" msgid "is empty" msgstr "为空" msgid "Press load culculate model and culculate finally save/apply" -msgstr "按载入计算模块 然后计算 最后保存/提交" +msgstr "先输入你想要的密码, 点击[载入计算模块], 然后点击[计算], 最后点击下方[保存&应用]" # msgid "Keep files when system upgrade" @@ -243,8 +249,8 @@ msgstr "自动更新gfw列表并重启adh" msgid "Please change time and args in crontab" msgstr "请在计划任务中修改时间和参数" -msgid "Download links for update" -msgstr "升级用的下载链接" +msgid "Core Update URL" +msgstr "核心更新地址" #/cgi-bin/luci/admin/services/AdGuardHome/log/ msgid "reverse" diff --git a/luci-app-adguardhome/root/etc/config/AdGuardHome b/luci-app-adguardhome/root/etc/config/AdGuardHome index 2e6ff22ef..de6d9f295 100644 --- a/luci-app-adguardhome/root/etc/config/AdGuardHome +++ b/luci-app-adguardhome/root/etc/config/AdGuardHome @@ -1,11 +1,19 @@ + config AdGuardHome 'AdGuardHome' option enabled '0' option httpport '3000' option redirect 'dnsmasq-upstream' option configpath '/etc/AdGuardHome.yaml' - option workdir '/etc/AdGuardHome' + option workdir '/tmp/AdGuardHome' option logfile '/tmp/AdGuardHome.log' option verbose '0' - option binpath '/usr/bin/AdGuardHome' + option binpath '/usr/bin/AdGuardHome/AdGuardHome' option upxflag '-1' + option waitonboot '0' + option update_url 'https://github.com/AdguardTeam/AdGuardHome/releases/download/${Cloud_Version}/AdGuardHome_linux_${Arch}.tar.gz' + option ucitracktest '2' + list old_redirect 'dnsmasq-upstream' + list old_port '5553' + list old_enabled '0' + option version 'v0.107.26' \ No newline at end of file diff --git a/luci-app-adguardhome/root/etc/init.d/AdGuardHome b/luci-app-adguardhome/root/etc/init.d/AdGuardHome index 80a75c80a..a35065501 100644 --- a/luci-app-adguardhome/root/etc/init.d/AdGuardHome +++ b/luci-app-adguardhome/root/etc/init.d/AdGuardHome @@ -50,7 +50,9 @@ stop_forward_dnsmasq() uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null addrlist="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`" if [ -z "$addrlist" ] ; then - uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto 2>/dev/null + resolvfile="/tmp/resolv.conf.d/resolv.conf.auto" + [ ! -f "$resolvfile" ] && resolvfile="/tmp/resolv.conf.auto" + uci set dhcp.@dnsmasq[0].resolvfile="$resolvfile" 2>/dev/null uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null fi uci commit dhcp @@ -134,7 +136,7 @@ isrunning(){ } _isrunning(){ - config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome" + config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome" [ ! -f "$binpath" ] && return 2 pgrep $binpath 2>&1 >/dev/null && return 0 return 1 @@ -186,7 +188,7 @@ rm_port53() config_editor "dns.port" "$dnsmasq_port" "$configpath" uci set dhcp.@dnsmasq[0].port="53" uci commit dhcp - config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome" + config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome" killall -9 $binpath /etc/init.d/dnsmasq restart } @@ -208,7 +210,7 @@ use_port53() config_editor "dns.port" "53" "$configpath" uci set dhcp.@dnsmasq[0].port="$AdGuardHome_PORT" uci commit dhcp - /etc/init.d/dnsmasq reload + /etc/init.d/dnsmasq restart } do_redirect() @@ -242,6 +244,7 @@ _do_redirect() config_get "old_port" "$section" "old_port" "0" config_get "old_enabled" "$section" "old_enabled" "0" uci get dhcp.@dnsmasq[0].port >/dev/null 2>&1 || uci set dhcp.@dnsmasq[0].port="53" >/dev/null 2>&1 + uci commit dhcp if [ "$old_enabled" = "1" -a "$old_redirect" == "exchange" ]; then AdGuardHome_PORT=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null) fi @@ -350,7 +353,7 @@ boot_service() { config_load "${CONFIGURATION}" config_get waitonboot $CONFIGURATION waitonboot "0" config_get_bool enabled $CONFIGURATION enabled 0 - config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome" + config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome" [ -f "$binpath" ] && start_service if [ "$enabled" == "1" ] && [ "$waitonboot" == "1" ]; then procd_open_instance "waitnet" @@ -371,15 +374,15 @@ testbackup(){ restore() { - config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome" - config_get backupwdpath $CONFIGURATION backupwdpath "/etc/AdGuardHome" + config_get workdir $CONFIGURATION workdir "/usr/bin/AdGuardHome" + config_get backupwdpath $CONFIGURATION backupwdpath "/usr/bin/AdGuardHome" cp -u -r -f $backupwdpath/data $workdir } backup() { - config_get backupwdpath $CONFIGURATION backupwdpath "/etc/AdGuardHome" + config_get backupwdpath $CONFIGURATION backupwdpath "/usr/bin/AdGuardHome" mkdir -p $backupwdpath/data - config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome" + config_get workdir $CONFIGURATION workdir "/usr/bin/AdGuardHome" config_get backupfile $CONFIGURATION backupfile "" for one in $backupfile; do @@ -424,7 +427,7 @@ start_service() { return fi #what need to do before reload - config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome" + config_get workdir $CONFIGURATION workdir "/usr/bin/AdGuardHome" config_get backupfile $CONFIGURATION backupfile "" mkdir -p $workdir/data @@ -449,7 +452,7 @@ start_service() { fi fi local ADDITIONAL_ARGS="" - config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome" + config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome" mkdir -p ${binpath%/*} ADDITIONAL_ARGS="$ADDITIONAL_ARGS -c $configpath" @@ -574,8 +577,8 @@ do_crontab(){ [ "$enabled" == "0" ] || [ "${crontab//autoupdate/}" == "$crontab" ] && cronenable=0 || cronenable=1 crontab_editor - config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome" - config_get lastworkdir $CONFIGURATION lastworkdir "/etc/AdGuardHome" + config_get workdir $CONFIGURATION workdir "/usr/bin/AdGuardHome" + config_get lastworkdir $CONFIGURATION lastworkdir "/usr/bin/AdGuardHome" findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* \$(uci get AdGuardHome.AdGuardHome.workdir)/data/querylog.json" #[ -n "$lastworkdir" ] && findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* $lastworkdir/data/querylog.json" && [ "$lastworkdir" != "$workdir" ] && replace="${lastworkdir//\//\\/}/${workdir//\//\\/}" default="0 * * * * /usr/share/AdGuardHome/tailto.sh 2000 \$(uci get AdGuardHome.AdGuardHome.workdir)/data/querylog.json" diff --git a/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome b/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome index 37e192cdd..2d467df98 100644 --- a/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome +++ b/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome @@ -6,10 +6,7 @@ uci -q batch <<-EOF >/dev/null 2>&1 set ucitrack.@AdGuardHome[-1].init=AdGuardHome commit ucitrack delete AdGuardHome.AdGuardHome.ucitracktest - /etc/init.d/AdGuardHome restart EOF rm -f /tmp/luci-indexcache - -chmod +x /etc/init.d/AdGuardHome /usr/share/AdGuardHome/* exit 0 diff --git a/luci-app-mosdns/root/etc/mosdns/rule/geosite_cn.txt b/luci-app-mosdns/root/etc/mosdns/rule/geosite_cn.txt index 9361e1a86..9cb168aed 100644 --- a/luci-app-mosdns/root/etc/mosdns/rule/geosite_cn.txt +++ b/luci-app-mosdns/root/etc/mosdns/rule/geosite_cn.txt @@ -2186,7 +2186,6 @@ 24geban.com 24haowan.com 24hmb.com -24jz.com 24k99.com 24ker.com 24kplus.com @@ -3116,7 +3115,6 @@ 3ddl.net 3ddl.org 3deazer.com -3demoo.com 3dfrom.com 3dgenomics.org 3dhao.com @@ -5884,6 +5882,7 @@ 81677.com 8169.com 817398.com +8175835ccc.com 81761.com 817711.com 818.com @@ -6827,6 +6826,7 @@ 98t.la 98t.net 98weixin.com +98wubi.com 98znz.com 99.com 99083.com @@ -6854,6 +6854,7 @@ 9966w.com 996a.com 996dns.com +996pic.com 9973.com 997788.com 998.com @@ -7434,6 +7435,7 @@ adtchrome.com adtianmai.com adtime.com adtmm.com +adtxl.com adubest.com adukwai.com adunicorn.com @@ -9331,6 +9333,7 @@ awoyun.com awsdns-cn-36.net awsdns-cn-57.com awsdns-cn-58.net +awsl.wang awsok.com awspal.com awstar.net @@ -10925,7 +10928,6 @@ bizchallenge.net bizcharts.net bizcn.com bizconfstreaming.com -bizgame.com bizhi360.com bizhi88.com bizhicool.com @@ -12312,6 +12314,7 @@ camelsee.com camera360.com camgle.com camnpr.com +camoryapps.com campanilechina.com campus-app.net campuschina.org @@ -12960,6 +12963,7 @@ cdnhwczth23.com cdnhwcztu09.com cdnhwczxh101.com cdnidc.net +cdnjson.com cdnjtzy.com cdnle.com cdnle.net @@ -14727,6 +14731,7 @@ chunhui12.com chunjingtech.com chunjiws.com chunmi.com +chunmiaosh.com chunqiuwang.com chunquff.com chunshuitang.com @@ -16003,6 +16008,7 @@ codepiano.com codepku.com codeplayer.vip codeplaygames.com +codeprj.com coder.work coder100.com coder4.com @@ -16650,7 +16656,6 @@ csdiy.wiki csdn.com csdn.net csdnxiazai.xyz -csdqp.com csdxcw.com csdyx.com csea767.com @@ -17273,7 +17278,6 @@ dagangcheng.com dagongcredit.com dagongnet.com dagufood.com -daguu.com daguzhe.com dahainan.com dahaiyang.com @@ -18710,6 +18714,7 @@ dlzyc.com dm004.net dm0571.com dm176.com +dm21.com dm300.com dm321.net dm5.com @@ -18746,7 +18751,6 @@ dmread.com dmrtb.com dmssc.net dmtg.com -dmyy.cc dmyz.org dmyzw.com dmzfa.com @@ -19027,6 +19031,7 @@ dongxuyitai.com dongyaods.com dongyin.net dongyun.biz +dongyun01.com dongzhougroup.com dongzhuoyao.com donhonet.net @@ -20128,6 +20133,7 @@ ecocn.org ecombdapi.com ecombdimg.com ecombdstatic.com +ecombdvod.com ecomoter.com ecool.site ecoplastech.com @@ -22913,7 +22919,6 @@ g80mx.com g88885555.com g88886666.com g8f8.com -ga0.me ga001.com ga25.com gaapqcloud.com @@ -27223,7 +27228,6 @@ hongshu.com hongshunet.com hongshunth.com hongsungifts.com -hongt.com hongtastock.com hongtu.net hongxiaolong.com @@ -27682,7 +27686,6 @@ huadongmedia.com huadoo.com huadream.com huaduocai.net -huadx.com huaease.net huaer.cc huafang.com @@ -27951,7 +27954,6 @@ huazhongtimes.com huazhu.com huazhuanapp.com huazhucorp.com -huazi55.xyz huazirc.com hubcyts.com hubei-design.com @@ -29196,6 +29198,7 @@ idcvip.net idcwn.com idcys.com idcyunwei.org +idczone.net idea-king.org idea1986.com ideacms.net @@ -37334,6 +37337,7 @@ lytpw.com lytuchuang2.com lytuchuang3.com lytuchuang4.com +lytuchuang7.com lyun.me lyunweb.com lyvnee.com @@ -40437,7 +40441,6 @@ newcoder.com newcosemi.com newdao.net newday.me -newdefend.com newdon.net newdruginfo.com newdu.com @@ -40755,6 +40758,7 @@ njgjj.com njhaiwai.com njhengyou.com njhgame.com +njhgzg.com njhszoo.com njibhu.com njjn.com @@ -42116,6 +42120,7 @@ paomou.com paopao.com paopaoche.net paopaohd.com +paopaoshipin.com paopaox.com paoshuba.cc paoxq.com @@ -43127,6 +43132,7 @@ pptmind.com pptok.com pptschool.com pptstore.net +pptutor.com pptv.com pptvyun.com pptxy.com @@ -44240,7 +44246,6 @@ qiwendi.com qiwenhui.com qixia.ltd qixiandoc.com -qixifuren.com qixin.com qixin007.com qixin18.com @@ -44997,6 +45002,7 @@ qyrb.com qyren168.com qysd.net qysfl.com +qysgf.com qysuliao.com qyt1902.com qyt321.com @@ -45158,7 +45164,6 @@ rayrjx.com raysilicon.com raythonsoft.com raytoon.net -rayu.me rayuu.com rayyo.com rayyzx.com @@ -46434,7 +46439,6 @@ scsdzxh.org scsgk.com scsjnxh.org scsstjt.com -sctaixin.com sctbc.net sctcd.com sctobacco.com @@ -47703,7 +47707,6 @@ shoujimi.com shoujitouping.com shoujiwan.com shouliwang.com -shouluo.me shoumizhibo.com shoumm.com shouqianba.com @@ -48690,6 +48693,7 @@ smilingwhitebear.com smiseo.com smjyfx.com smk3000.com +smkmake.com smkmp.com smmy365.com smo-clinplus.com @@ -48941,7 +48945,6 @@ sometracking.com somo.so somode.com sonald.me -songchuan12345.com songcn.com songguo7.com songguojiankang.com @@ -49370,7 +49373,6 @@ ssxxp.com ssyar.com ssyer.com ssytnet.com -ssyule.com ssyxlx.com ssyzx.net sszjnc.com @@ -50409,6 +50411,7 @@ szxihu.com szxinghe.net szxinjiaxin.com szxinyixin.com +szxiot.com szxlga.com szxsdmy.com szxuexiao.com @@ -50636,7 +50639,6 @@ tanguan.net tangux.com tangwumo.com tangyingkang.com -tangzhekan2.net tangzhuan666.com tanhaibo.net tanho.com @@ -54268,6 +54270,7 @@ vokop.com vol.moe volccdn.com volceapplog.com +volcengine.com volces.com volcfcdndvs.com volcgslb.com @@ -54643,6 +54646,7 @@ wandhi.com wanding.net wandodo.com wandoer.com +wandongli.com wandouip.com wandoujia.com waneziyuan.com @@ -56059,7 +56063,6 @@ wincome.group wind.moe wind2021.com windcoder.com -windever.com windin.com windmsn.com windows10.pro @@ -56994,6 +56997,7 @@ wwenglish.org wwfchina.org wwggw.com wwjia.com +wwkbiva.com wwmhdq.com wws23.com wwsgh.com @@ -59246,7 +59250,6 @@ xuanwu88.com xuanwumobile.com xuanwww.com xuanxiaozhuanjia.com -xuanxiu.cc xuanxuan.com xuanxuangame.com xuanxuantemai.com @@ -59892,7 +59895,6 @@ yanjunbo.com yankanshu.net yankay.com yanliu.org -yanlutong.com yanmbjiage.com yannaisi.com yannv.com @@ -61267,7 +61269,6 @@ yootou.com yooxun.com yooxuu.com yooyoo360.com -yoozai.com yoozhe.com yoozoo.com yoozword.com @@ -61700,6 +61701,7 @@ yscq.com yse360.cc ysedu.com yseeker.com +ysepan.com ysepay.com ysext.com ysfog.com @@ -63126,6 +63128,7 @@ zgwenku.com zgwhfe.com zgwhw.com zgwlcsj.com +zgwstxc.com zgwt.co zgwxbbs.com zgxcfx.com @@ -64661,6 +64664,7 @@ zonghangsl.com zongheng.com zongheng001.com zonghengke.com +zonghengxiaoshuo.com zongming.net zongs365.com zongshenmotor.com diff --git a/luci-app-mosdns/root/etc/mosdns/rule/geosite_no_cn.txt b/luci-app-mosdns/root/etc/mosdns/rule/geosite_no_cn.txt index ed60b176d..36a6a5210 100644 --- a/luci-app-mosdns/root/etc/mosdns/rule/geosite_no_cn.txt +++ b/luci-app-mosdns/root/etc/mosdns/rule/geosite_no_cn.txt @@ -26841,6 +26841,7 @@ tj900.com tjmaxx tjmaxx.com tjsbfj.com +tjstats.com tjx tk tkb008.xyz