diff --git a/package/ctcgfw/luci-app-jd-dailybonus/Makefile b/package/ctcgfw/luci-app-jd-dailybonus/Makefile index 42a35a12c8..eff98275f7 100644 --- a/package/ctcgfw/luci-app-jd-dailybonus/Makefile +++ b/package/ctcgfw/luci-app-jd-dailybonus/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Luci for JD dailybonus Script -LUCI_DEPENDS:=+lua +node +node-request +wget-ssl +LUCI_DEPENDS:=+libuci-lua +lua +node +node-request +wget-ssl LUCI_PKGARCH:=all PKG_NAME:=luci-app-jd-dailybonus diff --git a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua index 95f1515885..e31f65808f 100644 --- a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua +++ b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua @@ -20,18 +20,11 @@ end -- 执行程序 function run() - local e = {} - local uci = luci.model.uci.cursor() - local data = luci.http.formvalue() - uci:tset('jd-dailybonus', '@global[0]', data) - uci:commit('jd-dailybonus') - luci.sys.call('lua /usr/share/jd-dailybonus/gen_cookieset.lua') - luci.sys.call('/usr/share/jd-dailybonus/newapp.sh -r') - luci.sys.call('/usr/share/jd-dailybonus/newapp.sh -a') - e.error = 0 - - luci.http.prepare_content('application/json') - luci.http.write_json(e) + local running = luci.sys.call("busybox ps -w | grep JD_DailyBonus.js | grep -v grep >/dev/null") == 0 + if not running then + luci.sys.call('/usr/share/jd-dailybonus/newapp.sh -r') + end + luci.http.write('') end --检查更新 @@ -127,6 +120,9 @@ end function get_log() local fs = require "nixio.fs" - local log = fs.readfile("/var/log/jd_dailybonus.log") or "" - luci.http.write(log) + local e = {} + e.running = luci.sys.call("busybox ps -w | grep JD_DailyBonus.js | grep -v grep >/dev/null") == 0 + 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 diff --git a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua index 61f5f31116..c492942e46 100644 --- a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua +++ b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/log.lua @@ -1,16 +1,9 @@ -local fs = require "nixio.fs" - log = SimpleForm("logview") log.submit = false log.reset = false --- [[ 日志显示 ]]-- -t = log:field(TextValue, "1", nil) -t.rmempty = true -t.rows = 30 -function t.cfgvalue() - return fs.readfile("/var/log/jd_dailybonus.log") or "" -end -t.readonly="readonly" +t = log:field(DummyValue, '', '') +t.rawhtml = true +t.template = 'jd-dailybonus/log' return log \ No newline at end of file diff --git a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm index cca7093ba3..8690dee1b8 100644 --- a/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm +++ b/package/ctcgfw/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm @@ -1,4 +1,70 @@ <%+cbi/valueheader%> + +