diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index e78191a64..9f01f8d84 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=4.58 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm b/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm index 2e45ef321..988a65fdb 100644 --- a/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm +++ b/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm @@ -25,7 +25,7 @@ local geosite_update = api.uci_get_type("global_rules", "geosite_update", "1") = } } XHR.get('<%=api.url("update_rules")%>', { - update: checkBoxList + update: checkBoxList.join(",") }, function(x, data) { if(x && x.status == 200) { diff --git a/luci-app-passwall/root/usr/share/passwall/rule_update.lua b/luci-app-passwall/root/usr/share/passwall/rule_update.lua index 13ebcd544..d72df1972 100755 --- a/luci-app-passwall/root/usr/share/passwall/rule_update.lua +++ b/luci-app-passwall/root/usr/share/passwall/rule_update.lua @@ -49,16 +49,10 @@ local log = function(...) end end --- trim -local function trim(text) - if not text or text == "" then return "" end - return (string.gsub(text, "^%s*(.-)%s*$", "%1")) -end - -- curl local function curl(url, file, valifile) local args = { - "-sKL", "-w %{http_code}", "--retry 3", "--connect-timeout 3" + "-skL", "-w %{http_code}", "--retry 3", "--connect-timeout 3" } if file then args[#args + 1] = "-o " .. file @@ -241,8 +235,8 @@ end local function fetch_geoip() --请求geoip xpcall(function() - local json_str = api.curl_logic(geoip_api) - local json = jsonc.parse(json_str) + local return_code, content = api.curl_logic(geoip_api) + local json = jsonc.parse(content) if json.tag_name and json.assets then for _, v in ipairs(json.assets) do if v.name and v.name == "geoip.dat.sha256sum" then @@ -292,8 +286,8 @@ end local function fetch_geosite() --请求geosite xpcall(function() - local json_str = api.curl_logic(geosite_api) - local json = jsonc.parse(json_str) + local return_code, content = api.curl_logic(geosite_api) + local json = jsonc.parse(content) if json.tag_name and json.assets then for _, v in ipairs(json.assets) do if v.name and v.name == "geosite.dat.sha256sum" then