From c2b977e372baf29565ed8ec3bc917cc3a433e558 Mon Sep 17 00:00:00 2001 From: luolongfei Date: Sun, 25 Feb 2024 13:08:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E5=A4=84=E4=BC=A0?= =?UTF-8?q?=E5=8F=82=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++++- app/Console/FreeNom.php | 2 +- app/Exceptions/LlfException.php | 2 +- app/helpers.php | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 147b20bf9..b661a9ff5 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,12 @@ Documentation: [English version](https://github.com/luolongfei/freenom/blob/main/README_EN.md) | 中文版 -2024/02/07 Freenom 提供免费顶级域名的时代终结了,也不太可能会有替代品,江湖路远,有缘再见。更多消息可在热心网友的电报群内交流。 +2024/02/07 Freenom 已被撤销域名相关执照,所有人的域名都被强制改为 peddling 状态,目前可以通过给 freenom 发邮件请求恢复域名,官方将帮你把域名续期到 9 年后, +不过这个 9 年有可能只是暂时的,大概率后续会直接删域名,所以各位最好尽早使用付费域名替换之。江湖路远,后会有期。更多消息可在热心网友的电报群内交流。 [https://t.me/freenom_auto_renew](https://t.me/freenom_auto_renew) +On February 7, 2024, Freenom's domain-related licenses were revoked, and everyone's domains were forcibly changed to a peddling status. Currently, you can request to restore your domain by sending an email to Freenom. The official will help you renew your domain for 9 years. However, this 9-year period may only be temporary, and there is a high probability that the domain will be deleted later. Therefore, it is best for everyone to replace it with a paid domain as soon as possible. The road ahead is long, we will meet again. For more news, you can communicate in the Telegram group: [https://t.me/freenom_auto_renew](https://t.me/freenom_auto_renew) + 如果你需要一台高性价比的服务器,可以参考 [美国便宜 VPS](https://go.llfapp.com/cc) [📢 公告](#-公告) diff --git a/app/Console/FreeNom.php b/app/Console/FreeNom.php index 712c12ce2..281398d77 100644 --- a/app/Console/FreeNom.php +++ b/app/Console/FreeNom.php @@ -20,7 +20,7 @@ class FreeNom extends Base { - const VERSION = 'v0.6.1'; + const VERSION = 'v0.6.2'; const TIMEOUT = 33; diff --git a/app/Exceptions/LlfException.php b/app/Exceptions/LlfException.php index 2c56be5ee..d84bed5f2 100644 --- a/app/Exceptions/LlfException.php +++ b/app/Exceptions/LlfException.php @@ -19,7 +19,7 @@ public function __construct($code, $additional = null, \Exception $previous = nu if (is_array($additional)) { array_unshift($additional, $message); $message = call_user_func_array('sprintf', $additional); - } else if (is_string($additional)) { + } else if (is_string($additional) || is_numeric($additional)) { $message = sprintf($message, $additional); } } diff --git a/app/helpers.php b/app/helpers.php index 7b74e747b..9107897fd 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -474,7 +474,7 @@ function getAwsWafToken() if ($USE_OPEN_SOURCE_WAF_SOLVER_API === 1) { $OPEN_SOURCE_WAF_SOLVER_URL = \env('OPEN_SOURCE_WAF_SOLVER_URL'); if (!$OPEN_SOURCE_WAF_SOLVER_URL) { - throw new LlfException('34520020'); + throw new LlfException(34520020); } $OPEN_SOURCE_WAF_SOLVER_URL = rtrim($OPEN_SOURCE_WAF_SOLVER_URL, '/'); @@ -509,13 +509,13 @@ function getAwsWafToken() sleep($n > 5 ? 60 : 10); // 前 5 次每次休眠 10 秒,之后每次休眠 60 秒 } - throw new LlfException(sprintf(lang('exception_msg.34520021'), $maxWaitSeconds)); + throw new LlfException(34520021, $maxWaitSeconds); } // 使用自建接口获取 $AWS_WAF_SOLVER_URL = \env('AWS_WAF_SOLVER_URL'); if (!$AWS_WAF_SOLVER_URL) { - throw new LlfException('34520017'); + throw new LlfException(34520017); } $AWS_WAF_SOLVER_URL = rtrim($AWS_WAF_SOLVER_URL, '/');