OpenWrt/small-package
1
0
Fork 0
mirror of https://github.com/kenzok8/small-package synced 2025-09-18 18:51:16 +08:00
Code Issues Projects Releases Wiki Activity

update-12.28

Browse Source
This commit is contained in:
github-actions[bot]
2021-12-28 20:32:26 +08:00
parent 3f2643e210
commit f14ef1fbd2
5 changed files with 65 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
luci-app-easyupdate/luasrc/view/easyupdate/button.htm
View File

@ -119,12 +119,23 @@ function check_version() {
if (r.code == 1) { if (r.code == 1) {
XHR.poll(1, '<%=url([[admin]], [[services]], [[easyupdate]], [[getlog]])%>', null,(x, r) => { XHR.poll(1, '<%=url([[admin]], [[services]], [[easyupdate]], [[getlog]])%>', null,(x, r) => {
update_status_message('notice', r.data); update_status_message('notice', r.data);
if (r.data.indexOf("Commencing upgrade") > -1 ){ if (r.data.indexOf("Image check failed.") > -1){
XHR.halt() XHR.halt()
setTimeout(() => { update_status_message('warning', r.data);
location.replace(document.location.origin) document.getElementById('update_apply_overlay').addEventListener("click", (e)=>{
},180000); update_status_message()
})
}else{
if (r.data.indexOf("Commencing upgrade") > -1 ){
XHR.halt()
setTimeout(() => {
location.replace(document.location.origin)
},180000);
}else{
update_status_message('notice', r.data);
}
} }
}) })
} else { } else {
tb.disabled = false; tb.disabled = false;

4
luci-app-easyupdate/root/usr/bin/easyupdate.sh
View File

@ -68,7 +68,7 @@ function flashFirmware() {
echo 'Get whether to save the configuration(读取是否保存配置)' echo 'Get whether to save the configuration(读取是否保存配置)'
keepconfig=$(uci get easyupdate.main.keepconfig) keepconfig=$(uci get easyupdate.main.keepconfig)
if [ $keepconfig -eq 1 ]; then if [ $keepconfig -eq 1 ]; then
keepconfig='' keepconfig=' '
res='yes' res='yes'
else else
keepconfig='-n ' keepconfig='-n '
@ -76,7 +76,7 @@ function flashFirmware() {
fi fi
echo "Whether to save the configuration(读取是否保存配置):$res" echo "Whether to save the configuration(读取是否保存配置):$res"
echo 'Start flash firmware, log output in /tmp/easyupdate.log(开始刷写固件，日志输出在/tmp/easyupdate.log)' echo 'Start flash firmware, log output in /tmp/easyupdate.log(开始刷写固件，日志输出在/tmp/easyupdate.log)'
sysupgrade $keepconfig"/tmp/$file" >/tmp/easyupdate.log 2>&1 & sysupgrade $keepconfig$file >/tmp/easyupdate.log 2>&1 &
fi fi
} }

81
luci-app-godproxy/rulesupdate.log
View File

@ -1,40 +1,41 @@
2021-12-24 21:27:10: ------------------- 规则更新 ----------------------- 2021-12-28 03:20:34: ------------------- 规则更新 -----------------------
2021-12-24 21:27:10: ==================================================== 2021-12-28 03:20:34: ====================================================
2021-12-24 21:27:10: 开始更新koolproxy的规则，请等待... 2021-12-28 03:20:34: 开始更新koolproxy的规则，请等待...
2021-12-24 21:27:10: --------------------------------------------------------------------------------------- 2021-12-28 03:20:34: ---------------------------------------------------------------------------------------
2021-12-24 21:27:10: Yhosts规则本地版本号： 202111082343 2021-12-28 03:20:34: Yhosts规则本地版本号： 202111082343
2021-12-24 21:27:10: Yhosts规则在线版本号： 202111082343 2021-12-28 03:20:34: Yhosts规则在线版本号： 202111082343
2021-12-24 21:27:10: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊! 2021-12-28 03:20:34: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊!
2021-12-24 21:27:10: --------------------------------------------------------------------------------------- 2021-12-28 03:20:34: ---------------------------------------------------------------------------------------
2021-12-24 21:27:11: Antiad规则本地版本号： 20211220024136 2021-12-28 03:20:34: Antiad规则本地版本号： 20211223231647
2021-12-24 21:27:11: Antiad规则在线版本号： 20211223231647 2021-12-28 03:20:34: Antiad规则在线版本号： 20211227222001
2021-12-24 21:27:11: 检测到新版本 Antiad规则 列表，开始更新... 2021-12-28 03:20:34: 检测到新版本 Antiad规则 列表，开始更新...
2021-12-24 21:27:11: 将临时文件覆盖到原始 Antiad规则 文件 2021-12-28 03:20:34: 将临时文件覆盖到原始 Antiad规则 文件
2021-12-24 21:27:11: --------------------------------------------------------------------------------------- 2021-12-28 03:20:34: ---------------------------------------------------------------------------------------
2021-12-24 21:27:11: StevenBlack规则本地版本号： 21 December 2021 02:43:31 2021-12-28 03:20:34: StevenBlack规则本地版本号： 21 December 2021 02:43:31
2021-12-24 21:27:11: StevenBlack规则在线版本号： 21 December 2021 02:43:31 2021-12-28 03:20:34: StevenBlack规则在线版本号： 25 December 2021 18:27:57
2021-12-24 21:27:11: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊! 2021-12-28 03:20:34: 检测到新版本 StevenBlack规则 列表，开始更新...
2021-12-24 21:27:11: --------------------------------------------------------------------------------------- 2021-12-28 03:20:34: 将临时文件覆盖到原始 StevenBlack规则 文件
2021-12-24 21:27:11: AdGuard DNS规则本地版本号： 2021-12-22T00:21:54.760Z 2021-12-28 03:20:34: ---------------------------------------------------------------------------------------
2021-12-24 21:27:11: AdGuard DNS规则在线版本号： 2021-12-24T18:06:01.270Z 2021-12-28 03:20:35: AdGuard DNS规则本地版本号： 2021-12-24T18:06:01.270Z
2021-12-24 21:27:11: 检测到新版本 AdGuard DNS规则 列表，开始更新... 2021-12-28 03:20:35: AdGuard DNS规则在线版本号： 2021-12-28T00:20:54.946Z
2021-12-24 21:27:11: 将临时文件覆盖到原始 AdGuard DNS规则 文件 2021-12-28 03:20:35: 检测到新版本 AdGuard DNS规则 列表，开始更新...
2021-12-24 21:27:11: --------------------------------------------------------------------------------------- 2021-12-28 03:20:35: 将临时文件覆盖到原始 AdGuard DNS规则 文件
2021-12-24 21:27:11: ADgk规则本地版本号： 20211220225935 2021-12-28 03:20:35: ---------------------------------------------------------------------------------------
2021-12-24 21:27:11: ADgk规则在线版本号： 20211220225935 2021-12-28 03:20:35: ADgk规则本地版本号： 20211220225935
2021-12-24 21:27:11: 检测到 ADgk规则 本地版本号和在线版本号相同，那还更新个毛啊! 2021-12-28 03:20:35: ADgk规则在线版本号： 20211220225935
2021-12-24 21:27:11: 跳过优化 补充规则Yhosts。。。。。 2021-12-28 03:20:35: 检测到 ADgk规则 本地版本号和在线版本号相同，那还更新个毛啊!
2021-12-24 21:27:11: 正在优化 补充规则antiad。。。。。 2021-12-28 03:20:35: 跳过优化 补充规则Yhosts。。。。。
2021-12-24 21:27:12: 跳过优化 补充规则StevenBlack。。。。。 2021-12-28 03:20:35: 正在优化 补充规则antiad。。。。。
2021-12-24 21:27:12: 正在优化 补充规则AdGuard DNS。。。。。 2021-12-28 03:20:35: 正在优化 补充规则steven。。。。。
2021-12-24 21:27:19: 跳过优化 ADgk规则。。。。。 2021-12-28 03:20:36: 正在优化 补充规则AdGuard DNS。。。。。
2021-12-24 21:27:19: 所有规则更新并优化完毕！ 2021-12-28 03:20:43: 跳过优化 ADgk规则。。。。。
2021-12-24 21:27:19: ==================================================== 2021-12-28 03:20:43: 所有规则更新并优化完毕！
2021-12-24 21:27:20: -------------------AdGuard规则 version 2021-12-24T18:06:01.270Z 2021-12-28 03:20:43: ====================================================
2021-12-24 21:27:20: -------------------Antiad规则 version 20211223231647 2021-12-28 03:20:44: -------------------AdGuard规则 version 2021-12-28T00:20:54.946Z
2021-12-24 21:27:20: -------------------Banben规则 version 20211220225935 2021-12-28 03:20:44: -------------------Antiad规则 version 20211227222001
2021-12-24 21:27:20: -------------------Yhosts规则 version 202111082343 2021-12-28 03:20:44: -------------------Banben规则 version 20211220225935
2021-12-24 21:27:20: -------------------Steven规则 version 21 December 2021 02:43:31 2021-12-28 03:20:44: -------------------Yhosts规则 version 202111082343
2021-12-24 21:27:20: -------------------静态规则 version 2021-12-20 17:15 2021-12-28 03:20:44: -------------------Steven规则 version 25 December 2021 18:27:57
2021-12-24 21:27:20: ------------------- 内置规则更新成功！ ------------------- 2021-12-28 03:20:44: -------------------静态规则 version 2021-12-25 10:30
2021-12-24 21:27:20: ------------------- 规则更新成功！ ------------------- 2021-12-28 03:20:44: ------------------- 内置规则更新成功！ -------------------
2021-12-28 03:20:44: ------------------- 规则更新成功！ -------------------

3
luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js
View File

@ -80,6 +80,9 @@ return view.extend({
o = s.taboption('firmware', form.Flag, 'coremark', _('CoreMark'),_('第一次开机后是否运行CPU跑分测试')); o = s.taboption('firmware', form.Flag, 'coremark', _('CoreMark'),_('第一次开机后是否运行CPU跑分测试'));
o.rmempty = false; o.rmempty = false;
o = s.taboption('firmware', form.Flag, 'cookie_p', _('Persistent cookies'),_('保持后台登录状态,避免每次关闭浏览器后都需要重新登录'));
o.default = o.enabled;
return m.render(); return m.render();
} }
}); });

5
luci-app-wizard/po/zh_Hans/wizard.po
View File

@ -17,7 +17,7 @@ msgid "If you are using this router for the first time, please configure it here
msgstr "如果你首次使用这个路由器，请在这里简单设置。" msgstr "如果你首次使用这个路由器，请在这里简单设置。"
msgid "Three different ways to access the Internet, please choose according to your own situation." msgid "Three different ways to access the Internet, please choose according to your own situation."
msgstr "三种不同的上网方式，请您根据自身情况进行选择。" msgstr "二种不同的上网方式，请您根据自身情况进行选择。"
msgid "Set the router's wireless name and password. For more advanced settings, please go to the Network-Wireless page." msgid "Set the router's wireless name and password. For more advanced settings, please go to the Network-Wireless page."
msgstr "设置路由器的无线名字和密码，更多高级设置请进入 网络-无线 页面。" msgstr "设置路由器的无线名字和密码，更多高级设置请进入 网络-无线 页面。"
@ -39,3 +39,6 @@ msgstr "软件包自动更新"
msgid "Firmware Upgrade Notice" msgid "Firmware Upgrade Notice"
msgstr "固件更新提醒" msgstr "固件更新提醒"
msgid "Persistent cookies"
msgstr "持久化登录"