From 922fd63ced91d94c81f83ad6a9cb736d93fef682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LZ=EF=BC=88=E5=A6=99=E5=A6=99=E5=91=9C=EF=BC=89?= <73221087+larsonzh@users.noreply.github.com> Date: Sat, 25 May 2024 22:43:55 +0800 Subject: [PATCH] v4.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.强化参数配置文件数据读取纠错机制。 2.更新运营商 IP 地址数据文件。 --- source_codes/install.sh | 4 +- source_codes/lz/Changelog.txt | 4 + source_codes/lz/configs/lz_rule_config.sh | 2 +- source_codes/lz/data/lz_all_cn_cidr.txt | 2 +- source_codes/lz/data/lz_hk_cidr.txt | 6 +- source_codes/lz/data/lz_othernet_cidr.txt | 2 +- .../lz/func/lz_clear_custom_scripts_data.sh | 2 +- .../lz/func/lz_define_global_variables.sh | 2 +- source_codes/lz/func/lz_initialize_config.sh | 81 +++++++++++-------- source_codes/lz/func/lz_rule_address_query.sh | 2 +- source_codes/lz/func/lz_rule_func.sh | 2 +- source_codes/lz/func/lz_rule_status.sh | 2 +- source_codes/lz/func/lz_vpn_daemon.sh | 4 +- source_codes/lz/interface/lz_rule_service.sh | 2 +- source_codes/lz/js/lz_policy_routing.js | 2 +- source_codes/lz/lz_rule.sh | 4 +- source_codes/lz/uninstall.sh | 4 +- 17 files changed, 70 insertions(+), 57 deletions(-) diff --git a/source_codes/install.sh b/source_codes/install.sh index 26c553b7..a09d00bf 100644 --- a/source_codes/install.sh +++ b/source_codes/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# install.sh v4.3.9 +# install.sh v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) # LZ RULE script for Asuswrt-Merlin Router @@ -11,7 +11,7 @@ #BEIGIN -LZ_VERSION=v4.3.9 +LZ_VERSION=v4.4.0 TIMEOUT=10 CURRENT_PATH="${0%/*}" [ "${CURRENT_PATH:0:1}" != '/' ] && CURRENT_PATH="$( pwd )${CURRENT_PATH#*.}" diff --git a/source_codes/lz/Changelog.txt b/source_codes/lz/Changelog.txt index c440923b..f79d6a7b 100644 --- a/source_codes/lz/Changelog.txt +++ b/source_codes/lz/Changelog.txt @@ -1,3 +1,7 @@ +v4.4.0 (2024/5/25) + 1.强化参数配置文件数据读取纠错机制。 + 2.更新运营商 IP 地址数据文件。 + v4.3.9 (2024/5/18) 1.适配梅林 3004.388.7 固件系统缓存释放机制的更新。 2.更新运营商 IP 地址数据文件。 diff --git a/source_codes/lz/configs/lz_rule_config.sh b/source_codes/lz/configs/lz_rule_config.sh index 11775c5d..7f9d4d25 100644 --- a/source_codes/lz/configs/lz_rule_config.sh +++ b/source_codes/lz/configs/lz_rule_config.sh @@ -1,5 +1,5 @@ #!/bin/sh -# lz_rule_config.sh v4.3.9 +# lz_rule_config.sh v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) # 本软件采用CIDR（无类别域间路由，Classless Inter-Domain Routing）技术，是一个在Internet上创建附加地 diff --git a/source_codes/lz/data/lz_all_cn_cidr.txt b/source_codes/lz/data/lz_all_cn_cidr.txt index f5c8e451..c67c303f 100644 --- a/source_codes/lz/data/lz_all_cn_cidr.txt +++ b/source_codes/lz/data/lz_all_cn_cidr.txt @@ -1816,7 +1816,6 @@ 103.104.64.0/22 103.104.104.0/22 103.104.152.0/22 -103.104.168.0/22 103.104.188.0/22 103.104.198.0/23 103.104.252.0/22 @@ -3737,6 +3736,7 @@ 160.19.216.0/22 160.20.16.0/22 160.20.48.0/22 +160.20.130.0/23 160.202.60.0/22 160.202.148.0/22 160.202.152.0/22 diff --git a/source_codes/lz/data/lz_hk_cidr.txt b/source_codes/lz/data/lz_hk_cidr.txt index 65a72a64..fec67798 100644 --- a/source_codes/lz/data/lz_hk_cidr.txt +++ b/source_codes/lz/data/lz_hk_cidr.txt @@ -712,7 +712,6 @@ 103.85.212.0/24 103.85.252.0/22 103.86.12.0/22 -103.86.64.0/22 103.86.72.0/21 103.87.8.0/22 103.87.156.0/22 @@ -1028,7 +1027,6 @@ 103.160.38.0/23 103.160.44.0/23 103.160.50.0/23 -103.160.204.0/24 103.161.34.0/23 103.161.158.0/23 103.161.224.0/23 @@ -1472,7 +1470,6 @@ 116.193.168.0/22 116.197.176.0/20 116.204.156.0/22 -116.204.176.0/22 116.204.208.0/22 116.204.232.0/21 116.204.244.0/22 @@ -1491,7 +1488,8 @@ 117.18.64.0/20 117.18.96.0/24 117.18.98.0/24 -117.18.100.0/22 +117.18.100.0/23 +117.18.102.0/24 117.18.105.0/24 117.18.106.0/23 117.18.108.0/22 diff --git a/source_codes/lz/data/lz_othernet_cidr.txt b/source_codes/lz/data/lz_othernet_cidr.txt index 737e9db1..e66da10f 100644 --- a/source_codes/lz/data/lz_othernet_cidr.txt +++ b/source_codes/lz/data/lz_othernet_cidr.txt @@ -1379,7 +1379,6 @@ 103.104.64.0/22 103.104.104.0/22 103.104.152.0/22 -103.104.168.0/22 103.104.188.0/22 103.104.198.0/23 103.104.252.0/22 @@ -2843,6 +2842,7 @@ 160.19.216.0/22 160.20.16.0/22 160.20.48.0/22 +160.20.130.0/23 160.202.168.0/22 160.202.216.0/21 160.202.224.0/19 diff --git a/source_codes/lz/func/lz_clear_custom_scripts_data.sh b/source_codes/lz/func/lz_clear_custom_scripts_data.sh index 5968c189..e6797566 100644 --- a/source_codes/lz/func/lz_clear_custom_scripts_data.sh +++ b/source_codes/lz/func/lz_clear_custom_scripts_data.sh @@ -1,5 +1,5 @@ #!/bin/sh -# lz_clear_custom_scripts_data.sh v4.3.9 +# lz_clear_custom_scripts_data.sh v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) ## 清除用户自定义脚本数据 diff --git a/source_codes/lz/func/lz_define_global_variables.sh b/source_codes/lz/func/lz_define_global_variables.sh index 404159fc..f0d9ede3 100644 --- a/source_codes/lz/func/lz_define_global_variables.sh +++ b/source_codes/lz/func/lz_define_global_variables.sh @@ -1,5 +1,5 @@ #!/bin/sh -# lz_define_global_variables.sh v4.3.9 +# lz_define_global_variables.sh v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) # QnkgTFog5aaZ5aaZ5ZGc77yI6Juk6J+G5aKp5YS/77yJ（首次运行标识，切勿修改） diff --git a/source_codes/lz/func/lz_initialize_config.sh b/source_codes/lz/func/lz_initialize_config.sh index e0a268b8..791b054f 100644 --- a/source_codes/lz/func/lz_initialize_config.sh +++ b/source_codes/lz/func/lz_initialize_config.sh @@ -1,5 +1,5 @@ #!/bin/sh -# lz_initialize_config.sh v4.3.9 +# lz_initialize_config.sh v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) ## 初始化脚本配置 @@ -1618,13 +1618,13 @@ lz_get_config_data() { && match(value, /^[\"][^\"]*[\"]$/) > 0) value="\\\""value"\\\""; if (invalid == 1 || invalid == 2) - system("sed -i \"s\|\^\[ \\t\]\*"$1"=\.\*\$\|"$1"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"$1"=\.\*\$\|"$1"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); else if (invalid == 3) - system("sed -i \"s\|\^\[ \\t\]\*"$1"=\.\*\$\|"$1"="value" ## 间隔天数（1~31）；\\\"ruid_interval_day=5\\\"表示每隔5天。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"$1"=\.\*\$\|"$1"="value" ## 间隔天数（1~31）；\\\"ruid_interval_day=5\\\"表示每隔5天。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); else if (invalid == 4) - system("sed -i \"s\|\^\[ \\t\]\*"$1"=\.\*\$\|"$1"="value" ## 时间小时数（0~23，\\\*表示由系统指定）；\\\"ruid_timer_hour=3\\\"表示更新当天的凌晨3点。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"$1"=\.\*\$\|"$1"="value" ## 时间小时数（0~23，\\\*表示由系统指定）；\\\"ruid_timer_hour=3\\\"表示更新当天的凌晨3点。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); else if (invalid == 5) - system("sed -i \"s\|\^\[ \\t\]\*"$1"=\.\*\$\|"$1"="value" ## 时间分钟数（0~59，\\\*表示由系统指定）；\\\"ruid_timer_min=18\\\"表示更新当天的凌晨3点18分。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"$1"=\.\*\$\|"$1"="value" ## 时间分钟数（0~59，\\\*表示由系统指定）；\\\"ruid_timer_min=18\\\"表示更新当天的凌晨3点18分。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); print "local_"$1"="value; count++; } END{ @@ -1643,7 +1643,7 @@ lz_get_config_data() { gsub(/[ \t#].*$/, "", value); if (value !~ /^[0-9]$/) { value="5"; - system("sed -i \"s\|\^\[ \\t\]\*"$1"=\.\*\$\|"$1"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"$1"=\.\*\$\|"$1"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); } print "local_"$1"="value; exit; @@ -1766,7 +1766,6 @@ EOF ## 恢复备份配置参数函数 ## 输入项： -## $1--变量前缀 ## 全局常量及变量 ## 返回值：无 lz_restore_box_data() { @@ -2182,13 +2181,15 @@ lz_get_box_data() { && match(value, /^[\"][^\"]*[\"]$/) > 0) value="\\\""value"\\\""; if (invalid != 0) - system("sed -i \"s\|\^\[ \\t\]\*lz_config_"key"=\.\*\$\|lz_config_"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*lz_config_"key"=\.\*\$\|lz_config_"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); print "local_ini_"key"="value; if (invalid != 6) count++; } END{ if (count != length(i)-1) print "lz_restore_box_data"; + print "local param_total="length(i)-1 }' "${PATH_CONFIGS}/lz_rule_config.box" )" + [ "${param_total}" != "$( wc -l "${PATH_CONFIGS}/lz_rule_config.box" 2> /dev/null | awk '{print $1}' )" ] && lz_restore_box_data if [ "${local_ini_route_cache}" != "0" ] && [ "${local_ini_drop_sys_caches}" != "0" ] && [ "${local_ini_clear_route_cache_time_interval}" != "0" ]; then sed -i "s|^[[:space:]]*lz_config_clear_route_cache_time_interval=${local_ini_clear_route_cache_time_interval}|lz_config_clear_route_cache_time_interval=0|" "${PATH_CONFIGS}/lz_rule_config.box" > /dev/null 2>&1 local_ini_clear_route_cache_time_interval="0" @@ -2469,8 +2470,8 @@ lz_optimize_to_iptv() { } if (flag == 0) next; if (update != 0) { - system("sed -i \"s\|\^\[ \\t\]\*lz_config_"key"=\.\*\$\|lz_config_"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); - system("sed -i \"s\|\^\[ \\t\]\*"key"=\.\*\$\|"key"="value"\|\" \""fnm"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*lz_config_"key"=\.\*\$\|lz_config_"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"key"=\.\*\$\|"key"="value"\|\" \""fnm"\" \> \/dev\/null 2\>\&1"); } print "local_ini_"key"="value; print "local_"key"="value; @@ -2492,8 +2493,8 @@ lz_optimize_to_hd() { gsub(/[ \t#].*$/, "", value); if (value != 1) { value=1; - system("sed -i \"s\|\^\[ \\t\]\*lz_config_"key"=\.\*\$\|lz_config_"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); - system("sed -i \"s\|\^\[ \\t\]\*"key"=\.\*\$\|"key"="value"\|\" \""fnm"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*lz_config_"key"=\.\*\$\|lz_config_"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"key"=\.\*\$\|"key"="value"\|\" \""fnm"\" \> \/dev\/null 2\>\&1"); } print "local_ini_"key"="value; print "local_"key"="value; @@ -2515,8 +2516,8 @@ lz_restore_to_rn() { gsub(/[ \t#].*$/, "", value); if (value != 0) { value=0; - system("sed -i \"s\|\^\[ \\t\]\*lz_config_"key"=\.\*\$\|lz_config_"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); - system("sed -i \"s\|\^\[ \\t\]\*"key"=\.\*\$\|"key"="value"\|\" \""fnm"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*lz_config_"key"=\.\*\$\|lz_config_"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"key"=\.\*\$\|"key"="value"\|\" \""fnm"\" \> \/dev\/null 2\>\&1"); } print "local_ini_"key"="value; print "local_"key"="value; @@ -2565,16 +2566,16 @@ lz_get_web_data_to_config() { value="\*"; if (prefix == "") { if (key == "ruid_interval_day") - system("sed -i \"s\|\^\[ \\t\]\*"key"=\.\*\$\|"key"="value" ## 间隔天数（1~31）；\\\"ruid_interval_day=5\\\"表示每隔5天。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"key"=\.\*\$\|"key"="value" ## 间隔天数（1~31）；\\\"ruid_interval_day=5\\\"表示每隔5天。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); else if (key == "ruid_timer_hour") - system("sed -i \"s\|\^\[ \\t\]\*"key"=\.\*\$\|"key"="value" ## 时间小时数（0~23，\\\*表示由系统指定）；\\\"ruid_timer_hour=3\\\"表示更新当天的凌晨3点。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"key"=\.\*\$\|"key"="value" ## 时间小时数（0~23，\\\*表示由系统指定）；\\\"ruid_timer_hour=3\\\"表示更新当天的凌晨3点。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); else if (key == "ruid_timer_min") - system("sed -i \"s\|\^\[ \\t\]\*"key"=\.\*\$\|"key"="value" ## 时间分钟数（0~59，\\\*表示由系统指定）；\\\"ruid_timer_min=18\\\"表示更新当天的凌晨3点18分。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"key"=\.\*\$\|"key"="value" ## 时间分钟数（0~59，\\\*表示由系统指定）；\\\"ruid_timer_min=18\\\"表示更新当天的凌晨3点18分。\|\" \""fname"\" \> \/dev\/null 2\>\&1"); else - system("sed -i \"s\|\^\[ \\t\]\*"key"=\.\*\$\|"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"key"=\.\*\$\|"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); } else { key=prefix""key; - system("sed -i \"s\|\^\[ \\t\]\*"key"=\.\*\$\|"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); + system("sed -i \"s\|\^\[\[\:space\:\]\]\*"key"=\.\*\$\|"key"="value"\|\" \""fname"\" \> \/dev\/null 2\>\&1"); } }' "${SETTINGSFILE}" sed -i '/^[[:space:]]*lz_rule_/d' "${SETTINGSFILE}" @@ -2594,18 +2595,27 @@ if [ "${local_reinstall}" -gt "0" ] && [ "${PATH_LZ}" != "/jffs/scripts/lz" ]; t [ -f "${PATH_CONFIGS}/lz_rule_config.sh" ] && sed -i "s:/jffs/scripts/lz/:${PATH_LZ}/:g" "${PATH_CONFIGS}/lz_rule_config.sh" > /dev/null 2>&1 fi +if [ -f "${PATH_CONFIGS}/lz_rule_config.box" ]; then + ## 清除lz_rule_config.box内参数赋值等式中等号两端的不合法空格 + sed -i -e 's/^[[:space:]][[:space:]]*//' \ + -e 's/^\([a-zA-Z0-9_-][a-zA-Z0-9_-]*\)[[:space:]][[:space:]]*\([=][^=].*\)$/\1\2/' \ + -e 's/^\([a-zA-Z0-9_-][a-zA-Z0-9_-]*[=]\)[[:space:]][[:space:]]*\([^#[:space:]].*\)$/\1\2/' \ + -e 's/^[[:space:]][[:space:]]*//' \ + -e '/^[[:space:]]*#/d' \ + -e '/^[[:space:]]*$/d' "${PATH_CONFIGS}/lz_rule_config.box" + ## 删除lz_rule_config.box中可能出现的重复参数项 + awk -v x="0" '$1 ~ /^[a-zA-Z0-9_-][a-zA-Z0-9_-]*[=]/ && i[substr($1, 1, index($1, "="))]++ \ + {x++; printf " -e '\''%ss\/\^\.\*\$\/#\&\/g'\''", NR} END{if (x != "0") printf "\n"}' "${PATH_CONFIGS}/lz_rule_config.box" \ + | awk 'NF != "0" {system("sed -i"$0" -e '\''\/\^#\/d'\'' ""'"${PATH_CONFIGS}/lz_rule_config.box"'")}' +fi + ## 若lz_rule_config.sh不存在，则重新生成一个 ## 恢复缺省配置数据文件 ## 输入项： ## 全局常量 ## 返回值：无 if [ ! -f "${PATH_CONFIGS}/lz_rule_config.sh" ]; then - if [ -f "${PATH_CONFIGS}/lz_rule_config.box" ]; then - ## 删除lz_rule_config.box中可能出现的重复参数项 - awk -v x="0" '$1 ~ /^[a-zA-Z0-9_-][a-zA-Z0-9_-]*[=]/ && i[substr($1, 1, index($1, "="))]++ \ - {x++; printf " -e '\''%ss\/\^\.\*\$\/#\&\/g'\''", NR} END{if (x != "0") printf "\n"}' "${PATH_CONFIGS}/lz_rule_config.box" \ - | awk 'NF != "0" {system("sed -i"$0" -e '\''\/\^#\/d'\'' ""'"${PATH_CONFIGS}/lz_rule_config.box"'")}' - else + if [ ! -f "${PATH_CONFIGS}/lz_rule_config.box" ]; then ## 创建新的备份文件 ## 备份配置参数函数 ## 输入项： @@ -2627,6 +2637,17 @@ if [ ! -f "${PATH_CONFIGS}/lz_rule_config.sh" ]; then ## 返回值：无 lz_restore_cfg_file local_reinstall="$(( local_reinstall + 1 ))" +else + ## 清除lz_rule_config.sh内参数赋值等式中等号两端的不合法空格 + sed -i -e 's/^[[:space:]][[:space:]]*//' \ + -e 's/^\([a-zA-Z0-9_-][a-zA-Z0-9_-]*\)[[:space:]][[:space:]]*\([=][^=].*\)$/\1\2/' \ + -e 's/^\([a-zA-Z0-9_-][a-zA-Z0-9_-]*[=]\)[[:space:]][[:space:]]*\([^#[:space:]].*\)$/\1\2/' \ + -e 's/^[[:space:]][[:space:]]*//' "${PATH_CONFIGS}/lz_rule_config.sh" + + ## 注释lz_rule_config.sh中的重复参数项 + awk -v x="0" '$1 ~ /^[a-zA-Z0-9_-][a-zA-Z0-9_-]*[=]/ && i[substr($1, 1, index($1, "="))]++ \ + {x++; printf " -e '\''%ss\/\^\.\*\$\/###\&\/g'\''", NR} END{if (x != "0") printf "\n"}' "${PATH_CONFIGS}/lz_rule_config.sh" \ + | awk 'NF != "0" {system("sed -i"$0" ""'"${PATH_CONFIGS}/lz_rule_config.sh"'")}' fi if [ "${1}" = "default" ]; then @@ -2641,11 +2662,6 @@ if [ "${1}" = "default" ]; then fi fi -## 注释lz_rule_config.sh中的重复参数项 -awk -v x="0" '$1 ~ /^[a-zA-Z0-9_-][a-zA-Z0-9_-]*[=]/ && i[substr($1, 1, index($1, "="))]++ \ - {x++; printf " -e '\''%ss\/\^\.\*\$\/###\&\/g'\''", NR} END{if (x != "0") printf "\n"}' "${PATH_CONFIGS}/lz_rule_config.sh" \ - | awk 'NF != "0" {system("sed -i"$0" ""'"${PATH_CONFIGS}/lz_rule_config.sh"'")}' - ## 接收WEB前端数据至配置文件 ## 输入项： ## $1--配置文件全路径名称 @@ -2669,11 +2685,6 @@ if [ ! -f "${PATH_CONFIGS}/lz_rule_config.box" ]; then ## 返回值：无 lz_backup_config else - ## 删除lz_rule_config.box中的重复参数项 - awk -v x="0" '$1 ~ /^[a-zA-Z0-9_-][a-zA-Z0-9_-]*[=]/ && i[substr($1, 1, index($1, "="))]++ \ - {x++; printf " -e '\''%ss\/\^\.\*\$\/#\&\/g'\''", NR} END{if (x != "0") printf "\n"}' "${PATH_CONFIGS}/lz_rule_config.box" \ - | awk 'NF != "0" {system("sed -i"$0" -e '\''\/\^#\/d'\'' ""'"${PATH_CONFIGS}/lz_rule_config.box"'")}' - ## 获取备份参数 ## 输入项： ## 全局常量及变量 diff --git a/source_codes/lz/func/lz_rule_address_query.sh b/source_codes/lz/func/lz_rule_address_query.sh index f3e6e4ac..5f9c9219 100644 --- a/source_codes/lz/func/lz_rule_address_query.sh +++ b/source_codes/lz/func/lz_rule_address_query.sh @@ -1,5 +1,5 @@ #!/bin/sh -# lz_rule_address_query.sh v4.3.9 +# lz_rule_address_query.sh v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) ## 网址信息查询脚本 diff --git a/source_codes/lz/func/lz_rule_func.sh b/source_codes/lz/func/lz_rule_func.sh index 1952bbd2..6b5a7234 100644 --- a/source_codes/lz/func/lz_rule_func.sh +++ b/source_codes/lz/func/lz_rule_func.sh @@ -1,5 +1,5 @@ #!/bin/sh -# lz_rule_func.sh v4.3.9 +# lz_rule_func.sh v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) #BEIGIN diff --git a/source_codes/lz/func/lz_rule_status.sh b/source_codes/lz/func/lz_rule_status.sh index c5cd2004..e8c6e318 100644 --- a/source_codes/lz/func/lz_rule_status.sh +++ b/source_codes/lz/func/lz_rule_status.sh @@ -1,5 +1,5 @@ #!/bin/sh -# lz_rule_status.sh v4.3.9 +# lz_rule_status.sh v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) ## 显示脚本运行状态脚本 diff --git a/source_codes/lz/func/lz_vpn_daemon.sh b/source_codes/lz/func/lz_vpn_daemon.sh index 50ff0440..d0b70dfa 100644 --- a/source_codes/lz/func/lz_vpn_daemon.sh +++ b/source_codes/lz/func/lz_vpn_daemon.sh @@ -1,5 +1,5 @@ #!/bin/sh -# lz_vpn_daemon.sh v4.3.9 +# lz_vpn_daemon.sh v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) ## 虚拟专网客户端路由刷新处理后台守护进程脚本 @@ -9,7 +9,7 @@ #BEIGIN ## 版本号 -LZ_VERSION=v4.3.9 +LZ_VERSION=v4.4.0 ## 项目接口文件部署路径 PATH_INTERFACE="${0%/*}" diff --git a/source_codes/lz/interface/lz_rule_service.sh b/source_codes/lz/interface/lz_rule_service.sh index b519ece0..911c77e3 100644 --- a/source_codes/lz/interface/lz_rule_service.sh +++ b/source_codes/lz/interface/lz_rule_service.sh @@ -1,5 +1,5 @@ #!/bin/sh -# lz_rule_service.sh v4.3.9 +# lz_rule_service.sh v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) ## 服务接口脚本 diff --git a/source_codes/lz/js/lz_policy_routing.js b/source_codes/lz/js/lz_policy_routing.js index 43b61e99..6c89e7b9 100644 --- a/source_codes/lz/js/lz_policy_routing.js +++ b/source_codes/lz/js/lz_policy_routing.js @@ -1,5 +1,5 @@ /* -# lz_policy_routing.js v4.3.9 +# lz_policy_routing.js v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) # LZ JavaScript for Asuswrt-Merlin Router diff --git a/source_codes/lz/lz_rule.sh b/source_codes/lz/lz_rule.sh index 7681275a..c2f2e123 100644 --- a/source_codes/lz/lz_rule.sh +++ b/source_codes/lz/lz_rule.sh @@ -1,5 +1,5 @@ #!/bin/sh -# lz_rule.sh v4.3.9 +# lz_rule.sh v4.4.0 # By LZ 妙妙呜 (larsonzhang@gmail.com) # 本软件采用CIDR（无类别域间路由，Classless Inter-Domain Routing）技术，是一个在Internet上创建附加地 @@ -80,7 +80,7 @@ ## -------------全局数据定义及初始化------------------- ## 版本号 -LZ_VERSION=v4.3.9 +LZ_VERSION=v4.4.0 ## 运行状态查询命令 SHOW_STATUS="status" diff --git a/source_codes/lz/uninstall.sh b/source_codes/lz/uninstall.sh index 53e1d63a..1694faf7 100644 --- a/source_codes/lz/uninstall.sh +++ b/source_codes/lz/uninstall.sh @@ -1,5 +1,5 @@ #!/bin/sh -# uninstall.sh v4.3.9 +# uninstall.sh v4.4.0 # By LZ (larsonzhang@gmail.com) # LZ RULE script for Asuswrt-Merlin Router @@ -8,7 +8,7 @@ # BEIGIN -LZ_VERSION=v4.3.9 +LZ_VERSION=v4.4.0 TIMEOUT=10 CURRENT_PATH="${0%/*}" [ "${CURRENT_PATH:0:1}" != '/' ] && CURRENT_PATH="$( pwd )${CURRENT_PATH#*.}"