diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile index d088952458..c838cb866a 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:=1 +PKG_RELEASE:=2 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 750634aded..97a57bed85 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,9 @@ enable.default = 0 enable.rmempty = false select_server = s:option(ListValue, "select_server", translate("服务端类型")) -select_server:value("tencent_shanghai_nodejs", translate("腾讯云上海 Node.js 版本(稳定)")) -select_server:value("anhui_telecom_golang", translate("安徽电信 Golang 版本(高速率)")) -select_server.description = translate("Node.js版使用QQ、酷我、咪咕音源,Golang版使用酷狗、酷我音源") +select_server:value("tencent_shanghai_nodejs", translate("腾讯云上海 Node.js 版本(高音质)")) +select_server:value("tencent_shanghai_golang", translate("腾讯云上海 Golang 版本(低音质)")) +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/init.d/unblockneteasemusic-mini b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini index 9dc2a2c798..9a52b24760 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 @@ -14,12 +14,12 @@ if [ "${select_server}" = "tencent_shanghai_nodejs" ]; then [ -z "${unblock_server_ip}" ] && unblock_server_ip="122.51.88.18" unblock_server_http_port="30000" unblock_server_https_port="30001" -else - unblock_server_addr="cdn-anhui.service.project-openwrt.eu.org" - unblock_server_ip="$(ping "cdn-anhui.service.project-openwrt.eu.org" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" - [ -z "${unblock_server_ip}" ] && unblock_server_ip="223.215.42.127" - unblock_server_http_port="53025" - unblock_server_https_port="44178" +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}')" + [ -z "${unblock_server_ip}" ] && unblock_server_ip="122.51.88.18" + unblock_server_http_port="30002" + unblock_server_https_port="30003" fi set_ipset(){