From 9f8878275abb855f75013835d1182cd2e3315ffc Mon Sep 17 00:00:00 2001 From: FrancisNGG <50126440+FrancisNGG@users.noreply.github.com> Date: Tue, 25 Feb 2020 13:53:07 +0800 Subject: [PATCH 1/3] add DDNS aliyun TTL val (#3323) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add TTL val 添加TTL值参数设置给购买了解析套餐的人 --- package/lean/ddns-scripts_aliyun/update_aliyun_com.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh b/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh index ff763fca92..e8ee45767e 100755 --- a/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh +++ b/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh @@ -133,7 +133,7 @@ build_Request() { __URLARGS= for string in $args; do case "${string%%=*}" in - Format|Version|AccessKeyId|SignatureMethod|Timestamp|SignatureVersion|SignatureNonce|Signature) ;; # 过滤公共参数 + Format|TTL|Version|AccessKeyId|SignatureMethod|Timestamp|SignatureVersion|SignatureNonce|Signature) ;; # 过滤公共参数 *) __URLARGS="$__URLARGS${__SEPARATOR}"$(percentEncode "${string%%=*}")"="$(percentEncode "${string#*=}");; esac done @@ -141,6 +141,7 @@ build_Request() { # 附加公共参数 string="Format=JSON"; __URLARGS="$__URLARGS${__SEPARATOR}"$(percentEncode "${string%%=*}")"="$(percentEncode "${string#*=}") + string="TTL=600";__URLARGS="$__URLARGS${__SEPARATOR}"$(percentEncode "${string%%=*}")"="$(percentEncode "${string#*=}") string="Version=2015-01-09"; __URLARGS="$__URLARGS${__SEPARATOR}"$(percentEncode "${string%%=*}")"="$(percentEncode "${string#*=}") string="AccessKeyId=$username"; __URLARGS="$__URLARGS${__SEPARATOR}"$(percentEncode "${string%%=*}")"="$(percentEncode "${string#*=}") string="SignatureMethod=HMAC-SHA1"; __URLARGS="$__URLARGS${__SEPARATOR}"$(percentEncode "${string%%=*}")"="$(percentEncode "${string#*=}") From 77121adaf9ef6a979b108541785449b9fdbb3c4f Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Mon, 24 Feb 2020 21:54:59 -0800 Subject: [PATCH 2/3] luci-app-unblockneteasemusic-mini: add flac server --- package/lean/luci-app-unblockneteasemusic-mini/Makefile | 2 +- .../luasrc/controller/unblockneteasemusic-mini.lua | 2 +- .../luasrc/model/cbi/unblockneteasemusic-mini.lua | 3 ++- .../root/etc/init.d/unblockneteasemusic-mini | 7 +++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/lean/luci-app-unblockneteasemusic-mini/Makefile b/package/lean/luci-app-unblockneteasemusic-mini/Makefile index f379063dc8..17eb8547f1 100644 --- a/package/lean/luci-app-unblockneteasemusic-mini/Makefile +++ b/package/lean/luci-app-unblockneteasemusic-mini/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockneteasemusic-mini PKG_VERSION:=1.2 PKG_RELEASE:=6 -LUCI_TITLE:=LuCI support for UnblockNeteaseMusic(Mini) +LUCI_TITLE:=LuCI support for UnblockNeteaseMusic(-Go) LUCI_DEPENDS:=+dnsmasq-full +ipset +iptables +wget LUCI_PKGARCH:=all diff --git a/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua b/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua index 25d48deef0..73460b723c 100644 --- a/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua +++ b/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua @@ -10,7 +10,7 @@ function index() end local page - page = entry({"admin", "services", "unblockneteasemusic-mini"}, cbi("unblockneteasemusic-mini"), _("云解锁网易云音乐"), 100) + page = entry({"admin", "services", "unblockneteasemusic-mini"}, cbi("unblockneteasemusic-mini"), _("解除网易云音乐播放限制 (Mini)"), 100) page.dependent = true entry({"admin", "services", "unblockneteasemusic-mini", "status"},call("act_status")).leaf=true end diff --git a/package/lean/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua b/package/lean/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua index a40f77d109..561b1332eb 100644 --- a/package/lean/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua +++ b/package/lean/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/lean/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini b/package/lean/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini index 6f53bf3799..577f17116d 100755 --- a/package/lean/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini +++ b/package/lean/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}')" @@ -68,6 +74,7 @@ ipset=/clientlog3.music.163.com/neteasemusic iptables -t nat -D "PREROUTING" -p tcp -m set --match-set "neteasemusic" dst -j "unblock_netease_music" iptables -t nat -F "unblock_netease_music" iptables -t nat -X "unblock_netease_music" + ipset destroy "neteasemusic" echo "" > "/var/etc/unblockneteasemusic-mini.include" rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic-mini.conf" From c6b967d8157cfef93fbd7d46cbceeff407bd1f29 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Mon, 24 Feb 2020 21:57:50 -0800 Subject: [PATCH 3/3] luci-app-unblockneteasemusic-mini: fix typo --- package/lean/luci-app-unblockneteasemusic-mini/Makefile | 2 +- .../luasrc/controller/unblockneteasemusic-mini.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/luci-app-unblockneteasemusic-mini/Makefile b/package/lean/luci-app-unblockneteasemusic-mini/Makefile index 17eb8547f1..f379063dc8 100644 --- a/package/lean/luci-app-unblockneteasemusic-mini/Makefile +++ b/package/lean/luci-app-unblockneteasemusic-mini/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockneteasemusic-mini PKG_VERSION:=1.2 PKG_RELEASE:=6 -LUCI_TITLE:=LuCI support for UnblockNeteaseMusic(-Go) +LUCI_TITLE:=LuCI support for UnblockNeteaseMusic(Mini) LUCI_DEPENDS:=+dnsmasq-full +ipset +iptables +wget LUCI_PKGARCH:=all diff --git a/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua b/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua index 73460b723c..25d48deef0 100644 --- a/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua +++ b/package/lean/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua @@ -10,7 +10,7 @@ function index() end local page - page = entry({"admin", "services", "unblockneteasemusic-mini"}, cbi("unblockneteasemusic-mini"), _("解除网易云音乐播放限制 (Mini)"), 100) + page = entry({"admin", "services", "unblockneteasemusic-mini"}, cbi("unblockneteasemusic-mini"), _("云解锁网易云音乐"), 100) page.dependent = true entry({"admin", "services", "unblockneteasemusic-mini", "status"},call("act_status")).leaf=true end