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

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.4
-PKG_RELEASE:=20200826
+PKG_VERSION:=0.8.6
+PKG_RELEASE:=20201021
 
 include $(INCLUDE_DIR)/package.mk
 

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

@@ -14,7 +14,7 @@ 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://cdn.jsdelivr.net/gh/NobyDa/Script/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
@@ -33,6 +33,13 @@ o.default = 0
 o.datatype = integer
 o.description = translate("自定义延迟签到,单位毫秒. 默认分批并发无延迟. (延迟作用于每个签到接口, 如填入延迟则切换顺序签到. ) ")
 
+o = s:option(ListValue, "serverurl", translate("ServerURL"))
+o:value("scu", translate("SCU"))
+o:value("sct", translate("SCT"))
+o.default = "scu"
+o.rmempty = false
+o.description = translate('选择Server酱的推送接口')
+
 o = s:option(Value, "serverchan", translate("ServerChan SCKEY"))
 o.rmempty = true
 o.description = translate("微信推送，基于Server酱服务，请自行登录 http://sc.ftqq.com/ 绑定并获取 SCKEY (仅在自动签到时推送)")
@@ -65,4 +72,4 @@ o = s:option(DummyValue, "", "")
 o.rawhtml = true
 o.version = sys.exec('uci get jd-dailybonus.@global[0].version')
 o.template = "jd-dailybonus/update_service"
-return m
+return m

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

@@ -55,10 +55,18 @@ msgstr "延迟签到"
 msgid "ServerChan SCKEY"
 msgstr "Server酱 SCKEY"
 
+msgid "ServerURL"
+msgstr "Server酱的推送接口地址"
+
+msgid "SCT"
+msgstr "测试版推送接口地址"
+
+msgid "SCU"
+msgstr "原版推送接口地址"
+
 msgid "Failed Push"
 msgstr "失效时推送"
 
-
 msgid "Auto Run"
 msgstr "自动签到"
 

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

@@ -96,16 +96,21 @@ add_cron() {
 serverchan() {
     sckey=$(uci_get_by_type global serverchan)
     failed=$(uci_get_by_type global failed)
-    desc=$(cat /www/JD_DailyBonus.htm | sed 's/$/&\n/g' | sed -e '/左滑/d')
+    desc=$(cat /www/JD_DailyBonus.htm | grep -E '签到号|签到概览|签到总计|账号总计|其他总计' | sed 's/$/&\n/g')
+    serverurlflag=$(uci_get_by_type global serverurl)
+    serverurl=https://sc.ftqq.com/
+    if [ "$serverurlflag" = "sct" ]; then
+        serverurl=https://sctapi.ftqq.com/
+    fi
     if [ $failed -eq 1 ]; then
         grep "Cookie失效" /www/JD_DailyBonus.htm > /dev/null
         if [ $? -eq 0 ]; then
             title="$(date '+%Y年%m月%d日') 京东签到 Cookie 失效"
-            wget-ssl -q --output-document=/dev/null --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" $serverurl$sckey.send
         fi
     else
         title="$(date '+%Y年%m月%d日') 京东签到"
-        wget-ssl -q --output-document=/dev/null --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" $serverurl$sckey.send
     fi
 
 }
@@ -155,12 +160,16 @@ update() {
     fi
 }
 
-while getopts ":anruswh" arg; do
+while getopts ":alnruswh" arg; do
     case "$arg" in
     a)
         add_cron
         exit 0
         ;;
+    l)
+        serverchan
+        exit 0
+        ;;
     n)
         check_ver
         exit 0