diff --git a/spug_api/apps/deploy/views.py b/spug_api/apps/deploy/views.py index 3665b85..e505eb7 100644 --- a/spug_api/apps/deploy/views.py +++ b/spug_api/apps/deploy/views.py @@ -130,6 +130,10 @@ class RequestDetailView(View): outputs[item['key']]['status'] = item['status'] data = rds.lrange(key, counter, counter + 9) response['index'] = counter + if counter == 0: + for item in outputs: + outputs[item]['data'] += '\r\n\r\n未读取到数据,Spug 仅保存最近2周的日志信息。' + if req.is_quick_deploy: if outputs['local']['data']: outputs['local']['data'] = f'{human_time()} 读取数据... ' + outputs['local']['data'] diff --git a/spug_api/apps/schedule/builtin.py b/spug_api/apps/schedule/builtin.py index 54effa2..a4bd8d3 100644 --- a/spug_api/apps/schedule/builtin.py +++ b/spug_api/apps/schedule/builtin.py @@ -6,6 +6,7 @@ from apps.account.models import History from apps.alarm.models import Alarm from apps.schedule.models import Task, History as TaskHistory from apps.deploy.models import DeployRequest +from apps.app.models import DeployExtend1 from apps.exec.models import ExecHistory from apps.notify.models import Notify from apps.deploy.utils import dispatch @@ -21,6 +22,12 @@ def auto_run_by_day(): History.objects.filter(created_at__lt=date_30).delete() Notify.objects.filter(created_at__lt=date_7, unread=False).delete() Alarm.objects.filter(created_at__lt=date_30).delete() + for item in DeployExtend1.objects.all(): + index = 0 + for req in DeployRequest.objects.filter(deploy_id=item.deploy_id, repository_id__isnull=False): + if index > item.versions and req.repository_id: + req.repository.delete() + index += 1 try: record = ExecHistory.objects.all()[50] ExecHistory.objects.filter(id__lt=record.id).delete() diff --git a/spug_web/src/pages/deploy/app/Ext1Setup3.js b/spug_web/src/pages/deploy/app/Ext1Setup3.js index 7a96caa..cead84c 100644 --- a/spug_web/src/pages/deploy/app/Ext1Setup3.js +++ b/spug_web/src/pages/deploy/app/Ext1Setup3.js @@ -46,7 +46,7 @@ export default observer(function () {