From f20b249e68018231cf8f2d6137368f1b90d3c9f8 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 24 Feb 2020 00:16:36 +0800 Subject: [PATCH] luci-app-unblockneteasemusic-mini: bump to 1.2-5 --- package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile | 2 +- .../luasrc/model/cbi/unblockneteasemusic-mini.lua | 3 ++- .../root/etc/hotplug.d/iface/99-unblockneteasemusic-mini | 8 -------- .../root/etc/init.d/unblockneteasemusic-mini | 6 ++++++ 4 files changed, 9 insertions(+), 10 deletions(-) delete mode 100755 package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/hotplug.d/iface/99-unblockneteasemusic-mini diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile index 9df4af8d1e..b20d3c9318 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockneteasemusic-mini PKG_VERSION:=1.2 -PKG_RELEASE:=4 +PKG_RELEASE:=5 LUCI_TITLE:=LuCI support for UnblockNeteaseMusic(-Go) LUCI_DEPENDS:=+busybox +dnsmasq-full +ipset +iptables +wget LUCI_PKGARCH:=all diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua index a40f77d109..561b1332eb 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua @@ -16,9 +16,10 @@ enable.default = 0 enable.rmempty = false select_server = s:option(ListValue, "select_server", translate("服务端类型")) +select_server:value("tencent_shanghai_golang", translate("腾讯云上海 Golang 版本（低音质）")) select_server:value("tencent_shanghai_nodejs", translate("腾讯云上海 Node.js 版本（高音质）")) select_server:value("aliyun_beijing_nodejs", translate("阿里云北京 Node.js 版本（高音质）")) -select_server:value("tencent_shanghai_golang", translate("腾讯云上海 Golang 版本（低音质）")) +select_server:value("mobile_henan_nodejs",translate("移动河南 Node.js 版本（无损音质）")) select_server.description = translate("Node.js版使用QQ、酷我、咪咕音源，Golang版使用酷狗、酷我、咪咕音源") select_server.default = "tencent_shanghai_nodejs" select_server.rmempty = false diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/hotplug.d/iface/99-unblockneteasemusic-mini b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/hotplug.d/iface/99-unblockneteasemusic-mini deleted file mode 100755 index fd56956ed7..0000000000 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/hotplug.d/iface/99-unblockneteasemusic-mini +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -[ "$ACTION" = ifup ] || exit 0 -[ "$INTERFACE" = "wan" ] || exit 0 - -ipset -! -N "neteasemusic" hash:ip -sleep 10 -wget-ssl -t 5 -T 10 "http://httpdns.n.netease.com/httpdns/v2/d?domain=music.163.com,interface.music.163.com,interface3.music.163.com,apm.music.163.com,apm3.music.163.com,clientlog.music.163.com,clientlog3.music.163.com" -O- |grep -Eo '[0-9]+?\.[0-9]+?\.[0-9]+?\.[0-9]+?' |sort |uniq |awk '{print "ipset add neteasemusic "$1}' |sh diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini index 74706a48d1..577f17116d 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini @@ -20,6 +20,12 @@ elif [ "${select_server}" = "aliyun_beijing_nodejs" ]; then [ -z "${unblock_server_ip}" ] && unblock_server_ip="182.92.84.98" unblock_server_http_port="30000" unblock_server_https_port="30001" +elif [ "${select_server}" = "mobile_henan_nodejs" ]; then + unblock_server_addr="cdn-henan.service.project-openwrt.eu.org" + unblock_server_ip="$(ping "cdn-henan.service.project-openwrt.eu.org" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" + [ -z "${unblock_server_ip}" ] && exit 1 + unblock_server_http_port="33221" + unblock_server_https_port="33222" elif [ "${select_server}" = "tencent_shanghai_golang" ]; then unblock_server_addr="cdn-shanghai.service.project-openwrt.eu.org" unblock_server_ip="$(ping "cdn-shanghai.service.project-openwrt.eu.org" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')"