diff --git a/package/lean/luci-app-jd-dailybonus/Makefile b/package/lean/luci-app-jd-dailybonus/Makefile index 0c173bc21..838388224 100644 --- a/package/lean/luci-app-jd-dailybonus/Makefile +++ b/package/lean/luci-app-jd-dailybonus/Makefile @@ -10,8 +10,8 @@ endef LUCI_TITLE:=Luci for JD dailybonus Script LUCI_PKGARCH:=all -LUCI_DEPENDS:=+node +wget +lua +libuci-lua +LUCI_DEPENDS:=+node +wget +lua +curl +libuci-lua include $(TOPDIR)/feeds/luci/luci.mk -# call BuildPackage - OpenWrt buildroot signature \ No newline at end of file +# call BuildPackage - OpenWrt buildroot signature diff --git a/package/lean/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua b/package/lean/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua index 356bee25f..c8635a5a1 100644 --- a/package/lean/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua +++ b/package/lean/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua @@ -96,7 +96,6 @@ end function check_login() local uci = luci.model.uci.cursor() local data = luci.http.formvalue() - local id = data.id local post_data = 'lang=chs&appid=300&source=wq_passport&returnurl=https://wqlogin2.jd.com/passport/LoginRedirect?state=1100399130787&returnurl=//home.m.jd.com/myJd/newhome.action?sceneval=2&ufc=&/myJd/home.action' local referer='https://plogin.m.jd.com/login/login?appid=300&returnurl=https://wqlogin2.jd.com/passport/LoginRedirect?state=' local response = luci.sys.exec("echo -n $(wget-ssl --post-data='"..post_data.."' --header='"..Accept.."' --header='"..Accept_Language.."' --header='"..Host.."' --referer='"..referer.."' --user-agent='"..User_Agent.."' --load-cookies="..cookie.." --save-cookies="..cookie.." --keep-session-cookies -q -O - '"..data.check_url.."')") @@ -107,11 +106,7 @@ function check_login() if return_json.error == 0 then local pt_key = luci.sys.exec("echo -n $(cat "..cookie.." | grep pt_key | awk '{print $7}')") local pt_pin = luci.sys.exec("echo -n $(cat "..cookie.." | grep pt_pin | awk '{print $7}')") - local cookieStr = 'pt_key=' .. pt_key .. ';pt_pin=' .. pt_pin .. ';' - uci:set('jd-dailybonus', '@global[0]', id, cookieStr) - uci:commit('jd-dailybonus') - luci.sys.call('lua /usr/share/jd-dailybonus/gen_cookieset.lua') - return_json.cookie = cookieStr + return_json.cookie = 'pt_key=' .. pt_key .. ';pt_pin=' .. pt_pin .. ';' end luci.http.prepare_content('application/json') @@ -125,4 +120,4 @@ function get_log() e.log = fs.readfile("/var/log/jd_dailybonus.log") or "" luci.http.prepare_content("application/json") luci.http.write_json(e) -end \ No newline at end of file +end diff --git a/package/lean/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua b/package/lean/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua index 8caa7e1a4..a4b20f0ed 100644 --- a/package/lean/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua +++ b/package/lean/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua @@ -10,7 +10,7 @@ s.anonymous = true o = s:option(DynamicList, "Cookies", translate("账号 Cookie 列表")) o.rmempty = false -o.description = translate('双击输入框即可调出二维码,扫描后自动填入。') +o.description = translate('双击输入框或点击添加图标即可调出二维码,扫码后自动填入。') o = s:option(DummyValue, '', '') o.rawhtml = true @@ -40,6 +40,12 @@ o = s:option(Value, 'serverchan', translate('Server酱 SCKEY')) o.rmempty = true o.description = translate('微信推送,基于Server酱服务,请自行登录 http://sc.ftqq.com/ 绑定并获取 SCKEY。') +-- Dingding + +o = s:option(Value, 'dd_token', translate('Dingding Bot Token')) +o.rmempty = true +o.description = translate('创建一个群机器人并获取API Token,设置安全关键字为:京东') + -- telegram o = s:option(Value, 'tg_token', translate('Telegram Bot Token')) diff --git a/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm b/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm index d2edd25cb..fe185edd2 100644 --- a/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm +++ b/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm @@ -1,140 +1,165 @@ <%+cbi/valueheader%> - <%+cbi/valuefooter%> diff --git a/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/gen_cookieset.lua b/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/gen_cookieset.lua index d4cabd4ba..9809ba375 100644 --- a/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/gen_cookieset.lua +++ b/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/gen_cookieset.lua @@ -15,7 +15,7 @@ local data = { JD_DailyBonusTimeOut = uci:get('jd-dailybonus', '@global[0]', 'out') } -for i, v in pairs( uci:get('jd-dailybonus', '@global[0]', 'Cookies') ) do +for i, v in pairs( uci:get('jd-dailybonus', '@global[0]', 'Cookies') or {} ) do table.insert(data.CookiesJD, {["cookie"]=v}) end diff --git a/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh b/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh index 7e2732a80..1141d77b9 100755 --- a/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh +++ b/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh @@ -77,6 +77,14 @@ notify() { fi wget-ssl -q --output-document=/dev/null --post-data="text=$title~&desp=$desc" $serverurl$sckey.send fi + + #Dingding + dtoken=$(uci_get_by_type global dd_token) + if [ ! -z $dtoken ]; then + DTJ_FILE=/tmp/jd-djson.json + echo "{\"msgtype\": \"markdown\",\"markdown\": {\"title\":\"${title}\",\"text\":\"${title}
${desc}\"}}" > ${DTJ_FILE} + wget-ssl -q --output-document=/dev/null --header="Content-Type: application/json" --post-file=/tmp/jd-djson.json "https://oapi.dingtalk.com/robot/send?access_token=${dtoken}" + fi #telegram TG_BOT_TOKEN=$(uci_get_by_type global tg_token)