From 4e81f1b848e0eb7c662ac40337a416f28bfd9525 Mon Sep 17 00:00:00 2001
From: action <actions@github.com>
Date: Fri, 17 Jul 2026 14:11:04 +0800
Subject: [PATCH] update 2026-07-17 14:11:04

---
 .../model/cbi/passwall/client/rule_list.lua   |  4 +++-
 luci-app-passwall/luasrc/passwall/api.lua     |  3 ---
 .../luasrc/view/passwall/cbi/footer.htm       | 17 +++++++++++++
 .../view/passwall/cbi/optimize_cbi_ui.htm     | 24 -------------------
 v2ray-geodata/Makefile                        |  4 ++--
 5 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100644 luci-app-passwall/luasrc/view/passwall/cbi/optimize_cbi_ui.htm

diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua
index 030874b3..901a9546 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua
@@ -9,6 +9,8 @@ local gfwlist_path = "/usr/share/passwall/rules/gfwlist"
 local chnlist_path = "/usr/share/passwall/rules/chnlist"
 local chnroute_path = "/usr/share/passwall/rules/chnroute"
 
+api.set_default_cbi()
+
 m = Map(appname)
 api.set_apply_on_parse(m)
 
@@ -335,4 +337,4 @@ m.on_before_save = function(self)
 	m:set("@global[0]", "flush_set", "1")
 end
 
-return m
+return api.return_map(m)
diff --git a/luci-app-passwall/luasrc/passwall/api.lua b/luci-app-passwall/luasrc/passwall/api.lua
index 62b05f75..4571ceb0 100644
--- a/luci-app-passwall/luasrc/passwall/api.lua
+++ b/luci-app-passwall/luasrc/passwall/api.lua
@@ -1541,9 +1541,6 @@ function set_apply_on_parse(map)
 			if old then old(self) end
 			map:set("@global[0]", "timestamp", os.time())
 		end
-		-- 优化页面
-		local cbi = require "luci.cbi"
-		map:append(cbi.Template(appname .. "/cbi/optimize_cbi_ui"))
 	end
 end
 
diff --git a/luci-app-passwall/luasrc/view/passwall/cbi/footer.htm b/luci-app-passwall/luasrc/view/passwall/cbi/footer.htm
index 46a25d3e..10469c14 100644
--- a/luci-app-passwall/luasrc/view/passwall/cbi/footer.htm
+++ b/luci-app-passwall/luasrc/view/passwall/cbi/footer.htm
@@ -1 +1,18 @@
 <!-- map footer -->
+<script type="text/javascript">
+	document.addEventListener("DOMContentLoaded", function () {
+		setTimeout(updateElements, 200);
+		function updateElements() {
+			//删除value控件和描述之间多余换行
+			document.querySelectorAll("div.cbi-value-description").forEach(function(descDiv) {
+				var prev = descDiv.previousSibling;
+				while (prev && prev.nodeType === Node.TEXT_NODE && prev.textContent.trim() === "") {
+					prev = prev.previousSibling;
+				}
+				if (prev && prev.nodeType === Node.ELEMENT_NODE && prev.tagName === "BR") {
+					prev.remove();
+				}
+			});
+		}
+	});
+</script>
\ No newline at end of file
diff --git a/luci-app-passwall/luasrc/view/passwall/cbi/optimize_cbi_ui.htm b/luci-app-passwall/luasrc/view/passwall/cbi/optimize_cbi_ui.htm
deleted file mode 100644
index 579d0383..00000000
--- a/luci-app-passwall/luasrc/view/passwall/cbi/optimize_cbi_ui.htm
+++ /dev/null
@@ -1,24 +0,0 @@
-<script type="text/javascript">
-	document.addEventListener("DOMContentLoaded", function () {
-		setTimeout(updateElements, 200);
-		function updateElements() {
-			//修正上移、下移按钮名称
-			document.querySelectorAll("input.btn.cbi-button.cbi-button-up").forEach(function(btn) {
-				btn.value = "<%:Move up%>";
-			});
-			document.querySelectorAll("input.btn.cbi-button.cbi-button-down").forEach(function(btn) {
-				btn.value = "<%:Move down%>";
-			});
-			//删除控件和说明之间的多余换行
-			document.querySelectorAll("div.cbi-value-description").forEach(function(descDiv) {
-				var prev = descDiv.previousSibling;
-				while (prev && prev.nodeType === Node.TEXT_NODE && prev.textContent.trim() === "") {
-					prev = prev.previousSibling;
-				}
-				if (prev && prev.nodeType === Node.ELEMENT_NODE && prev.tagName === "BR") {
-					prev.remove();
-				}
-			});
-		}
-	});
-</script>
diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile
index a25ea2b6..f50abab8 100644
--- a/v2ray-geodata/Makefile
+++ b/v2ray-geodata/Makefile
@@ -21,13 +21,13 @@ define Download/geoip
   HASH:=b71d1999439dde2de2d2b6844a2befa50c50211ff739785c005ca7c230a17d6a
 endef
 
-GEOSITE_VER:=20260716111426
+GEOSITE_VER:=20260717012451
 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:=13ffc92b1dc3eba4a0df478281fe618dfa4a2aec51c96c54bc25913a4d9f71de
+  HASH:=3cbf4239131963fd6eadddf4f385f8177ffd60234e1c2a744da7de9e35154ae8
 endef
 
 GEOSITE_IRAN_VER:=202607130116