From ae5f65579ad4c62783fe55c5386363004754dd61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98nice555?= Date: Wed, 25 May 2022 21:52:12 +0800 Subject: [PATCH] add module --- spug_api/apps/deploy/models.py | 2 +- spug_api/apps/deploy/utils.py | 1 + spug_api/apps/deploy/views.py | 2 ++ spug_web/src/pages/deploy/request/Ext1Form.js | 2 +- spug_web/src/pages/deploy/request/Ext2Form.js | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/spug_api/apps/deploy/models.py b/spug_api/apps/deploy/models.py index f813253..25b0309 100644 --- a/spug_api/apps/deploy/models.py +++ b/spug_api/apps/deploy/models.py @@ -45,7 +45,7 @@ class DeployRequest(models.Model, ModelMixin): approve_by = models.ForeignKey(User, models.PROTECT, related_name='+', null=True) do_at = models.CharField(max_length=20, null=True) do_by = models.ForeignKey(User, models.PROTECT, related_name='+', null=True) - + module = models.CharField(max_length=255, null=True) @property def is_quick_deploy(self): if self.type in ('1', '3') and self.deploy.extend == '1' and self.extra: diff --git a/spug_api/apps/deploy/utils.py b/spug_api/apps/deploy/utils.py index a516174..dc29326 100644 --- a/spug_api/apps/deploy/utils.py +++ b/spug_api/apps/deploy/utils.py @@ -47,6 +47,7 @@ def dispatch(req, fail_mode=False): SPUG_DEPLOY_TYPE=req.type, SPUG_API_TOKEN=api_token, SPUG_REPOS_DIR=REPOS_DIR, + SPUG_MODULE=req.module, ) # append configs configs = compose_configs(req.deploy.app, req.deploy.env_id) diff --git a/spug_api/apps/deploy/views.py b/spug_api/apps/deploy/views.py index 3665b85..f593b08 100644 --- a/spug_api/apps/deploy/views.py +++ b/spug_api/apps/deploy/views.py @@ -211,6 +211,7 @@ def post_request_ext1(request): Argument('type', default='1'), Argument('plan', required=False), Argument('desc', required=False), + Argument('module', required=False), ).parse(request.body) if error is None: deploy = Deploy.objects.get(pk=form.deploy_id) @@ -293,6 +294,7 @@ def post_request_ext2(request): Argument('type', default='1'), Argument('plan', required=False), Argument('desc', required=False), + Argument('module', required=False), ).parse(request.body) if error is None: deploy = Deploy.objects.filter(pk=form.deploy_id).first() diff --git a/spug_web/src/pages/deploy/request/Ext1Form.js b/spug_web/src/pages/deploy/request/Ext1Form.js index c864fe8..4ed6ce6 100644 --- a/spug_web/src/pages/deploy/request/Ext1Form.js +++ b/spug_web/src/pages/deploy/request/Ext1Form.js @@ -231,7 +231,7 @@ export default observer(function () { )} {module && ( - + )} diff --git a/spug_web/src/pages/deploy/request/Ext2Form.js b/spug_web/src/pages/deploy/request/Ext2Form.js index 6d77351..541c01f 100644 --- a/spug_web/src/pages/deploy/request/Ext2Form.js +++ b/spug_web/src/pages/deploy/request/Ext2Form.js @@ -96,7 +96,7 @@ export default observer(function () { {module && ( - + )}