diff --git a/package/lean/luci-app-leigod-acc/Makefile b/package/lean/luci-app-leigod-acc/Makefile index 7ea702b07..1e29281fd 100644 --- a/package/lean/luci-app-leigod-acc/Makefile +++ b/package/lean/luci-app-leigod-acc/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=Luci for Leigod Game Accelerater LUCI_PKGARCH:=all LUCI_DEPENDS:=+libpcap +iptables +kmod-ipt-nat +iptables-mod-tproxy +kmod-ipt-tproxy +kmod-tun +kmod-netem +tc-full +kmod-ipt-ipset +ipset +curl +miniupnpd +conntrack +conntrackd +leigod-acc PKG_VERSION:=1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-leigod-acc/luasrc/controller/acc.lua b/package/lean/luci-app-leigod-acc/luasrc/controller/acc.lua index 896d2205a..b7c11cdd4 100644 --- a/package/lean/luci-app-leigod-acc/luasrc/controller/acc.lua +++ b/package/lean/luci-app-leigod-acc/luasrc/controller/acc.lua @@ -5,6 +5,7 @@ function index() entry({ "admin", "services", "acc" }, alias("admin", "services", "acc", "service"), translate("Leigod Acc"), 50) entry({ "admin", "services", "acc", "service" }, cbi("leigod/service"), translate("Leigod Service"), 30).i18n = "acc" entry({ "admin", "services", "acc", "device" }, cbi("leigod/device"), translate("Leigod Device"), 50).i18n = "acc" + entry({ "admin", "services", "acc", "app" }, cbi("leigod/app"), translate("Leigod App"), 60).i18n = "acc" entry({ "admin", "services", "acc", "notice" }, cbi("leigod/notice"), translate("Leigod Notice"), 80).i18n = "acc" entry({ "admin", "services", "acc", "status" }, call("get_acc_status")).leaf = true entry({ "admin", "services", "acc", "start_acc_service" }, call("start_acc_service")) diff --git a/package/lean/luci-app-leigod-acc/luasrc/model/cbi/leigod/app.lua b/package/lean/luci-app-leigod-acc/luasrc/model/cbi/leigod/app.lua new file mode 100644 index 000000000..05fb606e5 --- /dev/null +++ b/package/lean/luci-app-leigod-acc/luasrc/model/cbi/leigod/app.lua @@ -0,0 +1,7 @@ +require("luci.util") + +mp = Map("accelerator") + +mp:section(SimpleSection).template = "leigod/app" + +return mp \ No newline at end of file diff --git a/package/lean/luci-app-leigod-acc/luasrc/model/cbi/leigod/service.lua b/package/lean/luci-app-leigod-acc/luasrc/model/cbi/leigod/service.lua index 29f7f2ccf..d6953d772 100644 --- a/package/lean/luci-app-leigod-acc/luasrc/model/cbi/leigod/service.lua +++ b/package/lean/luci-app-leigod-acc/luasrc/model/cbi/leigod/service.lua @@ -1,9 +1,21 @@ -local uci = require "luci.model.uci".cursor() +local uci = require "luci.model.uci".cursor() -- config -m = Map("accelerator") -m.title = translate("Leigod Accelerator Config") -m.description = translate("Control Accelerator Config") +m = Map("accelerator") +m.title = translate("Leigod Accelerator Config") +m.description = translate("Control Accelerator Config") + +s = m:section(TypedSection, "system") +s.addremove = false +s.anonymous = true + +enable = s:option(Flag,"enabled" ,translate("Enable")) +enable.rmempty = false +enable.default = 0 + +tun = s:option(Flag,"tun" ,translate("Tunnel Mode")) +tun.rmempty = false +tun.default = 0 m:section(SimpleSection).template = "leigod/service" diff --git a/package/lean/luci-app-leigod-acc/luasrc/view/leigod/app.htm b/package/lean/luci-app-leigod-acc/luasrc/view/leigod/app.htm new file mode 100644 index 000000000..530743a07 --- /dev/null +++ b/package/lean/luci-app-leigod-acc/luasrc/view/leigod/app.htm @@ -0,0 +1,6 @@ + +
+

+ +

+
\ No newline at end of file diff --git a/package/lean/luci-app-leigod-acc/luasrc/view/leigod/service.htm b/package/lean/luci-app-leigod-acc/luasrc/view/leigod/service.htm index 6796134f4..7eca3745f 100644 --- a/package/lean/luci-app-leigod-acc/luasrc/view/leigod/service.htm +++ b/package/lean/luci-app-leigod-acc/luasrc/view/leigod/service.htm @@ -1,4 +1,4 @@ - +
diff --git a/package/lean/luci-app-leigod-acc/po/zh-cn/leigo-acc.po b/package/lean/luci-app-leigod-acc/po/zh-cn/leigo-acc.po index b93f2e885..caeff7728 100644 --- a/package/lean/luci-app-leigod-acc/po/zh-cn/leigo-acc.po +++ b/package/lean/luci-app-leigod-acc/po/zh-cn/leigo-acc.po @@ -8,14 +8,17 @@ msgstr "服务控制" msgid "Leigod Device" msgstr "设备管理" +msgid "Leigod App" +msgstr "雷神移动端APP" + msgid "Leigod Notice" msgstr "加速公告" msgid "Leigod Accelerator Config" -msgstr "加速器配置" +msgstr "雷神加速器 - 专线加速游戏,按分钟计费可暂停,玩多久算多久,时长永久有效" msgid "Control Accelerator Config" -msgstr "控制加速配置选项" +msgstr "加速时长6端通用 (Windows端 ｜ Mac端 ｜ NN ｜ 手机端 ｜ 主机端 ｜ 路由器)" msgid "Acc_Service_Name" msgstr "服务名称" @@ -80,8 +83,8 @@ msgstr "手机设备" msgid "None_Catalog" msgstr "未分类设备" -msgid "None" -msgstr "无数据" +msgid "Tunnel Mode" +msgstr "TUN 模式" msgid "PC_Catalog" msgstr "PC 设备" diff --git a/package/lean/luci-app-leigod-acc/root/etc/config/accelerator b/package/lean/luci-app-leigod-acc/root/etc/config/accelerator index a2511878b..5cf62be95 100644 --- a/package/lean/luci-app-leigod-acc/root/etc/config/accelerator +++ b/package/lean/luci-app-leigod-acc/root/etc/config/accelerator @@ -3,6 +3,8 @@ config system 'base' option url 'https://opapi.nn.com/speed/router/plug/check' option heart 'https://opapi.nn.com/speed/router/heartbeat' option base_url 'https://opapi.nn.com/speed' + option enabled '0' + option tun '0' config bind 'bind' diff --git a/package/lean/luci-app-leigod-acc/root/etc/init.d/acc b/package/lean/luci-app-leigod-acc/root/etc/init.d/acc index 93fc99c2c..f10dce812 100755 --- a/package/lean/luci-app-leigod-acc/root/etc/init.d/acc +++ b/package/lean/luci-app-leigod-acc/root/etc/init.d/acc @@ -126,7 +126,6 @@ get_xiaomi_name() { echo "router is not xiaomi, use general openwrt" sbin_dir="/usr/sbin/leigod" init_dir="/etc/init.d" - show_openwrt_suggestion return 0 } @@ -144,19 +143,24 @@ start_service_daemon() { procd_close_instance # start check update # update_plugin & - # start led light - # /etc/init.d/internetled start } # proc start service start_service() { - # prepare env - # prepare_env - # run service as daemon + + config_load "accelerator" + + local enabled + config_get_bool enabled base enabled 0 + + local tun + config_get_bool tun base tun 0 + + [ "${enabled}" -gt 0 ] || return + [ "${tun}" -eq 1 ] && args="--mode tun" + get_device_arch - get_xiaomi_name start_service_daemon } - diff --git a/package/lean/luci-app-leigod-acc/root/etc/uci-defaults/99-accelerator-config b/package/lean/luci-app-leigod-acc/root/etc/uci-defaults/99-accelerator-config index b1b98e404..a71fd006c 100755 --- a/package/lean/luci-app-leigod-acc/root/etc/uci-defaults/99-accelerator-config +++ b/package/lean/luci-app-leigod-acc/root/etc/uci-defaults/99-accelerator-config @@ -18,7 +18,12 @@ uci set accelerator.base.heart='https://opapi.nn.com/speed/router/heartbeat' uci set accelerator.base.base_url='https://opapi.nn.com/speed' uci commit accelerator -echo "Fistboot Disable " +uci -q batch <<-EOF >/dev/null + delete ucitrack.@accelerator[-1] + add ucitrack accelerator + set ucitrack.@accelerator[-1].init=acc + commit ucitrack +EOF -/etc/init.d/acc stop -/etc/init.d/acc disable +rm -f /tmp/luci-indexcache +exit 0 diff --git a/package/lean/luci-app-leigod-acc/root/www/leigodapp.png b/package/lean/luci-app-leigod-acc/root/www/leigodapp.png new file mode 100644 index 000000000..dcf939e29 Binary files /dev/null and b/package/lean/luci-app-leigod-acc/root/www/leigodapp.png differ diff --git a/package/lean/luci-app-leigod-acc/root/www/leigodbind.png b/package/lean/luci-app-leigod-acc/root/www/leigodbind.png new file mode 100644 index 000000000..8d973fdab Binary files /dev/null and b/package/lean/luci-app-leigod-acc/root/www/leigodbind.png differ