From 69d5bf74e589a9eff9ba89964c6fdf313506b485 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Fri, 12 Nov 2021 17:03:30 +0800
Subject: [PATCH] =?UTF-8?q?F=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=B8=B8=E8=A7=84=E5=8F=91=E5=B8=83=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_api/apps/apis/deploy.py   | 32 +++++++++++---------------------
 spug_api/apps/deploy/models.py |  2 +-
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/spug_api/apps/apis/deploy.py b/spug_api/apps/apis/deploy.py
index 282d1dd..19eed80 100644
--- a/spug_api/apps/apis/deploy.py
+++ b/spug_api/apps/apis/deploy.py
@@ -70,30 +70,20 @@ def _deploy_extend_1(deploy, ref, commit_id=None):
     else:
         extra = ['tag', ref, None]
         version = ref
-    rep = Repository.objects.create(
+
+    req = DeployRequest.objects.create(
+        type='3',
+        status='0' if deploy.is_audit else '2',
         deploy=deploy,
-        app_id=deploy.app_id,
-        env_id=deploy.env_id,
-        version=version,
-        status='1',
+        name=version,
         extra=json.dumps(extra),
+        version=version,
         spug_version=Repository.make_spug_version(deploy.id),
-        created_by=deploy.created_by)
-    rep = build_dispatch(rep)
-    if rep.status == '5':
-        req = DeployRequest.objects.create(
-            type='3',
-            status='0' if deploy.is_audit else '2',
-            deploy=deploy,
-            repository=rep,
-            name=rep.version,
-            version=rep.version,
-            spug_version=rep.spug_version,
-            host_ids=deploy.host_ids,
-            created_by=deploy.created_by
-        )
-        if req.status == '2':
-            deploy_dispatch(req)
+        host_ids=deploy.host_ids,
+        created_by=deploy.created_by
+    )
+    if req.status == '2':
+        deploy_dispatch(req)
 
 
 def _deploy_extend_2(deploy, ref, commit_id=None):
diff --git a/spug_api/apps/deploy/models.py b/spug_api/apps/deploy/models.py
index 3070efd..ef70609 100644
--- a/spug_api/apps/deploy/models.py
+++ b/spug_api/apps/deploy/models.py
@@ -47,7 +47,7 @@ class DeployRequest(models.Model, ModelMixin):
 
     @property
     def is_quick_deploy(self):
-        if self.type == '1' and self.deploy.extend == '1' and self.extra:
+        if self.type in ('1', '3') and self.deploy.extend == '1' and self.extra:
             extra = json.loads(self.extra)
             return extra[0] in ('branch', 'tag')
         return False