From 96cf0c862adf93be33aa2574c980db5f8528b5a0 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 23 Feb 2020 00:28:58 +0800 Subject: [PATCH] luci-app-233ddns: bump to v1.0-2 --- package/ctcgfw/luci-app-233ddns/Makefile | 4 +- .../luasrc/controller/233ddns.lua | 10 +++- .../luasrc/model/cbi/233ddns.lua | 14 ++--- .../luasrc/view/233ddns/233ddns_status.htm | 51 +++++++++++++++++++ .../luci-app-233ddns/po/zh-cn/233ddns.po | 18 +++---- .../luci-app-233ddns/root/etc/config/233ddns | 1 - .../luci-app-233ddns/root/etc/init.d/233ddns | 19 +------ 7 files changed, 74 insertions(+), 43 deletions(-) create mode 100644 package/ctcgfw/luci-app-233ddns/luasrc/view/233ddns/233ddns_status.htm diff --git a/package/ctcgfw/luci-app-233ddns/Makefile b/package/ctcgfw/luci-app-233ddns/Makefile index ee67da2006..b32d80471b 100644 --- a/package/ctcgfw/luci-app-233ddns/Makefile +++ b/package/ctcgfw/luci-app-233ddns/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-233ddns PKG_VERSION:=1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 LUCI_TITLE:=LuCI support for 233DDNS -LUCI_DEPENDS:=+busybox +coreutils-sha512sum +curl +LUCI_DEPENDS:=+wget LUCI_PKGARCH:=all PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt diff --git a/package/ctcgfw/luci-app-233ddns/luasrc/controller/233ddns.lua b/package/ctcgfw/luci-app-233ddns/luasrc/controller/233ddns.lua index a9e556a862..64aa2ceb1b 100644 --- a/package/ctcgfw/luci-app-233ddns/luasrc/controller/233ddns.lua +++ b/package/ctcgfw/luci-app-233ddns/luasrc/controller/233ddns.lua @@ -11,4 +11,12 @@ function index() local page page = entry({"admin", "services", "233ddns"}, cbi("233ddns"), _("233DDNS"), 100) page.dependent = true -end \ No newline at end of file + entry({"admin", "services", "233ddns", "status"},call("act_status")).leaf=true +end + +function act_status() + local e={} + e.running=luci.sys.call("grep -q 'u.233.ro' '/etc/crontabs/root'")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) +end diff --git a/package/ctcgfw/luci-app-233ddns/luasrc/model/cbi/233ddns.lua b/package/ctcgfw/luci-app-233ddns/luasrc/model/cbi/233ddns.lua index 93f15ebe30..28f5d9f9b7 100644 --- a/package/ctcgfw/luci-app-233ddns/luasrc/model/cbi/233ddns.lua +++ b/package/ctcgfw/luci-app-233ddns/luasrc/model/cbi/233ddns.lua @@ -3,29 +3,23 @@ conf_token = luci.sys.exec("uci get 233ddns.@233ddns[0].token 2>/dev/null") if (conf_token == nil or conf_token == '') then - conf_token = luci.sys.exec("cat /dev/urandom | head -n 10 | md5sum | head -c 10") + conf_token = luci.sys.exec("ifconfig -a |grep eth0 |sed -n 1p |awk '{print $5}' |md5sum |head -c 10") end -ddns_domain = luci.sys.exec("/etc/init.d/233ddns gen_subdomain " .. conf_token) mp = Map("233ddns", translate("233DDNS")) -mp.description = translate("A simple, fast, security DDNS client, powered by Oxygen233.") .. "
" .. translate("Instructions for use:") .." https://233.ro/archives/233DDNS.html
" .. translate("Please add u.233.ro to your whitelist if you use proxies program.") +mp.description = translate("A simple, fast, security DDNS client, powered by Oxygen233.") .. "
" .. translate("Instructions for use:") .." https://233.ro/archives/233DDNS.html
" .. translate("Please add u.233.ro to your whitelist if you use proxy programs.") s = mp:section(TypedSection, "233ddns") s.anonymous=true s.addremove=false enable = s:option(Flag, "enable", translate("Enable")) -enable.description = translate("Your DDNS domain is") .. " " .. ddns_domain .. translate(".233ddns.me") +enable.description = translate("No need to register, simply select \"Enable\" and apply the configure, and you will have your own DDNS domain.") enable.default = 0 enable.rmempty = false -push_ipv6 = s:option(Flag, "push_ipv6", translate("Push IPv6 address")) -push_ipv6.description = translate("Push IPv6 record to remote instead of IPv4.") -push_ipv6.default = 0 -push_ipv6.rmempty = false - token = s:option(Value, "token", translate("Token")) -token.description = translate("Must be 10 in length.") +token.description = translate("Must be 10 in length. You can change it anytime, but notice the DDNS domain will be changed simultaneously.") token.default = conf_token token.placeholder = conf_token token.datatype = "string" diff --git a/package/ctcgfw/luci-app-233ddns/luasrc/view/233ddns/233ddns_status.htm b/package/ctcgfw/luci-app-233ddns/luasrc/view/233ddns/233ddns_status.htm new file mode 100644 index 0000000000..5e3455cef5 --- /dev/null +++ b/package/ctcgfw/luci-app-233ddns/luasrc/view/233ddns/233ddns_status.htm @@ -0,0 +1,51 @@ + + +
+

+ <%:Collecting data...%> +

+
diff --git a/package/ctcgfw/luci-app-233ddns/po/zh-cn/233ddns.po b/package/ctcgfw/luci-app-233ddns/po/zh-cn/233ddns.po index cdc2061bee..c06d6783f1 100644 --- a/package/ctcgfw/luci-app-233ddns/po/zh-cn/233ddns.po +++ b/package/ctcgfw/luci-app-233ddns/po/zh-cn/233ddns.po @@ -7,26 +7,20 @@ msgstr "由 Oxygen233 驱动的一个简单、快速、安全的 DDNS 客户端 msgid "Instructions for use:" msgstr "使用说明：" -msgid "Please add u.233.ro to your whitelist if you use proxies program." +msgid "Please add u.233.ro to your whitelist if you use proxy programs." msgstr "如果您使用了代理程序，请将 u.233.ro 添加至白名单。" msgid "Enable" msgstr "启用" +msgid "No need to register, simply select \"Enable\" and apply the configure, and you will have your own DDNS domain." +msgstr "无需注册，勾选“启用”并应用配置后，即可拥有您自己的DDNS域名。" + msgid "Your DDNS domain is" msgstr "您的DDNS域名是" -msgid ".ddns.233.ro" -msgstr ".ddns.233.ro" - -msgid "Push IPv6 address" -msgstr "推送IPv6地址" - -msgid "Push IPv6 record to remote instead of IPv4." -msgstr "将IPv6地址推送到远程而不是IPv4。" - msgid "Token" msgstr "令牌" -msgid "Must be 10 in length." -msgstr "长度必须为10。" +msgid "Must be 10 in length. You can change it anytime, but notice the DDNS domain will be changed simultaneously." +msgstr "长度必须为10。可随意修改，但请注意DDNS域名也会随之变动。" diff --git a/package/ctcgfw/luci-app-233ddns/root/etc/config/233ddns b/package/ctcgfw/luci-app-233ddns/root/etc/config/233ddns index 7081572588..9d88a02f51 100644 --- a/package/ctcgfw/luci-app-233ddns/root/etc/config/233ddns +++ b/package/ctcgfw/luci-app-233ddns/root/etc/config/233ddns @@ -1,5 +1,4 @@ config 233ddns option enable '0' - option push_ipv6 '0' option token '' diff --git a/package/ctcgfw/luci-app-233ddns/root/etc/init.d/233ddns b/package/ctcgfw/luci-app-233ddns/root/etc/init.d/233ddns index db8a55170a..090dd439f8 100755 --- a/package/ctcgfw/luci-app-233ddns/root/etc/init.d/233ddns +++ b/package/ctcgfw/luci-app-233ddns/root/etc/init.d/233ddns @@ -5,12 +5,7 @@ START=80 STOP=10 -EXTRA_COMMANDS="gen_subdomain" -EXTRA_HELP=" gen_subdomain Generate a subdomain by token" - enable="$(uci get 233ddns.@233ddns[0].enable)" -push_ipv6="$(uci get 233ddns.@233ddns[0].push_ipv6)" -[ "${push_ipv6}" -eq "0" ] && curl_arg="-4" || curl_arg="-6" token="$(uci get 233ddns.@233ddns[0].token)" start() @@ -18,8 +13,8 @@ start() stop [ "${enable}" -ne "1" ] && exit 0 - curl "${curl_arg}" -b "a=a" "https://u.233.ro/u/${token}" - echo "* * * * * curl ${curl_arg} -b \"a=a\" \"https://u.233.ro/u/${token}\"" >> "/etc/crontabs/root" + wget -4qO- --header="Cookie: a=a" "https://u.233.ro/u/${token}" + echo "* * * * * wget -4qO- --header=\"Cookie: a=a\" \"https://u.233.ro/u/${token}\"" >> "/etc/crontabs/root" /etc/init.d/cron restart } @@ -28,13 +23,3 @@ stop() sed -i '/u.233.ro/d' "/etc/crontabs/root" /etc/init.d/cron restart } - -restart() -{ - stop - start -} - -gen_subdomain() { - echo -n "$1" |sha512sum |head -c 10 -} \ No newline at end of file