diff --git a/spug_api/apps/schedule/builtin.py b/spug_api/apps/schedule/builtin.py index 32790e2..cf0541e 100644 --- a/spug_api/apps/schedule/builtin.py +++ b/spug_api/apps/schedule/builtin.py @@ -11,6 +11,7 @@ from apps.app.models import DeployExtend1 from apps.exec.models import ExecHistory, Transfer from apps.notify.models import Notify from apps.deploy.utils import dispatch +from apps.repository.models import Repository from libs.utils import parse_time, human_datetime, human_date from datetime import datetime, timedelta from threading import Thread @@ -71,6 +72,12 @@ def auto_run_by_minute(): if (now - parse_time(req.do_at)).seconds > 3600: req.status = '-3' req.save() + + for rep in Repository.objects.filter(status='1'): + if (now - parse_time(rep.created_at)).seconds > 3600: + rep.status = '2' + rep.save() + for req in DeployRequest.objects.filter(status='1', plan__lte=now): req.status = '2' req.do_at = human_datetime() diff --git a/spug_web/src/pages/deploy/repository/Detail.js b/spug_web/src/pages/deploy/repository/Detail.js index 285aff9..dd9253f 100644 --- a/spug_web/src/pages/deploy/repository/Detail.js +++ b/spug_web/src/pages/deploy/repository/Detail.js @@ -39,7 +39,7 @@ export default observer(function (props) { - Tips: 已关联发布申请的构建版本无法删除。 + Tips: 已关联发布申请的构建版本无法删除(删除发布申请时将同步删除该记录)。 )}>