From b40edc168b1c65196eb38b280ce75f8afe912294 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Sat, 2 May 2020 10:31:51 +0800
Subject: [PATCH] =?UTF-8?q?A=20=E5=8F=91=E5=B8=83=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_api/apps/deploy/utils.py               | 21 ++++++++++++++++++++-
 spug_web/src/pages/deploy/app/Ext1Setup1.js |  1 +
 spug_web/src/pages/deploy/app/Ext2Setup1.js |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/spug_api/apps/deploy/utils.py b/spug_api/apps/deploy/utils.py
index d24c423..c1f443e 100644
--- a/spug_api/apps/deploy/utils.py
+++ b/spug_api/apps/deploy/utils.py
@@ -224,7 +224,7 @@ class Helper:
                         'text': '\n\n'.join(texts)
                     }
                 }
-                res = requests.post(rst_notify['value'], json=data)
+                requests.post(rst_notify['value'], json=data)
             elif rst_notify['mode'] == '2':
                 data = {
                     'req_id': req.id,
@@ -238,6 +238,25 @@ class Helper:
                     'deploy_at': human_datetime()
                 }
                 requests.post(rst_notify['value'], json=data)
+            elif rst_notify['mode'] == '3':
+                color, text = ('info', '成功') if req.status == '3' else ('warning', '失败')
+                texts = [
+                    '## %s' % '发布结果通知',
+                    f'**应用名称：** {req.deploy.app.name} ',
+                    f'**应用版本：** {version} ',
+                    f'**发布环境：** {req.deploy.env.name} ',
+                    f'**发布主机：** {",".join(x["name"] for x in hosts)} ',
+                    f'**发布结果：** <font color="{color}">{text}</font>',
+                    f'**发布时间：** {human_datetime()} ',
+                    '> 来自 Spug运维平台'
+                ]
+                data = {
+                    'msgtype': 'markdown',
+                    'markdown': {
+                        'content': '\n'.join(texts)
+                    }
+                }
+                requests.post(rst_notify['value'], json=data)
 
     def parse_filter_rule(self, data: str):
         data, files = data.strip(), []
diff --git a/spug_web/src/pages/deploy/app/Ext1Setup1.js b/spug_web/src/pages/deploy/app/Ext1Setup1.js
index 5bc30e9..abf21e9 100644
--- a/spug_web/src/pages/deploy/app/Ext1Setup1.js
+++ b/spug_web/src/pages/deploy/app/Ext1Setup1.js
@@ -42,6 +42,7 @@ export default observer(function Ext2Setup1() {
             value={info['rst_notify']['mode']} style={{width: 100}} onChange={v => info['rst_notify']['mode'] = v}>
             <Select.Option value="0">关闭</Select.Option>
             <Select.Option value="1">钉钉</Select.Option>
+            <Select.Option value="3">企业微信</Select.Option>
             <Select.Option value="2">Webhook</Select.Option>
           </Select>
         )}
diff --git a/spug_web/src/pages/deploy/app/Ext2Setup1.js b/spug_web/src/pages/deploy/app/Ext2Setup1.js
index 4d472a2..ffe669f 100644
--- a/spug_web/src/pages/deploy/app/Ext2Setup1.js
+++ b/spug_web/src/pages/deploy/app/Ext2Setup1.js
@@ -39,6 +39,7 @@ export default observer(function Ext2Setup1() {
             value={info['rst_notify']['mode']} style={{width: 100}} onChange={v => info['rst_notify']['mode'] = v}>
             <Select.Option value="0">关闭</Select.Option>
             <Select.Option value="1">钉钉</Select.Option>
+            <Select.Option value="3">企业微信</Select.Option>
             <Select.Option value="2">Webhook</Select.Option>
           </Select>
         )}