From c659f98d7e3e646fa50a8f84c076b1aa1742171c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 1 Jan 2022 09:08:08 +0800 Subject: [PATCH] update-01.01 --- .../luasrc/model/cbi/jd-dailybonus/client.lua | 6 ++++++ luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus | 2 +- .../root/usr/share/jd-dailybonus/newapp.sh | 7 +++++++ luci-app-mosdns/root/etc/mosdns/serverlist.txt | 4 +--- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua b/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua index 83a234867..2b74aae1a 100644 --- a/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua +++ b/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua @@ -54,6 +54,12 @@ o = s:option(Value, 'dd_token', translate('Dingding Bot Token')) o.rmempty = true o.description = translate('创建一个群机器人并获取API Token,设置安全关键字为:京东') +-- pushplus + +o = s:option(Value, 'pp_token', translate('pushplus Token')) +o.rmempty = true +o.description = translate('微信推送,基于pushplus服务,请自行登录 https://www.pushplus.plus/ 绑定并获取 Token。') + -- telegram o = s:option(Value, 'tg_token', translate('Telegram Bot Token')) diff --git a/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus b/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus index 571e9c41d..eeea2440f 100755 --- a/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus +++ b/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus @@ -6,8 +6,8 @@ # See /LICENSE for more information. # -USE_PROCD=1 START=25 +STOP=10 NAME=jd-dailybonus CRON_FILE=/etc/crontabs/root diff --git a/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh b/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh index 7fc89e2cd..2c1471fb4 100755 --- a/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh +++ b/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh @@ -86,6 +86,13 @@ notify() { uclient-fetch -q --post-file=/tmp/jd-djson.json "https://oapi.dingtalk.com/robot/send?access_token=${dtoken}" fi + #pushplus + ptoken=$(uci_get_by_type global pp_token) + POST_URL="http://www.pushplus.plus/send" + if [ ! -z $ptoken ]; then + curl -s -d "{\"token\":\"$ptoken\",\"title\":\"$title\",\"content\":\"$desc\"}" -H 'Content-Type: application/json' $POST_URL + fi + #telegram TG_BOT_TOKEN=$(uci_get_by_type global tg_token) TG_USER_ID=$(uci_get_by_type global tg_userid) diff --git a/luci-app-mosdns/root/etc/mosdns/serverlist.txt b/luci-app-mosdns/root/etc/mosdns/serverlist.txt index 9b8b065d3..17a637116 100644 --- a/luci-app-mosdns/root/etc/mosdns/serverlist.txt +++ b/luci-app-mosdns/root/etc/mosdns/serverlist.txt @@ -5,7 +5,6 @@ 036e.cn 09_19.supfree.net 0x5.me -1-1ads.com 1.1010pic.com 1.ad-locus.com 1.aili.com @@ -558,6 +557,7 @@ ad0.bigmir.net ad01.mediacorpsingapore.com ad1.bigmir.net ad1.emule-project.org +ad1.eventmanager.co.kr ad1.img.static.youmi.net ad1.kde.cz ad1.nend.net @@ -6871,7 +6871,6 @@ rd.e.sogou.com rd.wan.360.cn rdstat.tanx.com rdx.autohome.com.cn -re-directme.com re.m.taobao.com re.taobao.com reachjunction.com @@ -8522,7 +8521,6 @@ triptease.io trk.bad-tool-tell-doubt.xyz trk.bc.shutterfly.com trk.bee-data.com -trk.enemy-adult-scared-there.xyz trk.hot-mob.com trk.pinterest.com trk.taboola.com