update-01.23

This commit is contained in:
github-actions[bot] 2022-01-23 20:29:54 +08:00
parent 6f5159c0b7
commit 66a8cf3991
6 changed files with 59 additions and 58 deletions

View File

@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=UnblockNeteaseMusic
PKG_BASE_VERSION:=0.27.0-rc.4
PKG_RELEASE:=71
PKG_RELEASE:=72
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/UnblockNeteaseMusic/server.git
PKG_SOURCE_DATE:=2021-12-21
PKG_SOURCE_VERSION:=e2de2e306e713408a7878d14a217d284e72a1027
PKG_SOURCE_VERSION:=297e98d5fc174ad6a47a825815967f5b26f3d487
PKG_MIRROR_HASH:=skip
PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))

View File

@ -262,7 +262,6 @@ rules(){
fi
log "Check IP/GFW files successful!"
kcp_enable=$(uci_get_by_name $GLOBAL_SERVER kcp_enable 0)
[ $kcp_enable = 1 ] && kcp_server=$server
UDP_RELAY_SERVER=$(uci_get_by_type global udp_relay_server)
[ "$UDP_RELAY_SERVER" = same ] && UDP_RELAY_SERVER=$GLOBAL_SERVER
if [ "$(uci_get_by_name $UDP_RELAY_SERVER kcp_enable 0)" = 1 ];then
@ -324,6 +323,7 @@ rules(){
all)mode=-z;;
esac
[ $kcp_enable = 1 ] && kcp_server=$server
if [ -n "$NF_SERVER" -a $run_mode != oversea ];then
nf_ip=$(uci_get_by_name $NF_SERVER server)
if ! echo $nf_ip | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$">/dev/null;then

View File

@ -12,7 +12,7 @@ config global
config acl_rule
option proxy_mode '2'
option remarks '选要滤https的客户端'
option ipaddr '192.168.168.168'
option ipaddr '192.168.8.168'
config usetips
option load '0'

View File

@ -111,16 +111,16 @@ update_rss_rules() {
update_rules() {
echo $(date "+%F %T"): ------------------- 内置规则更新 ------------------- >>$LOGFILE
wget 'https://iwrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat
wget 'https://iwrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt
wget 'https://iwrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt
wget 'https://iwrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt
wget 'https://iwrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/steven.txt' -q -O $KP_DIR/data/rules/steven.txt
wget 'https://iwrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/adg.txt' -q -O $KP_DIR/data/rules/adg.txt
wget 'https://iwrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/antiad.txt' -q -O $KP_DIR/data/rules/antiad.txt
wget 'https://iwrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/adgk.txt' -q -O $KP_DIR/data/rules/adgk.txt
wget 'https://iwrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf
wget 'https://iwrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock
wget 'https://onewrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat
wget 'https://onewrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt
wget 'https://onewrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt
wget 'https://onewrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt
wget 'https://onewrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/steven.txt' -q -O $KP_DIR/data/rules/steven.txt
wget 'https://onewrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/adg.txt' -q -O $KP_DIR/data/rules/adg.txt
wget 'https://onewrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/antiad.txt' -q -O $KP_DIR/data/rules/antiad.txt
wget 'https://onewrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/adgk.txt' -q -O $KP_DIR/data/rules/adgk.txt
wget 'https://onewrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf
wget 'https://onewrt.coding.net/p/ikoolproxy/d/rules/git/raw/master/rules/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock
adg_rules_local=`cat /usr/share/koolproxy/data/rules/adg.txt | sed -n '4p'|awk '{print $4}'`
steven_rules_local=`cat /usr/share/koolproxy/data/rules/steven.txt | sed -n '2p'|awk '{print $3,$4,$5,$6}'`
yhosts_rules_local=`cat /usr/share/koolproxy/data/rules/yhosts.txt | sed -n '1p' | cut -d ":" -f2`

View File

@ -1,43 +1,44 @@
2022-01-19 01:04:11: ------------------- 规则更新 -----------------------
2022-01-19 01:04:11: ====================================================
2022-01-19 01:04:11: 开始更新koolproxy的规则请等待...
2022-01-19 01:04:11: kpr_our_rule规则文件下载失败
2022-01-19 01:04:11: dykpr规则文件下载失败
2022-01-19 01:04:11: ---------------------------------------------------------------------------------------
2022-01-19 01:04:11: Yhosts规则本地版本号 202111082343
2022-01-19 01:04:11: Yhosts规则在线版本号 202111082343
2022-01-19 01:04:11: 检测到Yhosts本地版本号和在线版本号相同那还更新个毛啊!
2022-01-19 01:04:11: ---------------------------------------------------------------------------------------
2022-01-19 01:04:11: Antiad规则本地版本号 20220114024402
2022-01-19 01:04:11: Antiad规则在线版本号 20220117055347
2022-01-19 01:04:11: 检测到新版本 Antiad规则 列表,开始更新...
2022-01-19 01:04:11: 将临时文件覆盖到原始 Antiad规则 文件
2022-01-19 01:04:11: ---------------------------------------------------------------------------------------
2022-01-19 01:04:11: StevenBlack规则本地版本号 12 January 2022 03:01:51
2022-01-19 01:04:11: StevenBlack规则在线版本号 18 January 2022 18:32:01
2022-01-19 01:04:11: 检测到新版本 StevenBlack规则 列表,开始更新...
2022-01-19 01:04:11: 将临时文件覆盖到原始 StevenBlack规则 文件
2022-01-19 01:04:11: ---------------------------------------------------------------------------------------
2022-01-19 01:04:11: AdGuard DNS规则本地版本号 2022-01-16T00:22:51.342Z
2022-01-19 01:04:11: AdGuard DNS规则在线版本号 2022-01-19T00:19:55.347Z
2022-01-19 01:04:11: 检测到新版本 AdGuard DNS规则 列表,开始更新...
2022-01-19 01:04:11: 将临时文件覆盖到原始 AdGuard DNS规则 文件
2022-01-19 01:04:11: ---------------------------------------------------------------------------------------
2022-01-19 01:04:12: ADgk规则本地版本号 20220112173207
2022-01-19 01:04:12: ADgk规则在线版本号 20220112173207
2022-01-19 01:04:12: 检测到 ADgk规则 本地版本号和在线版本号相同,那还更新个毛啊!
2022-01-19 01:04:12: 跳过优化 补充规则Yhosts。。。。。
2022-01-19 01:04:12: 正在优化 补充规则antiad。。。。。
2022-01-19 01:04:13: 正在优化 补充规则steven。。。。。
2022-01-19 01:04:14: 正在优化 补充规则AdGuard DNS。。。。。
2022-01-19 01:04:21: 跳过优化 ADgk规则。。。。。
2022-01-19 01:04:21: 所有规则更新并优化完毕!
2022-01-19 01:04:21: ====================================================
2022-01-19 01:04:22: -------------------AdGuard规则 version 2022-01-19T00:19:55.347Z
2022-01-19 01:04:22: -------------------Antiad规则 version 20220117055347
2022-01-19 01:04:22: -------------------Banben规则 version 20220112173207
2022-01-19 01:04:22: -------------------Yhosts规则 version 202111082343
2022-01-19 01:04:22: -------------------Steven规则 version 18 January 2022 18:32:01
2022-01-19 01:04:22: -------------------静态规则 version 2022-01-16 09:30
2022-01-19 01:04:22: ------------------- 内置规则更新成功! -------------------
2022-01-19 01:04:22: ------------------- 规则更新成功! -------------------
2022-01-23 05:24:38: ------------------- 规则更新 -----------------------
2022-01-23 05:24:38: ====================================================
2022-01-23 05:24:38: 开始更新koolproxy的规则请等待...
2022-01-23 05:24:38: kpr_our_rule规则文件下载失败
2022-01-23 05:24:38: dykpr规则文件下载失败
2022-01-23 05:24:38: ---------------------------------------------------------------------------------------
2022-01-23 05:24:38: Yhosts规则本地版本号 202111082343
2022-01-23 05:24:38: Yhosts规则在线版本号 202111082343
2022-01-23 05:24:38: 检测到Yhosts本地版本号和在线版本号相同那还更新个毛啊!
2022-01-23 05:24:38: ---------------------------------------------------------------------------------------
2022-01-23 05:24:38: Antiad规则本地版本号 20220117055347
2022-01-23 05:24:38: Antiad规则在线版本号 20220123023828
2022-01-23 05:24:38: 检测到新版本 Antiad规则 列表,开始更新...
2022-01-23 05:24:38: 将临时文件覆盖到原始 Antiad规则 文件
2022-01-23 05:24:38: ---------------------------------------------------------------------------------------
2022-01-23 05:24:38: StevenBlack规则本地版本号 18 January 2022 18:32:01
2022-01-23 05:24:38: StevenBlack规则在线版本号 22 January 2022 04:15:22
2022-01-23 05:24:38: 检测到新版本 StevenBlack规则 列表,开始更新...
2022-01-23 05:24:38: 将临时文件覆盖到原始 StevenBlack规则 文件
2022-01-23 05:24:38: ---------------------------------------------------------------------------------------
2022-01-23 05:24:38: AdGuard DNS规则本地版本号 2022-01-19T00:19:55.347Z
2022-01-23 05:24:38: AdGuard DNS规则在线版本号 2022-01-23T00:20:07.463Z
2022-01-23 05:24:38: 检测到新版本 AdGuard DNS规则 列表,开始更新...
2022-01-23 05:24:38: 将临时文件覆盖到原始 AdGuard DNS规则 文件
2022-01-23 05:24:38: ---------------------------------------------------------------------------------------
2022-01-23 05:24:38: ADgk规则本地版本号 20220112173207
2022-01-23 05:24:38: ADgk规则在线版本号 20220120133739
2022-01-23 05:24:38: 检测到新版本 ADgk规则 列表,开始更新...
2022-01-23 05:24:38: 将临时文件覆盖到原始 ADgk规则 文件
2022-01-23 05:24:38: 跳过优化 补充规则Yhosts。。。。。
2022-01-23 05:24:38: 正在优化 补充规则antiad。。。。。
2022-01-23 05:24:39: 正在优化 补充规则steven。。。。。
2022-01-23 05:24:40: 正在优化 补充规则AdGuard DNS。。。。。
2022-01-23 05:24:46: 正在优化 ADgk规则。。。。。
2022-01-23 05:24:56: 所有规则更新并优化完毕!
2022-01-23 05:24:56: ====================================================
2022-01-23 05:24:58: -------------------AdGuard规则 version 2022-01-23T00:20:07.463Z
2022-01-23 05:24:58: -------------------Antiad规则 version 20220123023828
2022-01-23 05:24:58: -------------------Banben规则 version 20220120133739
2022-01-23 05:24:58: -------------------Yhosts规则 version 202111082343
2022-01-23 05:24:58: -------------------Steven规则 version 22 January 2022 04:15:22
2022-01-23 05:24:58: -------------------静态规则 version 2022-01-22 09:30
2022-01-23 05:24:58: ------------------- 内置规则更新成功! -------------------
2022-01-23 05:24:58: ------------------- 规则更新成功! -------------------

View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for quickstart
LUCI_DEPENDS:=+shadow-useradd
LUCI_DEPENDS:=+quickstart +shadow-useradd
LUCI_PKGARCH:=all
PKG_VERSION:=0.0.1
PKG_RELEASE:=1