From 533c4f5f35ec6d569c73c03c333448128aae30d3 Mon Sep 17 00:00:00 2001 From: Curry <46918772+CurryEx@users.noreply.github.com> Date: Sun, 16 Jan 2022 20:40:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=BACloudFlareDDNS=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=9B=B4=E6=96=B0=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cfddns/cfddns/scripts/cfddns_config.sh | 34 +++++++++++++++++++++++--- cfddns/cfddns/uninstall.sh | 5 ++++ cfddns/cfddns/webs/Module_cfddns.asp | 12 ++++++++- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/cfddns/cfddns/scripts/cfddns_config.sh b/cfddns/cfddns/scripts/cfddns_config.sh index d99457c..0fcc5a7 100755 --- a/cfddns/cfddns/scripts/cfddns_config.sh +++ b/cfddns/cfddns/scripts/cfddns_config.sh @@ -128,14 +128,38 @@ check_update(){ echo_date "======================================" } +# 计划运行自动更新 +set_interval_update(){ + username=`nvram show|grep http_username|awk -F '=' '{print $2}'` + filename=/tmp/var/spool/cron/crontabs/$username + if [ ! -f $filename ] + then + echo_date 计划文件不存在，将创建计划文件 + touch $filename + else + echo_date 计划文件已存在 + sed -i '/S99cfddns.sh/d' $filename + fi + [ "$cfddns_update_interval" = "" ] && cfddns_update_interval="30" + echo -e "\n*/$cfddns_update_interval * * * * sh /koolshare/init.d/S99cfddns.sh update">>$filename + sed -i '/^[ ]*$/d' $filename + echo_date 计划文件更新成功 + service restart_crontab > NUL + echo_date 已启动计划 +} + # add_cfddns_cru(){ # sed -i '/cfddns/d' /var/spool/cron/crontabs/* >/dev/null 2>&1 # cru a cfddns "0 */$cfddns_refresh_time * * * /koolshare/scripts/cfddns_config.sh update" # } # -# stop_cfddns(){ -# sed -i '/cfddns/d' /var/spool/cron/crontabs/* >/dev/null 2>&1 -# } + +stop_cfddns(){ + # sed -i '/cfddns/d' /var/spool/cron/crontabs/* >/dev/null 2>&1 + username=`nvram show|grep http_username|awk -F '=' '{print $2}'` + filename=/tmp/var/spool/cron/crontabs/$username + sed -i '/S99cfddns.sh/d' $filename +} # ====================================used by init or cru==================================== case $1 in @@ -157,19 +181,21 @@ start) fi ;; update) + echo_date 触发更新 check_update >> $LOG_FILE ;; esac # ====================================submit by web==================================== case $2 in 1) - #此处为web提交动设计 + #此处为web提交设计 echo "" > $LOG_FILE http_response "$1" if [ "$cfddns_enable" == "1" ];then [ ! -L "/koolshare/init.d/S99cfddns.sh" ] && ln -sf /koolshare/scripts/cfddns_config.sh /koolshare/init.d/S99cfddns.sh echo_date "======================================" >> $LOG_FILE check_update >> $LOG_FILE + set_interval_update >> $LOG_FILE else echo_date "关闭CloudFlare DDNS!" >> $LOG_FILE stop_cfddns diff --git a/cfddns/cfddns/uninstall.sh b/cfddns/cfddns/uninstall.sh index 9431676..c5b5e49 100755 --- a/cfddns/cfddns/uninstall.sh +++ b/cfddns/cfddns/uninstall.sh @@ -6,3 +6,8 @@ rm -rf /koolshare/res/icon-cfddns.png rm -rf /koolshare/scripts/cfddns*.sh rm -rf /koolshare/scripts/uninstall_cfddns.sh rm -rf /koolshare/webs/Module_cfddns.asp + +# 删除crontab中的配置 +username=`nvram show|grep http_username|awk -F '=' '{print $2}'` +filename=/tmp/var/spool/cron/crontabs/$username +sed -i '/S99cfddns.sh/d' $filename \ No newline at end of file diff --git a/cfddns/cfddns/webs/Module_cfddns.asp b/cfddns/cfddns/webs/Module_cfddns.asp index f4ec3e8..59c9a1e 100644 --- a/cfddns/cfddns/webs/Module_cfddns.asp +++ b/cfddns/cfddns/webs/Module_cfddns.asp @@ -89,7 +89,7 @@ var dbus = {}; var _responseLen; var noChange = 0; var x = 5; -var params_inp = ['cfddns_email', 'cfddns_akey', 'cfddns_zid', 'cfddns_name', 'cfddns_domain', 'cfddns_ttl', 'cfddns_method']; +var params_inp = ['cfddns_email', 'cfddns_akey', 'cfddns_zid', 'cfddns_name', 'cfddns_domain', 'cfddns_ttl', 'cfddns_method', 'cfddns_update_interval']; var params_chk = ['cfddns_enable', 'cfddns_proxied']; //var params_chk = ['cfddns_enable', 'cfddns_proxied', 'cfddns_ipv6']; @@ -156,6 +156,10 @@ function get_status1(){ } function save(){ + if($("#cfddns_update_interval").val()>59 || $("#cfddns_update_interval").val()<5){ + alert("定时周期必须介于5与59之间"); + return; + } var dbus_new = {} $("#show_btn2").trigger("click"); // collect data from input and checkbox @@ -411,6 +415,12 @@ function reload_Soft_Center(){ + + 定时周期(5~59分钟) + + + + Cloudflare代理(proxied)[?] From daa4ca720104ffbeb58cc0e479eeab6a36310abb Mon Sep 17 00:00:00 2001 From: Curry <46918772+CurryEx@users.noreply.github.com> Date: Sun, 16 Jan 2022 20:44:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cfddns/cfddns/scripts/cfddns_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfddns/cfddns/scripts/cfddns_config.sh b/cfddns/cfddns/scripts/cfddns_config.sh index 0fcc5a7..fe05014 100755 --- a/cfddns/cfddns/scripts/cfddns_config.sh +++ b/cfddns/cfddns/scripts/cfddns_config.sh @@ -181,7 +181,7 @@ start) fi ;; update) - echo_date 触发更新 + echo_date 触发更新 >> $LOG_FILE check_update >> $LOG_FILE ;; esac From 5d8dade3beb6eb2fd2f86b0fe1041e6cda2ac8aa Mon Sep 17 00:00:00 2001 From: Curry <46918772+CurryEx@users.noreply.github.com> Date: Sun, 16 Jan 2022 21:10:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E6=9C=BA?= =?UTF-8?q?=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cfddns/cfddns/scripts/cfddns_config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/cfddns/cfddns/scripts/cfddns_config.sh b/cfddns/cfddns/scripts/cfddns_config.sh index fe05014..7ac4e4e 100755 --- a/cfddns/cfddns/scripts/cfddns_config.sh +++ b/cfddns/cfddns/scripts/cfddns_config.sh @@ -176,6 +176,7 @@ start) echo_date "======================================" >> $LOG_FILE echo_date "检测到网络拨号..." >> $LOG_FILE check_update >> $LOG_FILE + set_interval_update >> $LOG_FILE else logger "[软件中心]: CloudFlare DDNS未设置开机启动，跳过！" fi