From 5250eb7ec724e54d92aaaebb8161ba505a4eaf10 Mon Sep 17 00:00:00 2001 From: robot Date: Tue, 9 Jun 2020 21:16:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=EF=BC=8C=E6=9C=80=E5=A4=9A=E6=98=BE=E7=A4=BA2=E5=8F=B0?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=EF=BC=8C=E5=B9=B6=E6=8F=90=E7=A4=BA=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E7=9A=84=E4=B8=BB=E6=9C=BA=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_api/apps/deploy/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spug_api/apps/deploy/utils.py b/spug_api/apps/deploy/utils.py index 92bbe40..191cd19 100644 --- a/spug_api/apps/deploy/utils.py +++ b/spug_api/apps/deploy/utils.py @@ -219,7 +219,7 @@ class Helper: f'**应用名称：** {req.deploy.app.name} ', f'**应用版本：** {version} ', f'**发布环境：** {req.deploy.env.name} ', - f'**发布主机：** {",".join(x["name"] for x in hosts)} ', + f'**发布主机：** {",".join(x["name"] for x in hosts[0:2]) + ' 等%s台主机' % len(hosts)} ', f'**发布结果：** {text}', f'**发布时间：** {human_datetime()} ', '> 来自 Spug运维平台' @@ -252,7 +252,7 @@ class Helper: f'**应用名称：** {req.deploy.app.name} ', f'**应用版本：** {version} ', f'**发布环境：** {req.deploy.env.name} ', - f'**发布主机：** {",".join(x["name"] for x in hosts)} ', + f'**发布主机：** {",".join(x["name"] for x in hosts[0:2]) + ' 等%s台主机' % len(hosts)} ', f'**发布结果：** {text}', f'**发布时间：** {human_datetime()} ', '> 来自 Spug运维平台' From b88ef73c86776178e7b4579a16e60ebd4a1f3f18 Mon Sep 17 00:00:00 2001 From: robot Date: Tue, 9 Jun 2020 21:39:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_api/apps/deploy/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spug_api/apps/deploy/utils.py b/spug_api/apps/deploy/utils.py index 191cd19..6f66a22 100644 --- a/spug_api/apps/deploy/utils.py +++ b/spug_api/apps/deploy/utils.py @@ -219,7 +219,7 @@ class Helper: f'**应用名称：** {req.deploy.app.name} ', f'**应用版本：** {version} ', f'**发布环境：** {req.deploy.env.name} ', - f'**发布主机：** {",".join(x["name"] for x in hosts[0:2]) + ' 等%s台主机' % len(hosts)} ', + f'**发布主机：** {",".join(x["name"] for x in hosts[0:2])} ' + '等%s台主机' % len(hosts), f'**发布结果：** {text}', f'**发布时间：** {human_datetime()} ', '> 来自 Spug运维平台' @@ -252,7 +252,7 @@ class Helper: f'**应用名称：** {req.deploy.app.name} ', f'**应用版本：** {version} ', f'**发布环境：** {req.deploy.env.name} ', - f'**发布主机：** {",".join(x["name"] for x in hosts[0:2]) + ' 等%s台主机' % len(hosts)} ', + f'**发布主机：** {",".join(x["name"] for x in hosts[0:2])} ' + '等%s台主机' % len(hosts), f'**发布结果：** {text}', f'**发布时间：** {human_datetime()} ', '> 来自 Spug运维平台' From 065c05983e772dd7fada7d2801660d33a3ec9976 Mon Sep 17 00:00:00 2001 From: robot Date: Wed, 10 Jun 2020 10:17:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=8F=E4=BA=8E=E4=B8=A4=E5=8F=B0?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=AD=89?= =?UTF-8?q?xx=E5=8F=B0=E4=B8=BB=E6=9C=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_api/apps/deploy/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spug_api/apps/deploy/utils.py b/spug_api/apps/deploy/utils.py index 6f66a22..5d78a5b 100644 --- a/spug_api/apps/deploy/utils.py +++ b/spug_api/apps/deploy/utils.py @@ -219,7 +219,7 @@ class Helper: f'**应用名称：** {req.deploy.app.name} ', f'**应用版本：** {version} ', f'**发布环境：** {req.deploy.env.name} ', - f'**发布主机：** {",".join(x["name"] for x in hosts[0:2])} ' + '等%s台主机' % len(hosts), + f'**发布主机：** {",".join(x["name"] for x in hosts[0:2])} ' + ( ' 等%s台主机' % len(hosts) if len(hosts) > 2 else '' ), f'**发布结果：** {text}', f'**发布时间：** {human_datetime()} ', '> 来自 Spug运维平台' @@ -252,7 +252,7 @@ class Helper: f'**应用名称：** {req.deploy.app.name} ', f'**应用版本：** {version} ', f'**发布环境：** {req.deploy.env.name} ', - f'**发布主机：** {",".join(x["name"] for x in hosts[0:2])} ' + '等%s台主机' % len(hosts), + f'**发布主机：** {",".join(x["name"] for x in hosts[0:2])} ' + ( ' 等%s台主机' % len(hosts) if len(hosts) > 2 else '' ), f'**发布结果：** {text}', f'**发布时间：** {human_datetime()} ', '> 来自 Spug运维平台' From a84a65a53ad628225ee331aa843be309d9a842e1 Mon Sep 17 00:00:00 2001 From: robot Date: Wed, 10 Jun 2020 11:09:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_api/apps/deploy/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spug_api/apps/deploy/utils.py b/spug_api/apps/deploy/utils.py index 5d78a5b..637ee91 100644 --- a/spug_api/apps/deploy/utils.py +++ b/spug_api/apps/deploy/utils.py @@ -219,7 +219,7 @@ class Helper: f'**应用名称：** {req.deploy.app.name} ', f'**应用版本：** {version} ', f'**发布环境：** {req.deploy.env.name} ', - f'**发布主机：** {",".join(x["name"] for x in hosts[0:2])} ' + ( ' 等%s台主机' % len(hosts) if len(hosts) > 2 else '' ), + f'**发布主机：** {",".join(x["name"] for x in hosts[0:2])} ' + ( '等%s台主机' % len(hosts) if len(hosts) > 2 else '' ), f'**发布结果：** {text}', f'**发布时间：** {human_datetime()} ', '> 来自 Spug运维平台' @@ -252,7 +252,7 @@ class Helper: f'**应用名称：** {req.deploy.app.name} ', f'**应用版本：** {version} ', f'**发布环境：** {req.deploy.env.name} ', - f'**发布主机：** {",".join(x["name"] for x in hosts[0:2])} ' + ( ' 等%s台主机' % len(hosts) if len(hosts) > 2 else '' ), + f'**发布主机：** {",".join(x["name"] for x in hosts[0:2])} ' + ( '等%s台主机' % len(hosts) if len(hosts) > 2 else '' ), f'**发布结果：** {text}', f'**发布时间：** {human_datetime()} ', '> 来自 Spug运维平台'