From 4cc7ba582cbe1dddb1fe3e5249dc888e155cf16b Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Thu, 9 Mar 2023 16:58:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AE=9D=E5=A1=94=EF=BC=88aaPanel=EF=BC=89=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 12b5f68..b617aae 100644 --- a/install.sh +++ b/install.sh @@ -337,7 +337,7 @@ checkBTPanel() { if [[ -d '/www/server/panel/vhost/cert/' ]]; then btDomain=$(find /www/server/panel/vhost/cert/* | head -1 | awk -F "[/]" '{print $7}') domain=${btDomain} - if [[ ! -L "/etc/v2ray-agent/tls/${btDomain}.key" && ! -L "/etc/v2ray-agent/tls/${btDomain}.crt" ]]; then + if [[ ! -f "/etc/v2ray-agent/tls/${btDomain}.key" && ! -f "/etc/v2ray-agent/tls/${btDomain}.crt" && ! -L "/etc/v2ray-agent/tls/${btDomain}.key" && ! -L "/etc/v2ray-agent/tls/${btDomain}.crt" ]]; then ln -s "/www/server/panel/vhost/cert/${btDomain}/privkey.pem" "/etc/v2ray-agent/tls/${btDomain}.key" ln -s "/www/server/panel/vhost/cert/${btDomain}/fullchain.pem" "/etc/v2ray-agent/tls/${btDomain}.crt" fi @@ -5570,7 +5570,7 @@ menu() { cd "$HOME" || exit echoContent red "\n==============================================================" echoContent green "作者：mack-a" - echoContent green "当前版本：v2.7.11" + echoContent green "当前版本：v2.7.12" echoContent green "Github：https://github.com/mack-a/v2ray-agent" echoContent green "描述：八合一共存脚本\c" showInstallStatus From 3e1b665528bce4e0a1ffeeca55dc54f84325e83b Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:32:22 +0800 Subject: [PATCH 2/3] feat(aff): update --- documents/donation_aff.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/documents/donation_aff.md b/documents/donation_aff.md index 56a2997..05b3ab0 100644 --- a/documents/donation_aff.md +++ b/documents/donation_aff.md @@ -172,6 +172,8 @@ CLOUD K JP: JAPAN TOKYO SOFTBANK IP TRANSIT|512M|1核|10G|500G|100Mbps|8.2 USD/ - 去程有可能更换 - 线路实测为主 - [speedtest](http://dmit-hkg-lite.gubo.org/speedtest/) +- 不建议非移动用户购买 +- lite路由可能会随时更改，买之前请多次测试回程和去程路由 - 测试ip：103.135.248.22 #### 去程 @@ -180,7 +182,7 @@ CLOUD K JP: JAPAN TOKYO SOFTBANK IP TRANSIT|512M|1核|10G|500G|100Mbps|8.2 USD/ - 移动CMI #### 回程 -- 三网CMI +- 移动CMI #### 折扣码【仅适用于 STARTER 及以上规格的 Lite 产品，TINY 不包含在内】 - 年付七折：Lite-Annually-Recur-30OFF From b2b04fef7b5ebd17f18441b3bd77cff6b5b0ff00 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Fri, 10 Mar 2023 13:38:18 +0800 Subject: [PATCH 3/3] feat(aff): update --- documents/donation_aff.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documents/donation_aff.md b/documents/donation_aff.md index 05b3ab0..b57096d 100644 --- a/documents/donation_aff.md +++ b/documents/donation_aff.md @@ -17,7 +17,7 @@ ## 2.推荐商家 ### 1.[搬瓦工](https://bandwagonhost.com/cart.php?aff=64917) - 老牌商家在vps圈声望比较高，非常稳定，补货后基本很快会被抢空 -- 6.58%折扣码：BWH3HYATVBJW +- 6.81%折扣码：BWHNCXNVXV - 12%优惠码：BWHNY2022 @@ -141,7 +141,7 @@ PVM.SJC.GIANT| 16G |8vCPU|400G|44T|10Gbps|$199.9 USD/月|[点击购买](https: ### 1.[搬瓦工](https://bandwagonhost.com/cart.php?aff=64917) - 老牌商家在vps圈声望比较高，非常稳定，补货后基本很快会被抢空 - 不接受退款 -- 6.58%折扣码：BWH3HYATVBJW +- 6.81%折扣码：BWHNCXNVXV - location是【JP-Equinix Osaka Softbank】 套餐名称|内存|CPU|硬盘|流量|带宽|价格|购买链接