From c971d1e53677ca3078f84f7f582a9dbe2d109712 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 09:01:00 +0800 Subject: [PATCH] update-11.19 --- luci-app-godproxy/Makefile | 2 +- luci-app-godproxy/change.log | 6 +- .../root/usr/share/koolproxy/kpupdate | 26 +++--- luci-app-godproxy/rulesupdate.log | 88 +++++++++---------- 4 files changed, 57 insertions(+), 65 deletions(-) diff --git a/luci-app-godproxy/Makefile b/luci-app-godproxy/Makefile index 751782a8e..ac5461494 100644 --- a/luci-app-godproxy/Makefile +++ b/luci-app-godproxy/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-godproxy PKG_VERSION:=3.8.5 -PKG_RELEASE:=3-20211118 +PKG_RELEASE:=3-20211119 PKG_MAINTAINER:=panda-mute diff --git a/luci-app-godproxy/change.log b/luci-app-godproxy/change.log index bb499204e..3d5140039 100644 --- a/luci-app-godproxy/change.log +++ b/luci-app-godproxy/change.log @@ -1,9 +1,7 @@ -## 更新：2021年11月18日： +## 更新：2021年11月19日： 1、修改第三方规则默认采用Yhosts规则。 -2、修复规则更新地址。 - -3、修改ABP规则为cats-team的DNS规则和Fanboy规则为cats-team的Hosts规则。感谢[Cats-Team](https://github.com/Cats-Team/AdRules)! +2、修复规则更新地址为国内coding。 ## 更新：2021年11月13日： diff --git a/luci-app-godproxy/root/usr/share/koolproxy/kpupdate b/luci-app-godproxy/root/usr/share/koolproxy/kpupdate index 78103927a..3cebd8288 100755 --- a/luci-app-godproxy/root/usr/share/koolproxy/kpupdate +++ b/luci-app-godproxy/root/usr/share/koolproxy/kpupdate @@ -111,19 +111,19 @@ update_rss_rules() { update_rules() { echo $(date "+%F %T"): ------------------- 内置规则更新 ------------------- >>$LOGFILE - wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@main/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat - wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@main/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt - wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@main/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt - wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@main/rules/user.txt' -q -O $KP_DIR/data/rules/user.txt - wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@main/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt - wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@main/rules/fanboy.txt' -q -O $KP_DIR/data/rules/fanboy.txt - wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@main/rules/ABP.txt' -q -O $KP_DIR/data/rules/ABP.txt - wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@main/rules/antiad.txt' -q -O $KP_DIR/data/rules/anti-ad.txt - wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@main/rules/mv.txt' -q -O $KP_DIR/data/rules/mv.txt - wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@main/ipsetadblock/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf - wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@main/ipsetadblock/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock - ABP_rules_local=`cat /usr/share/koolproxy/data/rules/ABP.txt | sed -n '7p'|awk '{print $3,$4}'` - fanboy_rules_local=`cat /usr/share/koolproxy/data/rules/fanboy.txt | sed -n '6p'|awk '{print $3,$4}'` + wget 'https://igodros.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat + wget 'https://igodros.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt + wget 'https://igodros.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt + wget 'https://igodros.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/user.txt' -q -O $KP_DIR/data/rules/user.txt + wget 'https://igodros.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt + wget 'https://igodros.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/fanboy.txt' -q -O $KP_DIR/data/rules/fanboy.txt + wget 'https://igodros.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/ABP.txt' -q -O $KP_DIR/data/rules/ABP.txt + wget 'https://igodros.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/antiad.txt' -q -O $KP_DIR/data/rules/anti-ad.txt + wget 'https://igodros.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/mv.txt' -q -O $KP_DIR/data/rules/mv.txt + wget 'https://igodros.coding.net/p/ikoolproxy/d/rules/git/raw/master/ipsetadblock/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf + wget 'https://igodros.coding.net/p/ikoolproxy/d/rules/git/raw/master/ipsetadblock/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock + ABP_rules_local=`cat /usr/share/koolproxy/data/rules/ABP.txt | sed -n '3p'|awk '{print $3,$4}'` + fanboy_rules_local=`cat /usr/share/koolproxy/data/rules/fanboy.txt | sed -n '3p'|awk '{print $3,$4}'` yhosts_rules_local=`cat /usr/share/koolproxy/data/rules/yhosts.txt | sed -n '1p' | cut -d ":" -f2` antiad_rules_local=`cat /usr/share/koolproxy/data/rules/anti-ad.txt | sed -n '2p' | cut -d "=" -f2` koolproxy_rules_local=`cat /usr/share/koolproxy/data/rules/koolproxy.txt | sed -n '3p'|awk '{print $3,$4}'` diff --git a/luci-app-godproxy/rulesupdate.log b/luci-app-godproxy/rulesupdate.log index 4c54a6cb9..7f2b22825 100644 --- a/luci-app-godproxy/rulesupdate.log +++ b/luci-app-godproxy/rulesupdate.log @@ -1,47 +1,41 @@ -2021-11-18 12:05:14: ------------------- 规则更新 ----------------------- -2021-11-18 12:05:14: ==================================================== -2021-11-18 12:05:14: 开始更新koolproxy的规则，请等待... -2021-11-18 12:05:14: --------------------------------------------------------------------------------------- -2021-11-18 12:05:15: ABP规则的本地版本号： -2021-11-18 12:05:15: ABP规则的在线版本号： 202111181156 -2021-11-18 12:05:15: 检测到 ABP规则 已更新，现在开始更新... -2021-11-18 12:05:15: 将临时的ABP规则文件移动到指定位置 -2021-11-18 12:05:15: --------------------------------------------------------------------------------------- -2021-11-18 12:05:16: Fanboy规则本地版本号： 202111181100 -2021-11-18 12:05:16: Fanboy规则在线版本号： 202111181200 -2021-11-18 12:05:16: 检测到新版本 Fanboy规则 列表，开始更新... -2021-11-18 12:05:16: 将临时文件覆盖到原始 Fanboy规则 文件 -2021-11-18 12:05:16: --------------------------------------------------------------------------------------- -2021-11-18 12:05:17: Yhosts规则本地版本号： 202111082343 -2021-11-18 12:05:17: Yhosts规则在线版本号： 202111082343 -2021-11-18 12:05:17: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-18 12:05:17: --------------------------------------------------------------------------------------- -2021-11-18 12:05:18: Antiad规则本地版本号： 20211117023854 -2021-11-18 12:05:18: Antiad规则在线版本号： 20211117023854 -2021-11-18 12:05:18: 检测到 Antiad规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-18 12:05:18: --------------------------------------------------------------------------------------- -2021-11-18 12:05:18: Banben规则本地版本号： 20211117105849 -2021-11-18 12:05:18: Banben规则在线版本号： 20211117105849 -2021-11-18 12:05:18: 检测到 Banben手机规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-18 12:05:18: --------------------------------------------------------------------------------------- -2021-11-18 12:05:18: StevenBlack规则本地版本号： 18 November 2021 -2021-11-18 12:05:18: StevenBlack规则在线版本号： 18 November 2021 -2021-11-18 12:05:18: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-18 12:05:18: 正在优化 ABP规则。。。。。 -2021-11-18 12:05:22: 正在优化 Fanboy规则。。。。。 -2021-11-18 12:05:23: 跳过优化 补充规则Yhosts。。。。。 -2021-11-18 12:05:23: 跳过优化 补充规则Antiad。。。。。 -2021-11-18 12:05:23: 跳过优化 补充规则Banben。。。。。 -2021-11-18 12:05:23: 跳过优化 补充规则StevenBlack。。。。。 -2021-11-18 12:05:23: 所有规则更新并优化完毕！ -2021-11-18 12:05:23: ==================================================== -2021-11-18 12:05:25: -------------------ABP规则 version 202111181156 -2021-11-18 12:05:25: -------------------Fanboy规则 version 202111181200 -2021-11-18 12:05:25: -------------------Yhosts规则 version 202111082343 -2021-11-18 12:05:25: -------------------Antiad规则 version 20211117023854 -2021-11-18 12:05:25: -------------------Banben手机规则 version 20211117105849 -2021-11-18 12:05:25: -------------------StevenBlack规则 version 18 November 2021 -2021-11-18 12:05:25: -------------------静态规则 version 2021-10-07 18:00 -2021-11-18 12:05:25: -------------------乘风视频 version 202111131 -2021-11-18 12:05:25: ------------------- 内置规则更新成功！ ------------------- -2021-11-18 12:05:25: ------------------- 规则更新成功！ ------------------- +2021-11-19 00:33:28: ------------------- 规则更新 ----------------------- +2021-11-19 00:33:28: ==================================================== +2021-11-19 00:33:28: 开始更新koolproxy的规则，请等待... +2021-11-19 00:33:28: --------------------------------------------------------------------------------------- +2021-11-19 00:33:29: ABP规则的本地版本号： +2021-11-19 00:33:29: ABP规则的在线版本号： 202111190026 +2021-11-19 00:33:29: 检测到 ABP规则 已更新，现在开始更新... +2021-11-19 00:33:29: 将临时的ABP规则文件移动到指定位置 +2021-11-19 00:33:29: --------------------------------------------------------------------------------------- +2021-11-19 00:33:30: Fanboy规则本地版本号： 202111181600 +2021-11-19 00:33:30: Fanboy规则在线版本号： 202111190000 +2021-11-19 00:33:30: 检测到新版本 Fanboy规则 列表，开始更新... +2021-11-19 00:33:30: 将临时文件覆盖到原始 Fanboy规则 文件 +2021-11-19 00:33:30: --------------------------------------------------------------------------------------- +2021-11-19 00:33:31: Yhosts规则本地版本号： 202111082343 +2021-11-19 00:33:31: Yhosts规则在线版本号： 202111082343 +2021-11-19 00:33:31: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-19 00:33:31: --------------------------------------------------------------------------------------- +2021-11-19 00:33:31: Antiad规则本地版本号： 20211117023854 +2021-11-19 00:33:31: Antiad规则在线版本号： 20211117023854 +2021-11-19 00:33:31: 检测到 Antiad规则 本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-19 00:33:31: --------------------------------------------------------------------------------------- +2021-11-19 00:33:31: StevenBlack规则本地版本号： 18 November 2021 +2021-11-19 00:33:31: StevenBlack规则在线版本号： 18 November 2021 +2021-11-19 00:33:31: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-19 00:33:31: 正在优化 ABP规则。。。。。 +2021-11-19 00:33:35: 正在优化 Fanboy规则。。。。。 +2021-11-19 00:33:39: 跳过优化 补充规则Yhosts。。。。。 +2021-11-19 00:33:39: 跳过优化 补充规则Antiad。。。。。 +2021-11-19 00:33:39: 跳过优化 补充规则StevenBlack。。。。。 +2021-11-19 00:33:39: 所有规则更新并优化完毕！ +2021-11-19 00:33:39: ==================================================== +2021-11-19 00:33:41: -------------------ABP规则 version 202111190026 +2021-11-19 00:33:41: -------------------Fanboy规则 version 202111190000 +2021-11-19 00:33:41: -------------------Yhosts规则 version 202111082343 +2021-11-19 00:33:41: -------------------Antiad规则 version 20211117023854 +2021-11-19 00:33:41: -------------------StevenBlack规则 version 18 November 2021 +2021-11-19 00:33:41: -------------------静态规则 version 2021-10-07 18:00 +2021-11-19 00:33:41: -------------------乘风视频 version 202111131 +2021-11-19 00:33:41: ------------------- 内置规则更新成功！ ------------------- +2021-11-19 00:33:41: ------------------- 规则更新成功！ -------------------