Merge pull request #188 from yonggekkk/beta

Beta
This commit is contained in:
甬哥侃侃侃ygkkk
2025-03-19 22:58:16 +08:00
committed by GitHub
2 changed files with 13 additions and 12 deletions
+1 -1
View File
@@ -54,7 +54,7 @@ exec(changeportCommands, { maxBuffer: 1024 * 1024 * 10 }, (err, stdout, stderr)
} }
app.get("/rp", (req, res) => { app.get("/rp", (req, res) => {
runportCommand(); runportCommand();
res.type("html").send("<pre>重置三个节点端口完成!请稍等10秒后,主页后缀改为 /list/你的uuid 可查看更新端口后的节点及订阅信息</pre>"); res.type("html").send("<pre>重置三个节点端口完成!请稍等20秒后,主页后缀改为 /list/你的uuid 可查看更新端口后的节点及订阅信息</pre>");
}); });
app.get("/list/key", (req, res) => { app.get("/list/key", (req, res) => {
+12 -11
View File
@@ -274,14 +274,15 @@ argo_configure() {
fi fi
if [[ "$argo_choice" == "g" || "$argo_choice" == "G" ]]; then if [[ "$argo_choice" == "g" || "$argo_choice" == "G" ]]; then
reading "请输入argo固定隧道域名: " ARGO_DOMAIN reading "请输入argo固定隧道域名: " ARGO_DOMAIN
echo "$ARGO_DOMAIN" > ARGO_DOMAIN.log echo "$ARGO_DOMAIN" | tee ARGO_DOMAIN.log ARGO_DOMAIN_show.log > /dev/null
green "你的argo固定隧道域名为: $ARGO_DOMAIN" green "你的argo固定隧道域名为: $ARGO_DOMAIN"
reading "请输入argo固定隧道密钥(当你粘贴Token时,必须以ey开头): " ARGO_AUTH reading "请输入argo固定隧道密钥(当你粘贴Token时,必须以ey开头): " ARGO_AUTH
echo "$ARGO_AUTH" > ARGO_AUTH.log echo "$ARGO_AUTH" | tee ARGO_AUTH.log ARGO_AUTH_show.log > /dev/null
green "你的argo固定隧道密钥为: $ARGO_AUTH" green "你的argo固定隧道密钥为: $ARGO_AUTH"
rm -rf boot.log rm -rf boot.log
else else
green "使用Argo临时隧道" green "使用Argo临时隧道"
rm -rf ARGO_AUTH.log ARGO_DOMAIN.log
fi fi
break break
done done
@@ -1329,15 +1330,15 @@ resargo(){
if [[ -e $WORKDIR/config.json ]]; then if [[ -e $WORKDIR/config.json ]]; then
cd $WORKDIR cd $WORKDIR
argogdshow(){ argogdshow(){
if [ -f ARGO_AUTH.log ]; then
echo echo
if [ -f ARGO_AUTH_show.log ]; then
argoport=$(jq -r '.inbounds[4].listen_port' config.json) argoport=$(jq -r '.inbounds[4].listen_port' config.json)
purple "如果你想设置原先的Argo固定隧道,请明确以下三点" purple "如果你想设置原先的Argo固定隧道,请明确以下三点"
purple "1:已设置Argo固定域名:$(cat ARGO_DOMAIN.log)" purple "1:已设置Argo固定域名:$(cat ARGO_DOMAIN_show.log)"
purple "2:固定隧道token$(cat ARGO_AUTH.log)" purple "2:固定隧道token$(cat ARGO_AUTH_show.log)"
purple "3:检查CF官网的ARGO固定隧道端口:$argoport" purple "3:检查CF官网的ARGO固定隧道端口:$argoport"
echo
fi fi
echo
} }
if [ -f boot.log ]; then if [ -f boot.log ]; then
green "当前正在使用Argo临时隧道" green "当前正在使用Argo临时隧道"
@@ -1352,15 +1353,15 @@ ps aux | grep '[t]unnel --n' | awk '{print $2}' | xargs -r kill -9 > /dev/null 2
agg=$(cat ag.txt) agg=$(cat ag.txt)
if [[ "$argo_choice" =~ (G|g) ]]; then if [[ "$argo_choice" =~ (G|g) ]]; then
if [ "$hona" = "serv00" ]; then if [ "$hona" = "serv00" ]; then
sed -i '' -e "15s|''|'$(cat ARGO_DOMAIN.log)'|" ~/serv00keep.sh sed -i '' -e "15s|''|'$(cat ARGO_DOMAIN_show.log)'|" ~/serv00keep.sh
sed -i '' -e "16s|''|'$(cat ARGO_AUTH.log)'|" ~/serv00keep.sh sed -i '' -e "16s|''|'$(cat ARGO_AUTH_show.log)'|" ~/serv00keep.sh
fi fi
args="tunnel --no-autoupdate run --token $(cat ARGO_AUTH.log)" args="tunnel --no-autoupdate run --token $(cat ARGO_AUTH_show.log)"
else else
rm -rf boot.log rm -rf boot.log
if [ "$hona" = "serv00" ]; then if [ "$hona" = "serv00" ]; then
sed -i '' -e "15s|'$(cat ARGO_DOMAIN.log)'|''|" ~/serv00keep.sh sed -i '' -e "15s|'$(cat ARGO_DOMAIN_show.log)'|''|" ~/serv00keep.sh
sed -i '' -e "16s|'$(cat ARGO_AUTH.log)'|''|" ~/serv00keep.sh sed -i '' -e "16s|'$(cat ARGO_AUTH_show.log)'|''|" ~/serv00keep.sh
fi fi
args="tunnel --url http://localhost:$argoport --no-autoupdate --logfile boot.log --loglevel info" args="tunnel --url http://localhost:$argoport --no-autoupdate --logfile boot.log --loglevel info"
fi fi