From 4f53d827e8a93a77b4376aa5e2aaf3aa381eaa7e Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 1 Jan 2020 01:12:10 +0800 Subject: [PATCH] package lienol: sync with upstream source --- package/lienol/luci-app-brook-server/Makefile | 4 +- .../model/cbi/brook_server/api/brook.lua | 20 ++- package/lienol/luci-app-passwall/Makefile | 2 +- .../luasrc/controller/passwall.lua | 25 ++-- .../luasrc/model/cbi/passwall/api/api.lua | 19 +-- .../luasrc/model/cbi/passwall/api/brook.lua | 15 +- .../luasrc/model/cbi/passwall/api/kcptun.lua | 16 +-- .../luasrc/model/cbi/passwall/api/v2ray.lua | 21 +-- .../view/passwall/node_list/node_list.htm | 28 ++-- .../root/etc/config/passwall | 2 +- .../root/etc/config/passwall_rule/chnlist | 136 +++++++----------- .../etc/config/passwall_rule/whitelist_ip | 4 - .../root/usr/share/passwall/rule_update.sh | 105 +++++++------- package/lienol/luci-app-v2ray-server/Makefile | 4 +- .../model/cbi/v2ray_server/api/v2ray.lua | 6 +- 15 files changed, 171 insertions(+), 236 deletions(-) diff --git a/package/lienol/luci-app-brook-server/Makefile b/package/lienol/luci-app-brook-server/Makefile index c638e6bc63..ece1707bba 100644 --- a/package/lienol/luci-app-brook-server/Makefile +++ b/package/lienol/luci-app-brook-server/Makefile @@ -9,8 +9,8 @@ PKG_NAME:=luci-app-brook-server LUCI_TITLE:=LuCI support for Brook Server LUCI_DEPENDS:=+brook LUCI_PKGARCH:=all -PKG_VERSION:=1.0 -PKG_RELEASE:=1-20191120 +PKG_VERSION:=1.1 +PKG_RELEASE:=1-20200101 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lienol/luci-app-brook-server/luasrc/model/cbi/brook_server/api/brook.lua b/package/lienol/luci-app-brook-server/luasrc/model/cbi/brook_server/api/brook.lua index 2ecfeb1a3f..6319ef0752 100644 --- a/package/lienol/luci-app-brook-server/luasrc/model/cbi/brook_server/api/brook.lua +++ b/package/lienol/luci-app-brook-server/luasrc/model/cbi/brook_server/api/brook.lua @@ -5,6 +5,7 @@ local uci = require"luci.model.uci".cursor() local util = require "luci.util" local i18n = require "luci.i18n" +local appname = "brook_server" local brook_api = "https://api.github.com/repos/txthinking/brook/releases/latest" @@ -12,13 +13,22 @@ local wget = "/usr/bin/wget" local wget_args = { "--no-check-certificate", "--quiet", "--timeout=100", "--tries=3" } -local curl = "/usr/bin/curl" local command_timeout = 300 local LEDE_BOARD = nil local DISTRIB_TARGET = nil local is_armv7 = false +function uci_get_type(type, config, default) + value = uci:get(appname, "@" .. type .. "[0]", config) or sys.exec( + "echo -n `uci -q get " .. appname .. ".@" .. type .. "[0]." .. + config .. "`") + if (value == nil or value == "") and (default and default ~= "") then + value = default + end + return value +end + local function _unpack(t, i) i = i or 1 if t[i] ~= nil then return t[i], _unpack(t, i + 1) end @@ -161,7 +171,9 @@ function get_api_json(url) -- function(chunk) output[#output + 1] = chunk end) -- local json_content = util.trim(table.concat(output)) - local json_content = luci.sys.exec(curl .. " -sL " .. url) + local json_content = luci.sys.exec(wget .. + " --no-check-certificate --timeout=10 -t 1 -O- " .. + url) if json_content == "" then return {} end @@ -169,9 +181,7 @@ function get_api_json(url) end function get_brook_file_path() - return uci:get("brook_server", "global", "brook_path") or - luci.sys.exec( - "echo -n `uci get brook_server.@global[0].brook_path`") + return uci_get_type("global", "brook_path", "/usr/bin/brook") end function get_brook_version(file) diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile index 6f00054a7a..90a0ae72cc 100644 --- a/package/lienol/luci-app-passwall/Makefile +++ b/package/lienol/luci-app-passwall/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=3.0 -PKG_RELEASE:=145-20191231 +PKG_RELEASE:=1-20200101 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PO2LMO:=./po2lmo diff --git a/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua b/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua index 75da7bef53..856a9f5af0 100644 --- a/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua +++ b/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua @@ -205,26 +205,23 @@ end function auto_ping_node_list() local e = {} - local json_str = luci.http.formvalue("json") - local json = luci.jsonc.parse(json_str) - local index = json["index"] - local address = json["address"] - local port = json["port"] + local index = luci.http.formvalue("index") + local address = luci.http.formvalue("address") + local port = luci.http.formvalue("port") - local obj = {} - obj.index = index + e.index = index if luci.sys.exec("echo -n `uci -q get %s.@global_other[0].use_tcping`" % appname) == "1" and luci.sys.exec("echo -n `command -v tcping`") ~= "" then - obj.ping = luci.sys.exec("echo -n `tcping -q -c 1 -i 1 -p " .. port .. - " " .. address .. - " 2>&1 | grep -o 'time=[0-9]*' | awk -F '=' '{print$2}'`") + e.ping = luci.sys.exec( + "echo -n `tcping -q -c 1 -i 1 -p " .. port .. " " .. + address .. + " 2>&1 | grep -o 'time=[0-9]*' | awk -F '=' '{print$2}'`") else - obj.ping = luci.sys.exec( - "echo -n `ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*' | awk -F '=' '{print$2}'`" % - address) + e.ping = luci.sys.exec( + "echo -n `ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*' | awk -F '=' '{print$2}'`" % + address) end - e = obj luci.http.prepare_content("application/json") luci.http.write_json(e) diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua index 97649e6353..573aaf6c34 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua @@ -5,17 +5,12 @@ local uci = require"luci.model.uci".cursor() local util = require "luci.util" local i18n = require "luci.i18n" -local appname = "passwall" - -local wget = "/usr/bin/wget" -local wget_args = { - "--no-check-certificate", "--quiet", "--timeout=100", "--tries=3" -} -local curl = "/usr/bin/curl" -local command_timeout = 300 - -local LEDE_BOARD = nil -local DISTRIB_TARGET = nil +appname = "passwall" +wget = "/usr/bin/wget" +wget_args = {"--no-check-certificate", "--quiet", "--timeout=100", "--tries=3"} +command_timeout = 300 +LEDE_BOARD = nil +DISTRIB_TARGET = nil function uci_get_type(type, config, default) value = uci:get(appname, "@" .. type .. "[0]", config) or sys.exec( @@ -180,7 +175,7 @@ function get_api_json(url) -- function(chunk) output[#output + 1] = chunk end) -- local json_content = util.trim(table.concat(output)) - local json_content = luci.sys.exec(curl .. " -sL " .. url) + local json_content = luci.sys.exec(wget .. " --no-check-certificate --timeout=10 -t 1 -O- " .. url) if json_content == "" then return {} end diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua index 9f4ef2b9da..fe6be99b03 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua @@ -8,15 +8,6 @@ local api = require "luci.model.cbi.passwall.api.api" local brook_api = "https://api.github.com/repos/txthinking/brook/releases/latest" -local wget = "/usr/bin/wget" -local wget_args = { - "--no-check-certificate", "--quiet", "--timeout=100", "--tries=3" -} -local command_timeout = 300 - -local LEDE_BOARD = nil -local DISTRIB_TARGET = nil - function get_brook_file_path() return api.uci_get_type("global_app", "brook_file") end @@ -112,8 +103,8 @@ function to_download(url) local tmp_file = util.trim(util.exec("mktemp -u -t brook_download.XXXXXX")) - local result = api.exec(wget, {"-O", tmp_file, url, api._unpack(wget_args)}, - nil, command_timeout) == 0 + local result = api.exec(api.wget, {"-O", tmp_file, url, api._unpack(api.wget_args)}, + nil, api.command_timeout) == 0 if not result then api.exec("/bin/rm", {"-f", tmp_file}) @@ -151,7 +142,7 @@ function to_move(file) end local result = api.exec("/bin/mv", {"-f", file, client_file}, nil, - command_timeout) == 0 + api.command_timeout) == 0 if not result or not fs.access(client_file) then sys.call("/bin/rm -rf /tmp/brook_download.*") diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua index 36be58500f..74c1385690 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/kcptun.lua @@ -7,15 +7,6 @@ local api = require "luci.model.cbi.passwall.api.api" local kcptun_api = "https://api.github.com/repos/xtaci/kcptun/releases/latest" -local wget = "/usr/bin/wget" -local wget_args = { - "--no-check-certificate", "--quiet", "--timeout=100", "--tries=3" -} -local command_timeout = 300 - -local LEDE_BOARD = nil -local DISTRIB_TARGET = nil - function get_kcptun_file_path() return api.uci_get_type("global_app", "kcptun_client_file") end @@ -108,8 +99,9 @@ function to_download(url) local tmp_file = util.trim(util.exec("mktemp -u -t kcptun_download.XXXXXX")) - local result = api.exec(wget, {"-O", tmp_file, url, api._unpack(wget_args)}, - nil, command_timeout) == 0 + local result = api.exec(api.wget, + {"-O", tmp_file, url, api._unpack(api.wget_args)}, + nil, api.command_timeout) == 0 if not result then api.exec("/bin/rm", {"-f", tmp_file}) @@ -191,7 +183,7 @@ function to_move(file) end local result = api.exec("/bin/mv", {"-f", file, client_file}, nil, - command_timeout) == 0 + api.command_timeout) == 0 if not result or not fs.access(client_file) then sys.call("/bin/rm -rf /tmp/kcptun_extract.*") diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua index ca8fc55e94..abd01d1a78 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua @@ -8,14 +8,6 @@ local api = require "luci.model.cbi.passwall.api.api" local v2ray_api = "https://api.github.com/repos/v2ray/v2ray-core/releases/latest" -local wget = "/usr/bin/wget" -local wget_args = { - "--no-check-certificate", "--quiet", "--timeout=100", "--tries=3" -} -local command_timeout = 300 - -local LEDE_BOARD = nil -local DISTRIB_TARGET = nil local is_armv7 = false function get_v2ray_file_path() @@ -103,8 +95,9 @@ function to_download(url) local tmp_file = util.trim(util.exec("mktemp -u -t v2ray_download.XXXXXX")) - local result = api.exec(wget, {"-O", tmp_file, url, api._unpack(wget_args)}, - nil, command_timeout) == 0 + local result = api.exec(api.wget, + {"-O", tmp_file, url, api._unpack(api.wget_args)}, + nil, api.command_timeout) == 0 if not result then api.exec("/bin/rm", {"-f", tmp_file}) @@ -159,14 +152,14 @@ function to_move(file) if is_armv7 and is_armv7 == true then result = api.exec("/bin/mv", { "-f", file .. "/v2ray_armv7", file .. "/v2ctl_armv7", client_file - }, nil, command_timeout) == 0 + }, nil, api.command_timeout) == 0 else result = api.exec("/bin/mv", { "-f", file .. "/v2ray", file .. "/v2ctl", client_file - }, nil, command_timeout) == 0 + }, nil, api.command_timeout) == 0 end + sys.call("/bin/rm -rf /tmp/v2ray_extract.*") if not result or not fs.access(client_file) then - sys.call("/bin/rm -rf /tmp/v2ray_extract.*") return { code = 1, error = i18n.translatef("Can't move new file to path: %s", @@ -176,7 +169,5 @@ function to_move(file) api.exec("/bin/chmod", {"-R", "755", client_file}) - sys.call("/bin/rm -rf /tmp/v2ray_extract.*") - return {code = 0} end diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm index 051fc86e97..d3a83d1f3c 100644 --- a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm +++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm @@ -131,10 +131,13 @@ table td, .table .td { } /* 自动Ping */ - var node_list = []; var auto_ping_value = document.getElementsByClassName('auto_ping_value'); - for(var i = 0; i < auto_ping_value.length; i++) { - var cbi_id = auto_ping_value[i].getAttribute("cbiid"); + var index = 0; + function auto_ping() { + if (index >= auto_ping_value.length){ + return; + } + var cbi_id = auto_ping_value[index].getAttribute("cbiid"); <% if compact_display_nodes and tonumber(compact_display_nodes) == 1 then %> var remarks = document.getElementById("cbid.passwall." + cbi_id + ".remarks").value; var address = null; @@ -148,24 +151,11 @@ table td, .table .td { var address = document.getElementById("cbid.passwall." + cbi_id + ".address").value; var port = document.getElementById("cbid.passwall." + cbi_id + ".port").value; <% end %> - if ((address != null && address != "") && (port != null && port != "")) { - var data = { - index: i, + var json = JSON.stringify(auto_ping_value[index]); + ajax.post('<%=dsp.build_url("admin/vpn/passwall/auto_ping_node_list")%>', { + index: index, address: address, port: port - }; - node_list.push(data); - } - } - - var index = 0; - function auto_ping() { - if (index >= node_list.length){ - return; - } - var json = JSON.stringify(node_list[index]); - ajax.post('<%=dsp.build_url("admin/vpn/passwall/auto_ping_node_list")%>', { - json: json }, function(x, result) { if(x && x.status == 200) { diff --git a/package/lienol/luci-app-passwall/root/etc/config/passwall b/package/lienol/luci-app-passwall/root/etc/config/passwall index bf6899d603..a86b418adb 100644 --- a/package/lienol/luci-app-passwall/root/etc/config/passwall +++ b/package/lienol/luci-app-passwall/root/etc/config/passwall @@ -54,7 +54,7 @@ config global_rules option chnlist_update '1' option gfwlist_version '2019-12-10' option chnroute_version '2019-12-05' - option chnlist_version '2019-12-27' + option chnlist_version '2019-12-31' config global_app option v2ray_file '/usr/bin/v2ray/' diff --git a/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/chnlist b/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/chnlist index 12bca159ae..9f85c6390e 100644 --- a/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/chnlist +++ b/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/chnlist @@ -2013,7 +2013,6 @@ 17dao.com 17dap.com 17dm.com -17dm.net 17doubao.com 17dp.com 17emarketing.com @@ -2291,7 +2290,6 @@ 198wu.com 199508.com 19977.com -1997nice.xyz 1997sty.com 1998mall.com 1999019.com @@ -2465,7 +2463,6 @@ 1sucai.com 1suplayer.me 1t168.com -1t1h.com 1t1t.com 1tai.com 1taoji.com @@ -2552,7 +2549,6 @@ 2012ccfa.com 2012ee.com 2013dy.com -2013w7.com 2013xp.com 2014w7.com 201551.com @@ -3051,7 +3047,6 @@ 28xl.com 28y.com 28yj.com -28ypk.com 2918.com 29293.com 2929gou.com @@ -3918,7 +3913,6 @@ 3911.com 391k.com 391la.com -392bcxjxt.com 3937.com 39655.com 3970yy.com @@ -3986,7 +3980,6 @@ 3dbuyu.net 3dch.net 3dclothes.org -3dczk.com 3ddayin.net 3-ddesignsolutions.com 3ddl.net @@ -4673,7 +4666,6 @@ 518moban.com 518weibo.com 518yin.com -518z.net 519397.com 519595.com 51969.com @@ -5630,7 +5622,6 @@ 53537yh.com 53537yht.com 5354789.com -535wrlknb.com 5360jx.com 5360ok.com 53617686.com @@ -6073,7 +6064,6 @@ 5alt.me 5alw.com 5any.com -5asj.com 5atxt.com 5axxw.com 5azy.com @@ -6477,7 +6467,6 @@ 657802.com 65875.com 65.com -65dm.com 65house.com 65mhxy.com 65singapore.com @@ -6733,7 +6722,6 @@ 6apt.com 6b3b.com 6btbtt.com -6bu6.xyz 6c6c.com 6ccn.com 6-china.com @@ -7004,6 +6992,7 @@ 761w.com 7624.net 762rc.com +7639616.com 764100.com 7654.com 7659.com @@ -7076,6 +7065,7 @@ 777zp.com 77833.net 778669.com +77878mm.com 778839.com 7788.com 7788js.com @@ -7972,7 +7962,6 @@ 90tank.com 90tiyu.com 90vm.com -90vs.com 90wmoyu.com 90wx.com 90wy.net @@ -8165,6 +8154,7 @@ 91real.com 91render.com 91ri.org +91ronghui.com 91rtb.com 91ruyu.com 91safety.com @@ -8227,6 +8217,7 @@ 91y.com 91yian.com 91yicaopan.com +91yixun.com 91yong.com 91youban.com 91you.com @@ -8322,7 +8313,6 @@ 936647.com 936649.com 936u.com -937175.vip 9374ttyy.com 937785.com 937791.com @@ -8914,7 +8904,6 @@ 9simg.com 9skm.com 9sky.com -9soche.com 9stor.com 9subi.com 9syw.com @@ -9463,6 +9452,7 @@ agalwood.net agcaps.com agcloudcs.com agctc.com +agdns.cc age06.com agemiracles.com agenge.com @@ -10025,6 +10015,7 @@ aju.space ajwang.com ajweishequ.com ajxlx.com +ajyg.com ajzby.com ak0.tw ak1ak1.com @@ -10070,6 +10061,7 @@ al8l.com alabmed.com alaccountant.com alacun.com +aladdin-e.com aladdinnet.com aladd.net alai.net @@ -10160,7 +10152,6 @@ alipaycs.com alipaydev.com alipaydns.com alipay-eco.com -alipaygame.com alipaylog.com alipay.net alipayobjects.com @@ -12489,7 +12480,6 @@ behe.com bei1688.com beian88.com beianbaba.com -beianhao.net beianidc.com beianok.com beianw.net @@ -13770,7 +13760,6 @@ bluereader.org bluesdream.com bluesdy.com bluesharkinfo.com -blueshell.cc blueshow.net blueskykong.com blueskyschool.net @@ -14344,7 +14333,6 @@ bugsevent.com bugtags.com buguangdeng.com bugucn.com -bugutang.com bugutime.com bugv.net bugxia.com @@ -14472,6 +14460,7 @@ bx58.com bxajfs.com bxb2b.com bxd365.com +bxdaka.com bxdoctor.com bxgfw.com bxgjyc.com @@ -14752,6 +14741,7 @@ caibaodi.com caibaojian.com caibaopay.com caibeike.com +caibianba.com caibow.com caibowen.net caichongwang.com @@ -14911,6 +14901,7 @@ cangfengzhe.com cangnews.com cangowin.com cangpie.com +cangqiongkanshu.com cangshui.net cangshutun.com cangya.com @@ -15158,7 +15149,6 @@ ccctspm.org cccwww.com cccwwwr.com cccyun.cc -ccd4.com ccd86.com ccdby.com ccding.xyz @@ -15488,6 +15478,7 @@ cdn007.com cdn08.com cdn1.apple-mapkit.com cdn1.evernote.com +cdn1-okzy.com cdn2000.com cdn20.com cdn20.info @@ -15552,6 +15543,7 @@ cdnmama.com cdn.marketplaceimages.windowsphone.com cdnmaster.com cdnok.com +cdn-okzyw.com cdnpan.com cdnpod.com cdnren.com @@ -15666,7 +15658,6 @@ ceconlinebbs.com ceconline.com cecport.cc cecport.com -cecss.com cectcc.com cedachina.org cedarhd.com @@ -15849,6 +15840,7 @@ cgchina.net cgchinashare.com cgcloud.net cgcountry.com +cgdns.cc cgdown.com cgdream.org cgebook.com @@ -16479,6 +16471,7 @@ chijianfeng.com chiji-h5.com childlib.org chilemanin.com +chillyroom.com chilunyc.com chimaocai.com chimatong.com @@ -16856,6 +16849,7 @@ chinakidville.com chinakinglink.com chinakingo.com chinakongzi.org +chinaksi.com chinaks.net chinakyzl.com chinalabexpo.com @@ -17340,7 +17334,6 @@ chofnipr.com chofn.org choiceform.com choinguvl.com -cholerae.com chong4.net chongai.co chongbaoge.com @@ -17740,6 +17733,7 @@ citure.net citvc.com citw2008.com city23.com +city84.com city8.com citydating92.xyz citydh.com @@ -17852,6 +17846,7 @@ cl1-cdn.origin-apple.com.akadns.net cl2.apple.com cl2.apple.com.edgekey.net.globalredir.akadns.net cl2-cn.apple.com +cl3000.com cl3.apple.com cl3-cdn.origin-apple.com.akadns.net cl4.apple.com @@ -18667,7 +18662,6 @@ cnspeed.com cnspeedtest.com cnspeedtest.net cnsphoto.com -cnsqzx.com cnssuestc.org cnssz.com cnstea.com @@ -19996,7 +19990,6 @@ cxwt113.com cxwz.org cxxjs.com cxxwnews.com -cxxyft.com cxy7.com cxybl.com cxyd.net @@ -21725,6 +21718,7 @@ div.io diwork.com dixiao.org dixintong.com +diybcq.com diybeta.com diybuy.net diy.cc @@ -22244,6 +22238,7 @@ dongfeng-nissan.com dongfeng-renault.net dongfengtrucks.com dongfund.com +dongganboy.com dongge.com donggo.com donghaifunds.com @@ -22324,7 +22319,6 @@ doserver.net do-shi.com doshome.com dosnap.com -dosn.com dospy.com dospy.wang dossav.com @@ -22634,6 +22628,7 @@ ds123456.com ds-360.com ds599.com ds5f.com +ds666.fun dsblog.net dscbs.com dsd666.com @@ -23160,7 +23155,6 @@ dzgxq.com dzhaoj.com dzhope.com dzhqexpo.com -dzhuli.com dzkbw.com dzlhktsb.com dzllzg.com @@ -23780,6 +23774,7 @@ efwang.com efwh.com efy-tech.com egaoxiu.com +egdns.cc egfcare.com egg-born.org egg.htcsense.com @@ -23877,6 +23872,7 @@ ejee.com ejeegroup.com ejet.com ejewelrymodel.com +ejfeng.com ejiacn.com ejiafarm.com ejiaju.cc @@ -23944,7 +23940,6 @@ eleme.io element3ds.com elenchina.com elenet.me -eleok.com elesos.com ele.to elexcon.com @@ -23983,7 +23978,6 @@ els001.com elsenow.com elsyhw.com eltws.com -eltzy.com eluosidy.com eluxiu.com elvgufen.com @@ -25427,6 +25421,7 @@ fengkuangzaoren.com fengkui.net fengli.com fenglinjiu.com +fengli.su fengliying.com fengmanginfo.com fengmaniu.com @@ -26033,6 +26028,7 @@ forthxu.com fortunebill.com fortunevc.com foryougroup.com +fos123.com foscam.com fos.cc foshanaosibo.com @@ -26054,6 +26050,7 @@ fotoplace.cc fotosay.com fototuan.com fotuozhengfa.com +fou001.com fouleide.com founderbn.com foundercentury.com @@ -26141,7 +26138,6 @@ freebuf.com freecls.com freed.ga freedgo.com -freed.so free-e.net freeerror.org free-eyepro.com @@ -27522,7 +27518,6 @@ girlbt.com girls-frontline.com girlw.net gis75.com -gisblogs.net giscafer.com gisd.xyz giserdqy.com @@ -27612,7 +27607,6 @@ glasseasy.com glawyer.net glb6.com glbdqn.com -glbwz.com glcanyin.net glcct.com gl-data.com @@ -28430,7 +28424,6 @@ guanwangdaquan.com guanwangyun.com guanwawa.com guanxiaokai.com -guanyitanggy.com guanyiyun.com guanyour.com guanzhulian.com @@ -28460,7 +28453,6 @@ gudianwenxue.com gudi.cc guer.org guestops.com -gufen138.com gufengge.org gufengmh8.com gufengmh.com @@ -28527,7 +28519,6 @@ gukun.com gulandscape.com guleilab.com guleji.com -guliguo.com gulizw.com gullmap.com gulltour.com @@ -28808,6 +28799,7 @@ gy.com gydongli.com gyersf.com gy-fuji.com +gygpumps.com gyguohua.com gyhj.org gyljc.com @@ -29204,7 +29196,6 @@ haierxue.com haifangbest.com haifeisi.com haigeek.com -haigoumen.com haiguangyaoye.com haigui001.com haiguime.com @@ -30386,7 +30377,6 @@ helensbar.com helianhealth.com helight.info helijia.com -helingfeng.com helingqi.com helishi.net heliuyan.com @@ -31034,7 +31024,6 @@ hkyqygl.com hkyykq.com hl6799.com hl95.com -hladmris.com hlchuanyin.com hldbtv.com hlddjwl.com @@ -31782,7 +31771,6 @@ hstong.com hsutimes.com hsw11.com hsw2013.com -hsw69.com hsweb.me hswkzy.com hsxhn.com @@ -32939,7 +32927,6 @@ i0746.com i075.com i0898.org i100e.com -i11185.com i11r.com i121.net i1758.com @@ -34309,7 +34296,6 @@ inlovektv.com inlsd.org inmeng.net inmuu.com -innerpeer.com innlym.me innojoy.com innotechx.com @@ -35790,7 +35776,6 @@ jialaxin.cc jialebao.cc jialeo2o.com jialez.com -jialezi.net jialidun.com jialingmm.net jiameng001.com @@ -36020,7 +36005,6 @@ jiatx.com jiawin.com jiaxiaozhijia.com jiaxincloud.com -jiaxipaimai.com jiaxiweb.com jiaxuejiyin.com jiayi56.com @@ -37807,7 +37791,6 @@ jxnxs.com jxold.com jxpta.com jxpz888.com -jxqczc.com jxqgpx.com jxrencai.com jxrjzx.com @@ -38274,6 +38257,7 @@ kaodianer.com kaogua.com kaojionline.com kaola100.com +kaolacdn.com kaola.com kaola.com.hk kaolafm.com @@ -38333,7 +38317,6 @@ katvr.com katyusha.net kawabangga.com kawa.hk -kayege.com kayege.info kayoudi.com kaytrip.com @@ -38453,7 +38436,6 @@ kejet.net keji100.net kejian.design kejianyi.com -kejibeidou.com kejietextile.com kejihai.com kejijie.net @@ -38589,7 +38571,6 @@ keyray-hk.com keyshot.cc keyuhome.com keyunzhan.com -keywaishe.com keywin.org keyyou.net kezool.com @@ -38861,7 +38842,6 @@ kkkmmm25.xyz kkkwww.com kklishi.com kklover.com -kklt.net kklxj.com kkmaoyi.com kkmh.com @@ -39518,7 +39498,6 @@ kunlunta.com kunlunvi.com kunlunwe.com kunmingbc.com -kunmingguoji.com kunmingkanghui.com kunnisser.com kunpo.cc @@ -39715,6 +39694,7 @@ lady8844.com lady98.com ladyband.com ladyhua.com +ladymetro.com ladynest.com ladysq.com ladystr.com @@ -39818,7 +39798,6 @@ lan-bridge.com lanbu.net lan-car.com lancdn.com -lanchenghu.com lanconvey.com landai.com landa-solenoid.com @@ -42367,7 +42346,6 @@ lvruan.com lvrui.io lvse.com lvsehuxiniubangcha.com -lvse.kim lvsetxt.com lvseyixue.com lvshedesign.com @@ -43901,7 +43879,6 @@ miaomore.com miaopai.com miaopin8.com miaoquantuan.com -miaoquyou.com miaoshoucdn.com miaoshou.com miaoshou.net @@ -43963,7 +43940,10 @@ mic-s.com micstatic.com micw.com mid520.com +midaapi.com +midadata.com midaijihua.com +midainc.com midasbuy.com midday.me middlechina.net @@ -43982,7 +43962,6 @@ midukanshu.com mi-dun.com miduoke.net midwayjs.org -midymidy.com miecod.com miejw.com miensi.com @@ -44041,6 +44020,7 @@ mijisou.com mijwed.com mika123.com mika18.com +mikannovel.com mikebao.cc mikechen.cc mikecrm.com @@ -44179,7 +44159,6 @@ mingyuanyun.com mingyueqingfengshe.com mingzhuxiaoshuo.com mingzihui.com -mingzuwu.com mingzw.net minhang.cc minhangshi.com @@ -44727,6 +44706,7 @@ moneyxian.net mongochina.com monizl.com monph.com +monseng.com monsooncvs.com monster1105.com monsterlin.com @@ -46137,7 +46117,6 @@ nfwin.com nfyk.com nfzhouyi.com nfzmbrand.com -ng1091.com ng21.com ngabbs.com ngacn.cc @@ -46763,6 +46742,7 @@ ntzhoas.com nuandao.com nuandaoimg.com nuandaojs.com +nuan.io nuanjiayuan.com nuanmaoer.com nuanshi100.com @@ -47096,7 +47076,6 @@ ok365.com ok3w.net ok86.com ok87.com -ok8s.com ok9624.com ok9803.com okad.com @@ -47963,6 +47942,7 @@ paratera.com parduscycle.com parentshk.com paris-bride.com +paris-sengfu.net parkbees.com parkchina.net parkdaily.com @@ -50039,7 +50019,6 @@ qimiwang.com qimodesign.com qimser.com qimuwang.net -qinbaol.com qinbei.com qinbing114.com qinbing.com @@ -50200,6 +50179,7 @@ qipaifan.com qipamaijia.com qipeiren.com qipeisyj.com +qipeng.com qiprs.com qiqi456.com qiqici.com @@ -50916,7 +50896,6 @@ queqiaoba.com querylist.cc queshao.com queshu.com -questionfocus.com questyleaudio.com questyle.com queyang.com @@ -51037,7 +51016,6 @@ quwm.com quwuxian.com quxds.com quxia.com -quxiamen.com quxianchang.com quxiangtou.com quxiaoyuan.com @@ -51127,7 +51105,6 @@ qy6.com qy6.net qyaaaa.com qyc2008.com -qycm1.com qycn.com qycn.net qycn.org @@ -51190,7 +51167,6 @@ qzdigg.com qzdwz.com qzdyxlcj.com qzfxyy.com -qzgbaf.net qzguangtai.com qzhanyi.com qzhhj.com @@ -51209,7 +51185,6 @@ qzone.com qzone.la qzrbx.com qzrc.com -qzread.com qzshangwu.com qzwb.com qzweizan.com @@ -51269,6 +51244,7 @@ rainbowsoft.org raincent.com raincy.org raindi.net +raineggplant.com rainhz.com rainjay.wang rainsun.me @@ -51306,7 +51282,6 @@ raoke.net raonie.com raorao.com rap8.com -rapapi.org rapidppt.com rapoo.com rapospectre.com @@ -51350,6 +51325,7 @@ rayu.me rayuu.com rayyo.com rayyzx.com +razon.xyz razrlele.com raztb.com rbet114.net @@ -51702,7 +51678,6 @@ rhvcvq.pw rhvisa.com rhy.com rhyme.cc -riadev.com riaway.com ribaoapi.com ribaokang.com @@ -51855,6 +51830,7 @@ rockmanlab.net rockru.com rockyaero.com rockyenglish.com +rocky.hk roclee.com rocsf.org roddypy.com @@ -52661,6 +52637,7 @@ scigy.com scihub.ltd sci-hub.ren sciimg.com +scijuyi.com scimao.com scinno-cn.com scinormem.com @@ -52997,6 +52974,7 @@ seedit.com seedland.cc seedsufe.com seedvd.com +seedvirus.com seeed.wiki see-far.com seefarger.com @@ -53421,6 +53399,7 @@ shannon-sys.com shannxidg.com shanp.com shanqb.com +shanqian.vip shan-san.com shanse8.com shanshuidan.com @@ -54412,7 +54391,6 @@ shuwangxing.com shuxiangge.cc shuyangba.com shuyang.tv -shuyaya.cc shuyfdc.com shuyigg.com shuyong.net @@ -54813,6 +54791,7 @@ siyuan.cc siyuanedu.com siyuanren.com siyuefeng.com +siyunxi.com siyuweb.com sizeofvoid.net sizuo.com @@ -55192,7 +55171,6 @@ snailsleep.net snailyun.com snasn.com snbkf34.com -snbway.net sncdental.com sncoda.com snda.com @@ -56012,6 +55990,7 @@ stjfw.net stjunshi.com stjy.net stkey.win +stlonshry.com stlswm.com stmbuy.com stmcu.org @@ -56308,6 +56287,7 @@ sunnyos.com sunnyqi.com sunnyxx.com sunofbeaches.com +sunowo.com sunpala.com sunpcm.com sunplusedu.com @@ -58633,6 +58613,7 @@ tomatolei.com tom.com tomczhen.com tomdiy.com +tomlgame.com tommyfan.com tomonline-inc.com tomotoes.com @@ -58909,7 +58890,6 @@ touwho.com touxiang8.com touxiang.la touxiangzhan.com -touxiao8.com touying.com touyouh.com touyouquan.com @@ -59507,6 +59487,7 @@ tushuguan.cc tushugu.com tushumi.com tushupan.com +tushupdf.com tushuu.com tusooo.com tuspass.com @@ -59667,7 +59648,6 @@ txrjy.com txrzx.com txsc100.com txsdk.com -txshuku.net txslicai.com txssw.com txt2016.com @@ -60525,7 +60505,6 @@ uutop.com uutuu.com uuu9.com uuudo.com -uuufun.com uuuo.com uuutu.com uuuu.cc @@ -60596,7 +60575,6 @@ uzhongtou.com uzhuangji.net uzise.com uzones.com -uzsem.com uzuzuz.com uzzf.com v007.net @@ -61070,7 +61048,6 @@ viweitui.com viwik.com vixue.com vjia.com -vjianke.com vjiazu.com vjie.com vjshi.com @@ -61886,6 +61863,7 @@ wasair.com waseeo.com was-expo.com washpayer.com +wasoinfo.com wasqq.com wasu.com wasu.tv @@ -62001,6 +61979,7 @@ wdmcake.com wdptj.com wdqh.net wdres.com +wdshouji.com wdsjz.com wdsrc.com wdssmq.com @@ -62111,7 +62090,6 @@ webscache.com webscache.net web-service.halo.xbox.com webshao.com -webshopping.site webshu.net websjx.com websjy.com @@ -62165,6 +62143,7 @@ wedooapp.com wedzjy.net weebia.com weedong.com +weefang.com weeiy.com weekslw.com weelv.com @@ -62562,7 +62541,6 @@ wenpie.com wenrouge.com wenryxu.com wensang.com -wenshare.com wenshen010.com wenshen8.com wenshen8.net @@ -62869,7 +62847,6 @@ whir.net whisperto.net whitebox.im whitecat.com -whitecell.org whitegem.net whitemedia-china.com whitewolf.space @@ -62952,7 +62929,6 @@ whoceansys.com whocool.com whoil.net whoolala.com -whopfun.com whosedrop.com whozen.com whpantosoft.com @@ -63989,7 +63965,6 @@ wtmgc.com wtmmn.com wtn5.com wtobag.com -wtofq.com wtoip.com wtojob.com wtoutiao.com @@ -64393,7 +64368,6 @@ wxngh.com wxnmh.com wxp114.com wxphp.com -wxqun.vip wxr999.com wxrb.com wxreallink.com @@ -65576,6 +65550,7 @@ xiazai163.com xiazai2.net xiazai3.net xiazai78.com +xiazai9527.com xiazaiba.com xiazaicc.com xiazai.com @@ -66818,7 +66793,6 @@ xtuan.com xtuo.net xtutoring.com xtutu.me -xtxhg.com xtyxdq.com xtzdbj.com xtzhao.com @@ -67199,7 +67173,6 @@ xxxfeng.com xxxlbox.com xxxmeng.com xxxxxbbs.com -xxxyyyzzzw.xyz xxxzzlm.org xxy168.com xxycw.com @@ -67655,7 +67628,6 @@ yaopao.net yaopinnet.com yaoqingwo.com yaosai.com -yaosimin.com yaowan.com yaowei.info yaoxianwu.com @@ -67711,6 +67683,7 @@ ybbtb.com ybccb.com ybdu.com ybdu.me +ybhdmob.com ybin.cc ybi.net ybirds.com @@ -68572,6 +68545,7 @@ yisu.com yisusoft.com yitaifang.com yitang.org +yitaoduoduo.com yit.com yitel.com yitesoft.com @@ -68816,6 +68790,7 @@ ylzc001.com ylzheng.com ylzms.com ylzqx.com +ym1998.com ym68.cc ym75168.com ymailcampaign.com @@ -71112,7 +71087,6 @@ zgzy.net zgzyqccj.com zgzyqcgw.com zgzzs.com -zh286.com zh30.com zh51home.com zhai14.com @@ -71181,7 +71155,6 @@ zhangqiongjie.com zhangqiu.cc zhangrunnan.com zhangsenhao.com -zhangshengdong.com zhangshengrong.com zhangshufang.com zhangtianai.info @@ -72328,7 +72301,6 @@ zishuogif.com zishuovideo.com zisia.org zisuo.com -zisuo.net zitanshan.com ziti163.com zitiao.org diff --git a/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/whitelist_ip b/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/whitelist_ip index 10282b5bbc..91cca54e1e 100644 --- a/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/whitelist_ip +++ b/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/whitelist_ip @@ -7,7 +7,3 @@ 1.2.4.8 210.2.4.8 119.29.29.29 -208.67.222.222 -208.67.220.220 -8.8.8.8 -8.8.4.4 diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh index f1ecdaa22a..58c0dfd0ba 100755 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh @@ -33,20 +33,28 @@ uci_get_by_type() { echo ${ret:=$3} } -# rule update -echo $Date: 开始更新规则，请等待... >$LOG_FILE -status=$(/usr/bin/curl -w %{http_code} --connect-timeout 10 $url_main/version1 --silent -o /tmp/version1) -[ "$?" != 0 ] || [ -z "$status" ] || [ "$status" != "200" ] && { - status=$(/usr/bin/wget -q --no-check-certificate --timeout=15 $url_main/version1 -O /tmp/version1) - [ "$?" != 0 ] || [ -z "$status" ] && { - echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE - exit +get_url() { + local url=$1 + local save_path=$2 + status=$(/usr/bin/curl -w %{http_code} --connect-timeout 10 $url --silent -o $save_path) + [ "$?" != 0 ] && { + status=$(/usr/bin/wget -q --no-check-certificate --timeout=15 $url -O $save_path) + [ "$?" == 0 ] && status=200 } + echo $status +} + +# rule update +echo $Date: 开始更新规则，请等待... > $LOG_FILE +status=$(get_url $url_main/version1 /tmp/version1) +[ -z "$status" ] && { + echo $Date: 无法访问更新接口，请更新接口！ >> $LOG_FILE + exit } online_content=$(cat /tmp/version1 2>/dev/null) if [ -z "$online_content" ]; then rm -rf /tmp/version1 - echo $Date: 没有检测到在线版本，可能是访问github有问题！ >>$LOG_FILE + echo $Date: 没有检测到在线版本，可能是访问github有问题！ >> $LOG_FILE exit fi @@ -59,32 +67,29 @@ if [ "$gfwlist_update" == 1 ]; then if [ ! -z "$version_gfwlist2" ]; then version_gfwlist1=$(uci_get_by_type global_rules gfwlist_version) if [ "$version_gfwlist1" != "$version_gfwlist2" -o "$md5sum_gfwlist2" != "$local_md5sum_gfwlist" ]; then - echo $Date: 检测到新版本gfwlist，开始更新... >>$LOG_FILE - echo $Date: 下载gfwlist到临时文件... >>$LOG_FILE - status=$(/usr/bin/curl -w %{http_code} --connect-timeout 10 $url_main/gfwlist.conf --silent -o /tmp/gfwlist.conf) - [ "$?" != 0 ] || [ -z "$status" ] || [ "$status" != "200" ] && { - status=$(/usr/bin/wget --no-check-certificate --timeout=15 -q $url_main/gfwlist.conf -O /tmp/gfwlist.conf) - [ "$?" != 0 ] || [ -z "$status" ] && { - echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE - exit - } + echo $Date: 检测到新版本gfwlist，开始更新... >> $LOG_FILE + echo $Date: 下载gfwlist到临时文件... >> $LOG_FILE + status=$(get_url $url_main/gfwlist.conf /tmp/gfwlist.conf) + [ -z "$status" ] && { + echo $Date: 无法访问更新接口，请更新接口！ >> $LOG_FILE + exit } md5sum_gfwlist1=$(md5sum /tmp/gfwlist.conf | sed 's/ /\n/g' | sed -n 1p) if [ "$md5sum_gfwlist1"x = "$md5sum_gfwlist2"x ]; then - echo $Date: 下载完成，校验通过，将临时文件覆盖到原始gfwlist文件 >>$LOG_FILE + echo $Date: 下载完成，校验通过，将临时文件覆盖到原始gfwlist文件 >> $LOG_FILE mv /tmp/gfwlist.conf $RULE_PATH/gfwlist.conf uci set $CONFIG.@global_rules[0].gfwlist_version=$version_gfwlist2 rm -rf /tmp/dnsmasq.d/gfwlist.conf reboot="1" - echo $Date: 你的gfwlist已经更新到最新了哦~ >>$LOG_FILE + echo $Date: 你的gfwlist已经更新到最新了哦~ >> $LOG_FILE else - echo $Date: 下载完成，但是校验没有通过！ >>$LOG_FILE + echo $Date: 下载完成，但是校验没有通过！ >> $LOG_FILE fi else - echo $Date: 检测到gfwlist本地版本号和在线版本号相同，不用更新! >>$LOG_FILE + echo $Date: 检测到gfwlist本地版本号和在线版本号相同，不用更新! >> $LOG_FILE fi else - echo $Date: gfwlist文件下载失败！ >>$LOG_FILE + echo $Date: gfwlist文件下载失败！ >> $LOG_FILE fi rm -rf /tmp/gfwlist.conf fi @@ -98,33 +103,30 @@ if [ "$chnroute_update" == 1 ]; then if [ ! -z "$version_chnroute2" ]; then version_chnroute1=$(uci_get_by_type global_rules chnroute_version) if [ "$version_chnroute1" != "$version_chnroute2" -o "$md5sum_chnroute2" != "$local_md5sum_chnroute" ]; then - echo $Date: 检测到新版本chnroute，开始更新... >>$LOG_FILE - echo $Date: 下载chnroute到临时文件... >>$LOG_FILE - status=$(/usr/bin/curl -w %{http_code} --connect-timeout 10 $url_main/chnroute.txt --silent -o /tmp/chnroute) - [ "$?" != 0 ] || [ -z "$status" ] || [ "$status" != "200" ] && { - status=$(/usr/bin/wget --no-check-certificate --timeout=15 -q $url_main/chnroute.txt -O /tmp/chnroute) - [ "$?" != 0 ] || [ -z "$status" ] && { - echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE - exit - } + echo $Date: 检测到新版本chnroute，开始更新... >> $LOG_FILE + echo $Date: 下载chnroute到临时文件... >> $LOG_FILE + status=$(get_url $url_main/chnroute.txt /tmp/chnroute) + [ -z "$status" ] && { + echo $Date: 无法访问更新接口，请更新接口！ >> $LOG_FILE + exit } md5sum_chnroute1=$(md5sum /tmp/chnroute | sed 's/ /\n/g' | sed -n 1p) if [ "$md5sum_chnroute1"x = "$md5sum_chnroute2"x ]; then - echo $Date: 下载完成，校验通过，将临时文件覆盖到原始chnroute文件 >>$LOG_FILE + echo $Date: 下载完成，校验通过，将临时文件覆盖到原始chnroute文件 >> $LOG_FILE mv /tmp/chnroute $RULE_PATH/chnroute uci set $CONFIG.@global_rules[0].chnroute_version=$version_chnroute2 ipset flush chnroute ipset destroy chnroute reboot="1" - echo $Date: 你的chnroute已经更新到最新了哦~ >>$LOG_FILE + echo $Date: 你的chnroute已经更新到最新了哦~ >> $LOG_FILE else - echo $Date: 下载完成，但是校验没有通过！ >>$LOG_FILE + echo $Date: 下载完成，但是校验没有通过！ >> $LOG_FILE fi else - echo $Date: 检测到chnroute本地版本号和在线版本号相同，不用更新! >>$LOG_FILE + echo $Date: 检测到chnroute本地版本号和在线版本号相同，不用更新! >> $LOG_FILE fi else - echo $Date: chnroute文件下载失败！ >>$LOG_FILE + echo $Date: chnroute文件下载失败！ >> $LOG_FILE fi rm -rf /tmp/chnroute fi @@ -138,36 +140,33 @@ if [ "$chnlist_update" == 1 ]; then if [ ! -z "$version_chnlist2" ]; then version_chnlist1=$(uci_get_by_type global_rules chnlist_version) if [ "$version_chnlist1" != "$version_chnlist2" -o "$md5sum_chnlist2" != "$local_md5sum_chnlist" ]; then - echo $Date: 检测到新版本chnlist，开始更新... >>$LOG_FILE - echo $Date: 下载chnlist到临时文件... >>$LOG_FILE - status=$(/usr/bin/curl -w %{http_code} --connect-timeout 10 $url_main/cdn.txt --silent -o /tmp/chnlist) - [ "$?" != 0 ] || [ -z "$status" ] || [ "$status" != "200" ] && { - status=$(/usr/bin/wget --no-check-certificate --timeout=15 -q $url_main/cdn.txt -O /tmp/chnlist) - [ "$?" != 0 ] || [ -z "$status" ] && { - echo $Date: 无法访问更新接口，请更新接口！ >>$LOG_FILE - exit - } + echo $Date: 检测到新版本chnlist，开始更新... >> $LOG_FILE + echo $Date: 下载chnlist到临时文件... >> $LOG_FILE + status=$(get_url $url_main/cdn.txt /tmp/chnlist) + [ -z "$status" ] && { + echo $Date: 无法访问更新接口，请更新接口！ >> $LOG_FILE + exit } md5sum_chnlist1=$(md5sum /tmp/chnlist | sed 's/ /\n/g' | sed -n 1p) if [ "$md5sum_chnlist1"x = "$md5sum_chnlist2"x ]; then - echo $Date: 下载完成，校验通过，将临时文件覆盖到原始chnlist文件 >>$LOG_FILE + echo $Date: 下载完成，校验通过，将临时文件覆盖到原始chnlist文件 >> $LOG_FILE mv /tmp/chnlist $RULE_PATH/chnlist uci set $CONFIG.@global_rules[0].chnlist_version=$version_chnlist2 reboot="1" - echo $Date: 你的chnlist已经更新到最新了哦~ >>$LOG_FILE + echo $Date: 你的chnlist已经更新到最新了哦~ >> $LOG_FILE else - echo $Date: 下载完成，但是校验没有通过！ >>$LOG_FILE + echo $Date: 下载完成，但是校验没有通过！ >> $LOG_FILE fi else - echo $Date: 检测到chnlist本地版本号和在线版本号相同，不用更新! >>$LOG_FILE + echo $Date: 检测到chnlist本地版本号和在线版本号相同，不用更新! >> $LOG_FILE fi else - echo $Date: chnlist文件下载失败！ >>$LOG_FILE + echo $Date: chnlist文件下载失败！ >> $LOG_FILE fi rm -rf /tmp/chnlist fi -echo $Date: 更新进程运行完毕！ >>$LOG_FILE +echo $Date: 更新进程运行完毕！ >> $LOG_FILE rm -rf /tmp/version1 # write number uci set $CONFIG.@global_rules[0].gfwlist_update=$gfwlist_update @@ -176,7 +175,7 @@ uci set $CONFIG.@global_rules[0].chnlist_update=$chnlist_update uci commit # reboot if [ "$reboot" == "1" ]; then - echo $Date: 重启软件，以应用新的规则文件！请稍后！ >>$LOG_FILE + echo $Date: 重启软件，以应用新的规则文件！请稍后！ >> $LOG_FILE /etc/init.d/$CONFIG restart fi exit diff --git a/package/lienol/luci-app-v2ray-server/Makefile b/package/lienol/luci-app-v2ray-server/Makefile index 958b3c29ab..64eccc86b7 100755 --- a/package/lienol/luci-app-v2ray-server/Makefile +++ b/package/lienol/luci-app-v2ray-server/Makefile @@ -9,8 +9,8 @@ PKG_NAME:=luci-app-v2ray-server LUCI_TITLE:=LuCI support for V2ray Server LUCI_DEPENDS:=+libsodium +luci-lib-jsonc +unzip +v2ray LUCI_PKGARCH:=all -PKG_VERSION:=1.0 -PKG_RELEASE:=29-20191220 +PKG_VERSION:=1.1 +PKG_RELEASE:=1-20200101 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lienol/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/v2ray.lua b/package/lienol/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/v2ray.lua index e57afa141a..69b93b3204 100644 --- a/package/lienol/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/v2ray.lua +++ b/package/lienol/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/v2ray.lua @@ -6,13 +6,13 @@ local util = require "luci.util" local i18n = require "luci.i18n" local ipkg = require "luci.model.ipkg" +local appname = "v2ray_server" local v2ray_api = "https://api.github.com/repos/v2ray/v2ray-core/releases/latest" local wget = "/usr/bin/wget" local wget_args = { "--no-check-certificate", "--quiet", "--timeout=100", "--tries=3" } -local curl = "/usr/bin/curl" local command_timeout = 300 local LEDE_BOARD = nil @@ -162,7 +162,9 @@ local function get_api_json(url) -- function(chunk) output[#output + 1] = chunk end) -- local json_content = util.trim(table.concat(output)) - local json_content = luci.sys.exec(curl .. " -sL " .. url) + local json_content = luci.sys.exec(wget .. + " --no-check-certificate --timeout=10 -t 1 -O- " .. + url) if json_content == "" then return {} end