送信成功回执

app/Console/Base.php

@@ -11,4 +11,19 @@ namespace Luolongfei\App\Console;
 
 class Base
 {
+    /**
+     * 获取版本号数字部分
+     *
+     * @param $rawVer
+     *
+     * @return string|null
+     */
+    public function getVerNum($rawVer)
+    {
+        if (preg_match('/(?P<ver_num>\d+(?:\.\d+)*)/i', $rawVer, $m)) {
+            return $m['ver_num'];
+        }
+
+        return null;
+    }
 }

app/Console/FreeNom.php

@@ -18,7 +18,7 @@ use Luolongfei\Libs\Message;
 
 class FreeNom extends Base
 {
-    const VERSION = 'v0.4';
+    const VERSION = 'v0.4.1';
 
     const TIMEOUT = 33;
 
@@ -243,12 +243,13 @@ class FreeNom extends Base
                 'renewalFailuresArr' => $renewalFailuresArr,
                 'domainStatusArr' => $domainStatusArr,
             ];
-            Message::send('', '主人，我刚刚帮你续期域名啦~', 2, $data);
+            $result = Message::send('', '主人，我刚刚帮你续期域名啦~', 2, $data);
 
             system_log(sprintf(
-                '恭喜，成功续期 <green>%d</green> 个域名，失败 <green>%d</green> 个域名，详细的续期结果已送信成功，请注意查收',
+                '恭喜，成功续期 <green>%d</green> 个域名，失败 <green>%d</green> 个域名。%s',
                 count($renewalSuccessArr),
-                count($renewalFailuresArr)
+                count($renewalFailuresArr),
+                $result ? '详细的续期结果已送信成功，请注意查收。' : ''
             ));
 
             Log::info(sprintf("账户：%s\n续期结果如下：\n", $this->username), $data);

app/Console/MigrateEnvFile.php

@@ -132,22 +132,6 @@ class MigrateEnvFile extends Base
         return $this->getVerNum($m['env_file_version']);
     }
 
-    /**
-     * 获取版本号数字部分
-     *
-     * @param $rawVer
-     *
-     * @return string|null
-     */
-    public function getVerNum($rawVer)
-    {
-        if (preg_match('/(?P<ver_num>\d+(?:\.\d+)*)/i', $rawVer, $m)) {
-            return $m['ver_num'];
-        }
-
-        return null;
-    }
-
     /**
      * 备份旧文件
      *

libs/Message.php

@@ -20,10 +20,13 @@ abstract class Message extends Base
      * @param $method
      * @param $params
      *
+     * @return bool
      * @throws \Exception
      */
     public static function __callStatic($method, $params)
     {
+        $result = false;
+
         foreach (config('message') as $conf) {
             if ($conf['enable'] !== 1) {
                 if ($conf['not_enabled_tips']) { // 仅在存在配置的送信项未启用的情况下提醒
@@ -39,7 +42,11 @@ abstract class Message extends Base
                 throw new \Exception(sprintf('消息服务类 %s 必须继承并实现 MessageServiceInterface 接口', $conf['class']));
             }
 
-            $serviceInstance->$method(...$params);
+            if ($serviceInstance->$method(...$params) && !$result) { // 任一方式送信成功即为成功
+                $result = true;
+            }
         }
+
+        return $result;
     }
-}
+}