diff --git a/spug_api/apps/schedule/builtin.py b/spug_api/apps/schedule/builtin.py index c6bd2b1..4f5bfc9 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 from apps.deploy.models import DeployRequest +from apps.exec.models import ExecHistory from apps.deploy.utils import dispatch from libs.utils import parse_time, human_datetime from datetime import datetime, timedelta @@ -17,6 +18,11 @@ def auto_run_by_day(): date = datetime.now() - timedelta(days=30) History.objects.filter(created_at__lt=date.strftime('%Y-%m-%d')).delete() Alarm.objects.filter(created_at__lt=date.strftime('%Y-%m-%d')).delete() + try: + record = ExecHistory.objects.all()[50] + ExecHistory.objects.filter(id__lt=record.id).delete() + except IndexError: + pass for task in Task.objects.all(): try: record = History.objects.filter(task_id=task.id)[50] diff --git a/spug_web/package.json b/spug_web/package.json index 1a2ee8c..6fe9a30 100644 --- a/spug_web/package.json +++ b/spug_web/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@ant-design/icons": "^4.3.0", - "ace-builds": "^1.4.7", + "ace-builds": "^1.4.13", "antd": "^4.10.3", "axios": "^0.21.0", "bizcharts": "^3.5.9", @@ -14,7 +14,7 @@ "mobx-react": "^6.3.0", "moment": "^2.24.0", "react": "^16.13.1", - "react-ace": "^9.2.0", + "react-ace": "^9.5.0", "react-dom": "^16.13.1", "react-router-dom": "^5.2.0", "react-scripts": "3.4.3", diff --git a/spug_web/src/pages/exec/task/index.js b/spug_web/src/pages/exec/task/index.js index fb49fa1..ac9b1cd 100644 --- a/spug_web/src/pages/exec/task/index.js +++ b/spug_web/src/pages/exec/task/index.js @@ -23,9 +23,11 @@ function TaskIndex() { const [histories, setHistories] = useState([]) useEffect(() => { - http.get('/api/exec/history/') - .then(res => setHistories(res)) - }, []) + if (!loading) { + http.get('/api/exec/history/') + .then(res => setHistories(res)) + } + }, [loading]) function handleSubmit() { setLoading(true)