From 434b834160fdf5a1279b89a06da31ff30a28dcec Mon Sep 17 00:00:00 2001
From: Beginner <70857188+Beginner-Go@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:32:23 +0800
Subject: [PATCH] luci-app-jd-dailybonus: Keep up to date from jerrykuku
(#6253)
* luci-app-jd-dailybonus: Keep up to date from jerrykuku
* luci-app-jd-dailybonus: Keep up to date from jerrykuku
---
package/lean/luci-app-jd-dailybonus/Makefile | 7 +-
.../luasrc/controller/jd-dailybonus.lua | 25 +-
.../view/jd-dailybonus/update_service.htm | 317 +++++++-----------
.../root/lib/upgrade/keep.d/jd-dailybonus | 1 +
.../usr/share/jd-dailybonus/JD_DailyBonus.js | 122 ++++---
.../usr/share/jd-dailybonus/gen_cookieset.lua | 19 ++
.../usr/share/jd-dailybonus/jd_cookie.lua | 168 ----------
.../root/usr/share/jd-dailybonus/newapp.sh | 3 +-
.../root/usr/share/jd-dailybonus/requests.lua | 303 -----------------
.../root/www/jd-dailybonus/jquery.min.js | 2 -
.../root/www/jd-dailybonus/qrcode.min.js | 1 -
11 files changed, 226 insertions(+), 742 deletions(-)
create mode 100644 package/lean/luci-app-jd-dailybonus/root/lib/upgrade/keep.d/jd-dailybonus
create mode 100644 package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/gen_cookieset.lua
delete mode 100644 package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/jd_cookie.lua
delete mode 100644 package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/requests.lua
delete mode 100644 package/lean/luci-app-jd-dailybonus/root/www/jd-dailybonus/jquery.min.js
delete mode 100644 package/lean/luci-app-jd-dailybonus/root/www/jd-dailybonus/qrcode.min.js
diff --git a/package/lean/luci-app-jd-dailybonus/Makefile b/package/lean/luci-app-jd-dailybonus/Makefile
index 026215a65..6d97b6092 100644
--- a/package/lean/luci-app-jd-dailybonus/Makefile
+++ b/package/lean/luci-app-jd-dailybonus/Makefile
@@ -44,6 +44,7 @@ define Package/luci-app-jd-dailybonus/install
$(INSTALL_DIR) $(1)/usr/share/jd-dailybonus
$(INSTALL_BIN) ./root/usr/share/jd-dailybonus/*.sh $(1)/usr/share/jd-dailybonus/
$(INSTALL_DATA) ./root/usr/share/jd-dailybonus/*.js $(1)/usr/share/jd-dailybonus/
+ $(INSTALL_DATA) ./root/usr/share/jd-dailybonus/*.lua $(1)/usr/share/jd-dailybonus/
$(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d
$(INSTALL_DATA) ./root/usr/share/rpcd/acl.d/* $(1)/usr/share/rpcd/acl.d
@@ -51,9 +52,6 @@ define Package/luci-app-jd-dailybonus/install
$(INSTALL_DIR) $(1)/usr/lib/node
cp -pR ./root/usr/lib/node/* $(1)/usr/lib/node
- $(INSTALL_DIR) $(1)/www/jd-dailybonus
- $(INSTALL_DATA) ./root//www/jd-dailybonus/* $(1)/www/jd-dailybonus
-
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller
$(INSTALL_DATA) ./luasrc/controller/* $(1)/usr/lib/lua/luci/controller/
@@ -63,6 +61,9 @@ define Package/luci-app-jd-dailybonus/install
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/jd-dailybonus
$(INSTALL_DATA) ./luasrc/view/jd-dailybonus/* $(1)/usr/lib/lua/luci/view/jd-dailybonus/
+ $(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+ $(INSTALL_DATA) ./root/lib/upgrade/keep.d/* $(1)/lib/upgrade/keep.d/
+
endef
$(eval $(call BuildPackage,luci-app-jd-dailybonus))
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 be389ccaa..ca5195c0a 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
@@ -17,13 +17,6 @@ function index()
entry({'admin', 'services', 'jd-dailybonus', 'check_login'}, call('check_login')) -- 获取二维码
end
--- 写入配置
-function write_json(file, content)
- local json = require 'luci.jsonc'
- local f = assert(io.open(file, 'w'))
- f:write(json.stringify(content, 1))
- f:close()
-end
-- 执行程序
function run()
local e = {}
@@ -31,14 +24,7 @@ function run()
local data = luci.http.formvalue()
uci:tset('jd-dailybonus', '@global[0]', data)
uci:commit('jd-dailybonus')
- local json_data = {
- CookieJD = data.cookie,
- CookieJD2 = data.cookie2:len() == 0 and nil or data.cookie2,
- JD_DailyBonusDelay = data.stop,
- JD_DailyBonusTimeOut = data.out
- }
- write_json('/root/CookieSet.json', json_data)
- write_json('/www/CookieSet.json', json_data)
+ 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
@@ -129,15 +115,8 @@ function check_login()
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)
- local json_data = {
- CookieJD = uci:get('jd-dailybonus', '@global[0]', 'cookie'),
- CookieJD2 = uci:get('jd-dailybonus', '@global[0]', 'cookie2'),
- JD_DailyBonusDelay = uci:get('jd-dailybonus', '@global[0]', 'stop'),
- JD_DailyBonusTimeOut = uci:get('jd-dailybonus', '@global[0]', 'out')
- }
- write_json('/root/CookieSet.json', json_data)
- write_json('/www/CookieSet.json', json_data)
uci:commit('jd-dailybonus')
+ luci.sys.call('lua /usr/share/jd-dailybonus/gen_cookieset.lua')
return_json.cookie = cookieStr
end
diff --git a/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm b/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm
index 50120662f..f5290e99e 100644
--- a/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm
+++ b/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm
@@ -1,9 +1,5 @@
<%+cbi/valueheader%>
-
-
-
+