Bug fix

Bug Fix
fonqing · Jan 10, 2022 · f5f7b21 · f5f7b21
1 parent ae13086
commit f5f7b21
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/src/Notify/DingTalk.php b/src/Notify/DingTalk.php
@@ -1,7 +1,7 @@
 <?php
 namespace Aoma\Notify;
 use Aoma\Notify;
-use Aoma\Notify\Notify as NotifyInterface;
+use Aoma\Notify\NotifyInterface;
 use Exception;
 
 class DingTalk extends Notify implements NotifyInterface {
@@ -63,8 +63,10 @@ public function send($type, $title, $msg, $to = [], $extra = [])
                 $content.= $name.': '.$value.PHP_EOL;
             }
         }
-        $to = is_array($to) ? $to : [$to];
-        $content .= '@'.implode(' @', $to).PHP_EOL;
+        if(!empty($to)){
+            $this->mention = is_array($to) ? $to : [$to];
+        }
+        $content .= '@'.implode(' @', $this->mention).PHP_EOL;
         $content .= PHP_EOL;
         $data = [
             'msgtype' => 'markdown',
@@ -73,7 +75,7 @@ public function send($type, $title, $msg, $to = [], $extra = [])
                 'text' => $content
             ],
             'at' => [
-                'atMobiles' => $to,
+                'atMobiles' => $this->mention,
                 'isAtAll' => false
             ]
         ];

diff --git a/src/Notify/Feishu.php b/src/Notify/Feishu.php
@@ -1,7 +1,7 @@
 <?php
 namespace Aoma\Notify;
 use Aoma\Notify;
-use Aoma\Notify\Notify as NotifyInterface;
+use Aoma\Notify\NotifyInterface;
 use Exception;
 
 class Feishu extends Notify implements NotifyInterface {
@@ -62,8 +62,10 @@ public function send($type, $title, $msg, $to = [], $extra = [])
                 $content.= $name.': '.$value.PHP_EOL;
             }
         }
-        $to = is_array($to) ? $to : [$to];
-        foreach($to as $openid){
+        if(!empty($to)){
+            $this->mention = is_array($to) ? $to : [$to];
+        }
+        foreach($this->mention as $openid){
             $content.='<at user_id="'.$openid.'">相关接收人</at>'.PHP_EOL;
         }
 

diff --git a/src/Notify/Interface.php → src/Notify/NotifyInterface.php b/src/Notify/Interface.php → src/Notify/NotifyInterface.php
@@ -1,7 +1,7 @@
 <?php
 namespace Aoma\Notify;
 
-interface Notify {
+interface NotifyInterface {
 
     /**
      * Send message 

diff --git a/src/Notify/WxWork.php b/src/Notify/WxWork.php
@@ -1,7 +1,7 @@
 <?php
 namespace Aoma\Notify;
 use Aoma\Notify;
-use Aoma\Notify\Notify as NotifyInterface;
+use Aoma\Notify\NotifyInterface;
 use Exception;
 
 class WxWork extends Notify implements NotifyInterface {
@@ -62,14 +62,17 @@ public function send($type, $title, $msg, $to = [], $extra = [])
                 $content.= $name.': '.$value.PHP_EOL;
             }
         }
-        $to = is_array($to) ? $to : [$to];
+        if(!empty($to)){
+            $this->mention = is_array($to) ? $to : [$to];
+        }
         $data = [
             'msgtype' => 'markdown',
             'markdown' => [
                 'content' => $content.PHP_EOL,
-                'mentioned_mobile_list' => $to,
+                'mentioned_mobile_list' => $this->mention,
             ]
         ];
+        //success response : {"errcode":0,"errmsg":"ok"}
         return self::post($this->server.$this->key, [
             'Content-Type: application/json'
         ], json_encode($data, JSON_UNESCAPED_UNICODE));