luci-app-jd-dailybonus: bump to v0.8.4

package/ctcgfw/luci-app-jd-dailybonus/Makefile

@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 PKG_NAME:=luci-app-jd-dailybonus
 LUCI_PKGARCH:=all
-PKG_VERSION:=0.8.3
-PKG_RELEASE:=20200804
+PKG_VERSION:=0.8.4
+PKG_RELEASE:=20200826
 
 include $(INCLUDE_DIR)/package.mk
 

package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua

@@ -13,6 +13,13 @@ o = s:option(DummyValue, "", "")
 o.rawhtml = true
 o.template = "jd-dailybonus/cookie_tools"
 
+o = s:option(ListValue, "remote_url", translate("Source Update Url"))
+o:value("https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js", translate("GitHub"))
+o:value("https://gitee.com/jerrykuku/staff/raw/master/JD_DailyBonus.js", translate("Gitee"))
+o.default = "nil"
+o.rmempty = false
+o.description = translate('当GitHub源无法更新时,可以选择使用国内Gitee源')
+
 o = s:option(Value, "cookie", translate("First Cookie"))
 o.rmempty = false
 

package/ctcgfw/luci-app-jd-dailybonus/po/zh-cn/jd-dailybonus.po

@@ -22,6 +22,9 @@ msgstr "基本设置"
 msgid "Cookie Tools"
 msgstr "Cookie 工具"
 
+msgid "Source Update Url"
+msgstr "更新源地址"
+
 msgid "First Cookie"
 msgstr "主账号Cookie"
 

package/ctcgfw/luci-app-jd-dailybonus/root/etc/config/jd-dailybonus

@@ -1,8 +1,9 @@
 config global
-	option version '1.37'
+	option version '1.47'
 	option auto_run_time '1'
 	option auto_run '1'
 	option auto_update_time '1'
 	option auto_update '1'
 	option stop '0'
-	option failed '0'
+	option failed '0'
+	option remote_url 'https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js'

package/ctcgfw/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus

@@ -11,8 +11,6 @@ START=25
 
 NAME=jd-dailybonus
 CRON_FILE=/etc/crontabs/root
-JD_SCRIPT=/usr/share/jd-dailybonus/JD_DailyBonus.js
-
 
 
 del_cron() {

package/ctcgfw/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh

@@ -10,7 +10,6 @@
 # 0   更新成功
 
 NAME=jd-dailybonus
-REMOTE_SCRIPT=https://raw.githubusercontent.com/NobyDa/Script/master/JD-DailyBonus/JD_DailyBonus.js
 TEMP_SCRIPT=/tmp/JD_DailyBonus.js
 JD_SCRIPT=/usr/share/jd-dailybonus/JD_DailyBonus.js
 LOG_HTM=/www/JD_DailyBonus.htm
@@ -18,7 +17,6 @@ CRON_FILE=/etc/crontabs/root
 usage() {
     cat <<-EOF
 		Usage: app.sh [options]
-
 		Valid options are:
 
 		    -a                      Add Cron
@@ -51,6 +49,8 @@ cancel() {
     exit 1
 }
 
+REMOTE_SCRIPT=$(uci_get_by_type global remote_url)
+
 fill_cookie() {
     cookie1=$(uci_get_by_type global cookie)
     if [ ! "$cookie1" = "" ]; then
@@ -77,7 +77,11 @@ fill_cookie() {
     fi
 }
 
-remote_ver=$(cat $TEMP_SCRIPT | sed -n '/更新时间/p' | awk '{for (i=1;i<=NF;i++){if ($i ~/v/) {print $i}}}' | sed 's/v//')
+if [ -e $TEMP_SCRIPT ]; then
+    remote_ver=$(cat $TEMP_SCRIPT | sed -n '/更新时间/p' | awk '{for (i=1;i<=NF;i++){if ($i ~/v/) {print $i}}}' | sed 's/v//')
+else
+    remote_ver=$(cat $JD_SCRIPT | sed -n '/更新时间/p' | awk '{for (i=1;i<=NF;i++){if ($i ~/v/) {print $i}}}' | sed 's/v//')
+fi
 local_ver=$(uci_get_by_type global version)
 
 add_cron() {
@@ -97,11 +101,11 @@ serverchan() {
         grep "Cookie失效" /www/JD_DailyBonus.htm > /dev/null
         if [ $? -eq 0 ]; then
             title="$(date '+%Y年%m月%d日') 京东签到 Cookie 失效"
-            wget-ssl -q --post-data="text=$title~&desp=$desc" https://sc.ftqq.com/$sckey.send
+            wget-ssl -q --output-document=/dev/null --post-data="text=$title~&desp=$desc" https://sc.ftqq.com/$sckey.send
         fi
     else
         title="$(date '+%Y年%m月%d日') 京东签到"
-        wget-ssl -q --post-data="text=$title~&desp=$desc" https://sc.ftqq.com/$sckey.send
+        wget-ssl -q --output-document=/dev/null --post-data="text=$title~&desp=$desc" https://sc.ftqq.com/$sckey.send
     fi
 
 }