1 Commits
v4.06 ... v4.07

Author SHA1 Message Date
233boy
b0207515a0 fix api fail and test run 2023-05-27 08:07:12 +08:00
3 changed files with 8 additions and 7 deletions

View File

@@ -828,6 +828,7 @@ api() {
[[ ! $1 ]] && err "无法识别 API 的参数." [[ ! $1 ]] && err "无法识别 API 的参数."
[[ $is_core_stop ]] && { [[ $is_core_stop ]] && {
warn "$is_core_name 当前处于停止状态." warn "$is_core_name 当前处于停止状态."
is_api_fail=1
return return
} }
case $1 in case $1 in
@@ -1244,7 +1245,7 @@ get() {
dokodemo-door*) dokodemo-door*)
is_protocol=dokodemo-door is_protocol=dokodemo-door
net=door net=door
json_str='settings:{port:'\"$door_port\"',address:'\"$door_addr\"',network:"tcp,udp"}' json_str='settings:{port:'"$door_port"',address:'\"$door_addr\"',network:"tcp,udp"}'
;; ;;
*http*) *http*)
is_protocol=http is_protocol=http
@@ -1393,7 +1394,7 @@ get() {
return return
} }
is_no_manage_msg=1 is_no_manage_msg=1
if [[ $is_core_stop ]]; then if [[ ! $(pgrep -f $is_core_bin) ]]; then
_yellow "\n测试运行 $is_core_name ..\n" _yellow "\n测试运行 $is_core_name ..\n"
manage start &>/dev/null manage start &>/dev/null
if [[ $is_run_fail == $is_core ]]; then if [[ $is_run_fail == $is_core ]]; then
@@ -1406,7 +1407,7 @@ get() {
_green "\n$is_core_name 正在运行, 跳过测试\n" _green "\n$is_core_name 正在运行, 跳过测试\n"
fi fi
if [[ $is_caddy ]]; then if [[ $is_caddy ]]; then
if [[ $is_caddy_stop ]]; then if [[ ! $(pgrep -f $is_caddy_bin) ]]; then
_yellow "\n测试运行 Caddy ..\n" _yellow "\n测试运行 Caddy ..\n"
manage start caddy &>/dev/null manage start caddy &>/dev/null
if [[ $is_run_fail == 'caddy' ]]; then if [[ $is_run_fail == 'caddy' ]]; then

View File

@@ -79,9 +79,9 @@ about() {
####### 要点13脸吗只会改我链接的小人 ####### ####### 要点13脸吗只会改我链接的小人 #######
unset c n m s b unset c n m s b
msg msg
msg "Blog: $(msg_ul https://233boy.com)" msg "网站: $(msg_ul https://233boy.com)"
msg "Chat: $(msg_ul https://t.me/tg233boy)" msg "频道: $(msg_ul https://t.me/tg2333)"
msg "Chanel: $(msg_ul https://t.me/tg2333)" msg "群组: $(msg_ul https://t.me/tg233boy)"
msg "Github: $(msg_ul https://github.com/${is_sh_repo})" msg "Github: $(msg_ul https://github.com/${is_sh_repo})"
msg "Twitter: $(msg_ul https://twitter.com/ai233boy)" msg "Twitter: $(msg_ul https://twitter.com/ai233boy)"
msg "$is_core_name site: $(msg_ul https://www.v2fly.org)" msg "$is_core_name site: $(msg_ul https://www.v2fly.org)"

View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
args=$@ args=$@
is_sh_ver=v4.06 is_sh_ver=v4.07
. /etc/v2ray/sh/src/init.sh . /etc/v2ray/sh/src/init.sh