zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: zhao:4d7e55552f5202a7aac40be36d55e74aec0783b9
Branches Tags
zhao:v5
...
compare: zhao:6a957b17b21f14c18e3ec51f89bd068c3e802e01
Branches Tags
zhao:v5

2 Commits
4d7e55552f ... 6a957b17b2

Author SHA1 Message Date
gitea-action
6a957b17b2 luci-app-passwall: sync upstream 
last commit: cad3d3ec96
 2025-04-17 22:30:30 +08:00
gitea-action
35797793ec luci-app-passwall: sync upstream 
last commit: 434add58f8
 2025-04-17 21:00:28 +08:00
3 changed files with 17 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
luci-app-passwall/luasrc/controller/passwall.lua
View File

@ -584,7 +584,7 @@ function geo_view()
else else
geo_type, file_path = "geosite", geosite_path geo_type, file_path = "geosite", geosite_path
end end
cmd = string.format("geoview -type %s -action lookup -input '%s' -value '%s'", geo_type, file_path, value) cmd = string.format("geoview -type %s -action lookup -input '%s' -value '%s' -lowmem=true", geo_type, file_path, value)
geo_string = luci.sys.exec(cmd):lower() geo_string = luci.sys.exec(cmd):lower()
if geo_string ~= "" then if geo_string ~= "" then
local lines = {} local lines = {}
@ -603,7 +603,7 @@ function geo_view()
if prefix and list and list ~= "" then if prefix and list and list ~= "" then
geo_type = prefix:sub(1, -2) geo_type = prefix:sub(1, -2)
file_path = (geo_type == "geoip") and geoip_path or geosite_path file_path = (geo_type == "geoip") and geoip_path or geosite_path
cmd = string.format("geoview -type %s -action extract -input '%s' -list '%s'", geo_type, file_path, list) cmd = string.format("geoview -type %s -action extract -input '%s' -list '%s' -lowmem=true", geo_type, file_path, list)
geo_string = luci.sys.exec(cmd) geo_string = luci.sys.exec(cmd)
end end
end end

2
luci-app-passwall/luasrc/view/passwall/global/faq.htm
View File

@ -28,7 +28,7 @@ local api = require "luci.passwall.api"
line-height: 1.2rem; line-height: 1.2rem;
} }
</style> </style>
<div class="cbi-section cbi-tblsection dns-con"> <div class="dns-con">
<div id="faq_dns"> <div id="faq_dns">
<ul> <ul>
<b class="faq-title"><%:DNS related issues:%></b> <b class="faq-title"><%:DNS related issues:%></b>

14
luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm
View File

@ -78,5 +78,19 @@ local api = require "luci.passwall.api"
btn.value = QueryText; btn.value = QueryText;
}) })
} }
document.getElementById("geoview.lookup").addEventListener("keydown", function(event) {
if (event.key === "Enter") {
event.preventDefault();
lookup_btn.click();
}
});
document.getElementById("geoview.extract").addEventListener("keydown", function(event) {
if (event.key === "Enter") {
event.preventDefault();
extract_btn.click();
}
});
//]]> //]]>
</script> </script>