Merge pull request #118 from wonder-game/develop

feat: 飞书可自定义模板内容（昝薪）
wonder-game · Jul 4, 2024 · fa55571 · fa55571
2 parents 0f7946a + 820f4ff
commit fa55571
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/src/Notify/Feishu/Message/Base.php b/src/Notify/Feishu/Message/Base.php
@@ -20,6 +20,24 @@ abstract class Base extends SplBean implements MessageInterface
      */
     protected $atUserID = [];
 
+    /**
+     * 是否使用内部消息格式
+     * @var boolean
+     */
+    protected $inner = true;
+
+    /**
+     * 主标题
+     * @var string
+     */
+    protected $title = '程序异常';
+
+    /**
+     * 内容
+     * @var string
+     */
+    protected $content = '';
+
     protected $isAtAll = false;
 
     public function getAtText($text = '')

diff --git a/src/Notify/Feishu/Message/Card.php b/src/Notify/Feishu/Message/Card.php
@@ -4,8 +4,6 @@
 
 class Card extends Base
 {
-    protected $content = '';
-
     public function fullData()
     {
         $data = [
@@ -16,7 +14,7 @@ public function fullData()
                         'tag' => 'div',
                         'text' => [
                             'tag' => 'lark_md',
-                            'content' => $this->getServerText($this->content),
+                            'content' => $this->inner ? $this->getServerText($this->content) : $this->content,
                         ],
                     ],
                     [
@@ -26,7 +24,7 @@ public function fullData()
                                 'tag' => 'button',
                                 'text' => [
                                     'tag' => 'lark_md',
-                                    'content' => $this->getServerText($this->content),
+                                    'content' => $this->inner ? $this->getServerText($this->content) : $this->content,
                                 ],
                                 'url' => 'https://www.baidu.com',
                                 'type' => 'default',
@@ -45,7 +43,7 @@ public function fullData()
                 'header' => [
                     'title' => [
                         'tag' => 'plain_text',
-                        'content' => '程序异常',
+                        'content' => $this->title,
                     ],
                 ],
             ],

diff --git a/src/Notify/Feishu/Message/CardError.php b/src/Notify/Feishu/Message/CardError.php
@@ -15,12 +15,6 @@ class CardError extends Base
      */
     protected $titleColor = 'red';
 
-    /**
-     * 主标题
-     * @var string
-     */
-    protected $title = '程序异常';
-
     /**
      * 副标题，可不设置
      * @var string

diff --git a/src/Notify/Feishu/Message/Text.php b/src/Notify/Feishu/Message/Text.php
@@ -4,14 +4,12 @@
 
 class Text extends Base
 {
-    protected $content = '';
-
     public function fullData()
     {
         return [
             'msg_type' => 'text',
             'content' => [
-                'text' => $this->getAtText($this->getServerText($this->content)),
+                'text' => $this->inner ? $this->getAtText($this->getServerText($this->content)) : $this->content,
             ],
         ];
     }

diff --git a/src/Notify/Feishu/Message/Textarea.php b/src/Notify/Feishu/Message/Textarea.php
@@ -4,21 +4,19 @@
 
 class Textarea extends Base
 {
-    protected $content = '';
-
     public function fullData()
     {
         $data = [
             'msg_type' => 'post',
             'content' => [
                 'post' => [
                     'zh_cn' => [
-                        'title' => '程序异常',
+                        'title' => $this->title,
                         'content' => [
                             [
                                 [
                                     'tag' => 'text',
-                                    'text' => $this->getServerText($this->content),
+                                    'text' => $this->inner ? $this->getServerText($this->content) : $this->content,
                                 ],
                             ],
                         ],