diff --git a/doc/lucky1.png b/doc/lucky1.png new file mode 100644 index 00000000..a5b41b6e Binary files /dev/null and b/doc/lucky1.png differ diff --git a/doc/lucky2.png b/doc/lucky2.png new file mode 100644 index 00000000..ba4c026f Binary files /dev/null and b/doc/lucky2.png differ diff --git a/doc/lucky3.png b/doc/lucky3.png new file mode 100644 index 00000000..6fa7982f Binary files /dev/null and b/doc/lucky3.png differ diff --git a/doc/taskplan1.png b/doc/taskplan1.png deleted file mode 100644 index 1f8db7be..00000000 Binary files a/doc/taskplan1.png and /dev/null differ diff --git a/doc/taskplan2.png b/doc/taskplan2.png deleted file mode 100644 index edb45d6d..00000000 Binary files a/doc/taskplan2.png and /dev/null differ diff --git a/doc/taskplan3.png b/doc/taskplan3.png deleted file mode 100644 index d4794702..00000000 Binary files a/doc/taskplan3.png and /dev/null differ diff --git a/doc/view.png b/doc/view.png deleted file mode 100644 index 169e112f..00000000 Binary files a/doc/view.png and /dev/null differ diff --git a/doc/view2.png b/doc/view2.png deleted file mode 100644 index 9058c632..00000000 Binary files a/doc/view2.png and /dev/null differ diff --git a/luci-app-wizard/luasrc/controller/wizard.lua b/luci-app-wizard/luasrc/controller/wizard.lua index 85d2c62b..b767ccf6 100644 --- a/luci-app-wizard/luasrc/controller/wizard.lua +++ b/luci-app-wizard/luasrc/controller/wizard.lua @@ -14,6 +14,17 @@ function index() end end +local function check_wifi() + local has_wifi = false + pcall(function() + uci:foreach("wireless", "wifi-device", function(s) + has_wifi = true + return false -- 检测到任意 wifi-device 即终止遍历 + end) + end) + return has_wifi +end + function landing_page() local landing_page = uci:get("wizard", "default", "landing_page") if (luci.sys.call("pgrep routergo >/dev/null") == 0 and landing_page == "routerdog") then @@ -29,7 +40,13 @@ function landing_page() http.redirect(luci.dispatcher.build_url("admin","quickstart")); end else - http.redirect(luci.dispatcher.build_url("admin","status","dashboard")) + if check_wifi() then + -- 具备无线功能,跳转至常用无线仪表盘界面 + http.redirect(luci.dispatcher.build_url("admin","status","dashboard")) + else + -- 无无线设备(纯有线环境),跳转至原生状态概览 + http.redirect(luci.dispatcher.build_url("admin", "status", "overview")) + end end end diff --git a/v2ray-core/Makefile b/v2ray-core/Makefile index c0dba6a4..35515230 100644 --- a/v2ray-core/Makefile +++ b/v2ray-core/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-core -PKG_VERSION:=5.54.1 +PKG_VERSION:=5.54.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=1dcaa05763a7769c1b120f730430f00ca6e014ae6ea60e6afd3241f1109afbed +PKG_HASH:=fd171b094376701aa07f1bb4ab9bf4dc67bd4df014673ec545ad362360341364 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 23a3b3d9..f081d177 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=1cba1f0982cf62502fa079c66047c3d0c608196da5b3305671e68f60e917a482 endef -GEOSITE_VER:=20260922023940 +GEOSITE_VER:=20260922112956 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=df277aa430bb3d67d5d7c960dd6816e4c271616000a7900486b903091d39b393 + HASH:=ccfd5caee2947964da989f6b94cc3c96f068cba198b163f3ac64def70a0addb5 endef GEOSITE_IRAN_VER:=202609210145