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

update 2025-01-12 20:41:18

Browse Source
This commit is contained in:
actions-user 2025-01-12 20:41:18 +08:00
parent ffb1f9ff3f
commit 5b686ac7bf
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
luci-app-bypass/luci-app-bypass/luasrc/model/cbi/bypass/client-config.lua
View File

@ -529,6 +529,7 @@ o:depends({type = "v2ray", v2ray_protocol = "vmess"})
-- VmessId -- VmessId
o = s:option(Value, "vmess_id", translate("Vmess/VLESS ID (UUID)")) o = s:option(Value, "vmess_id", translate("Vmess/VLESS ID (UUID)"))
o.rmempty = true o.rmempty = true
o.password = true
o.default = uuid o.default = uuid
o:depends({type = "v2ray", v2ray_protocol = "vmess"}) o:depends({type = "v2ray", v2ray_protocol = "vmess"})
o:depends({type = "v2ray", v2ray_protocol = "vless"}) o:depends({type = "v2ray", v2ray_protocol = "vless"})

13
luci-app-bypass/luci-app-bypass/root/etc/init.d/bypass
View File

@ -54,7 +54,6 @@ switch_enable=0
switch_server=$1 switch_server=$1
server_count=0 server_count=0
enabled=$(uci -q get ${NAME}.@global[0].enabled) enabled=$(uci -q get ${NAME}.@global[0].enabled)
EXTRA_COMMANDS='reset' EXTRA_COMMANDS='reset'
@ -92,7 +91,6 @@ socks5_ip=''
gen_log()( gen_log()(
[ -s $LOG ] && echo -e "\n$(date +'%Y-%m-%d %H:%M:%S') ===程序开始运行===" >> $LOG [ -s $LOG ] && echo -e "\n$(date +'%Y-%m-%d %H:%M:%S') ===程序开始运行===" >> $LOG
log "检查网络状态."
) )
log(){ log(){
@ -276,7 +274,7 @@ check_net(){
get_soip(){ get_soip(){
if [ $SO_SERVER ];then if [ $SO_SERVER ];then
if [ "$1" = 1 ];then if [ "$1" = 1 ];then
cat $LOG 2>/dev/null | sed -n '$p' | grep -q '检查网络状态...' || gen_log cat $LOG 2>/dev/null | sed -n '$p' | grep -q '程序开始运行' || gen_log
check_net check_net
cat $LOG 2>/dev/null | sed -n '$p' | grep -q '检查网络连接正常' || log "Rules : 检查网络连接正常" cat $LOG 2>/dev/null | sed -n '$p' | grep -q '检查网络连接正常' || log "Rules : 检查网络连接正常"
fi fi
@ -292,7 +290,7 @@ rules(){
if `busybox ps -w | grep by-retcp | grep -qv grep`;then if `busybox ps -w | grep by-retcp | grep -qv grep`;then
log "Rules :Bypass启动成功.";/etc/init.d/bypass restart >/dev/null 2>&1 log "Rules :Bypass启动成功.";/etc/init.d/bypass restart >/dev/null 2>&1
fi fi
cat $LOG 2>/dev/null | sed -n '$p' | grep -q '检查网络状态.\|下载IP/GFW文件.' || gen_log cat $LOG 2>/dev/null | sed -n '$p' | grep -q '程序开始运行\|下载IP/GFW文件.' || gen_log
check_net check_net
cat $LOG 2>/dev/null | sed -n '$p' | grep -q '下载IP/GFW文件...' || (log "Rules : 检查网络状态正常";log "Rules : 检查IP/GFW文件...") cat $LOG 2>/dev/null | sed -n '$p' | grep -q '下载IP/GFW文件...' || (log "Rules : 检查网络状态正常";log "Rules : 检查IP/GFW文件...")
[ ! -d $VAR ] && mkdir -p $VAR [ ! -d $VAR ] && mkdir -p $VAR
@ -1295,7 +1293,7 @@ start_monitor(){
} }
start() { start() {
[ $enabled == 0 ] && exit 1 [ $enabled == 0 ] && stop && exit 1
[ -f $LOC ] && exit 1 [ -f $LOC ] && exit 1
touch $LOC touch $LOC
[ ! -s $LOG ] && echo '' > $LOG [ ! -s $LOG ] && echo '' > $LOG
@ -1348,7 +1346,7 @@ start() {
fi fi
clean_log clean_log
rm -f $LOCK $LOC rm -f $LOCK $LOC
log "===程序运行完成===" [ $enabled == 0 ] || log "===程序运行完成==="
} }
boot() { boot() {
@ -1424,8 +1422,7 @@ stop(){
sleep 1 sleep 1
done done
fi fi
[ $enabled == 0 ] && exit 1 [ $enabled == 0 ] && exit 1 || echo -e "$(date +'%Y-%m-%d %H:%M:%S') ===清空缓存及关闭相关程序完成===" >> $LOG
echo -e "\n$(date +'%Y-%m-%d %H:%M:%S') ===清空缓存及关闭相关程序完成===" >> $LOG
} }