From a2c202b34e393108a493a5d739c380c0e3b48a2f Mon Sep 17 00:00:00 2001 From: asforest Date: Tue, 10 Dec 2024 12:30:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0public=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/task.js | 2 ++ src/pages/Dashboard/Log/index.jsx | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/api/task.js b/src/api/task.js index 3736eb7..c3e43fd 100644 --- a/src/api/task.js +++ b/src/api/task.js @@ -10,3 +10,5 @@ export const taskCombineRequest = () => instance.post('/task/combine', {}) export const taskTestRequest = () => instance.post('/task/test', {}) export const taskRevertRequest = () => instance.post('/task/revert', {}) + +export const taskUploadRequest = () => instance.post('/task/upload', {}) diff --git a/src/pages/Dashboard/Log/index.jsx b/src/pages/Dashboard/Log/index.jsx index 407764b..1984452 100644 --- a/src/pages/Dashboard/Log/index.jsx +++ b/src/pages/Dashboard/Log/index.jsx @@ -1,6 +1,6 @@ import React, {useEffect, useRef, useState} from "react"; import {Button, Input, message, Modal} from "antd"; -import {taskCombineRequest, taskPackRequest, taskRevertRequest, taskTestRequest} from "@/api/task.js"; +import {taskCombineRequest, taskPackRequest, taskRevertRequest, taskTestRequest, taskUploadRequest} from "@/api/task.js"; import {terminalFullRequest, terminalMoreRequest} from "@/api/terminal.js"; import {RotateCcw} from "lucide-react"; import {generateRandomStr} from "@/utils/tool.js"; @@ -85,6 +85,16 @@ const Index = () => { } } + const taskUpload = async () => { + const {code, msg, data} = await taskUploadRequest(); + if (code === 1) { + messageApi.success('任务已提交.') + await terminalMore() + } else { + messageApi.error(msg) + } + } + const copy = async (item) => { await navigator.clipboard.writeText(`${showTime(item.time)}-${item.level}-${item.content}`); messageApi.success('复制成功!') @@ -119,6 +129,7 @@ const Index = () => { +
Date: Tue, 10 Dec 2024 12:32:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=E4=B8=8D=E5=8C=85=E5=90=AB?= =?UTF-8?q?token=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/fs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/api/fs.js b/src/api/fs.js index 6f4b6fb..e8c80d8 100644 --- a/src/api/fs.js +++ b/src/api/fs.js @@ -1,5 +1,6 @@ import instance from "@/utils/request.js"; import axios from "axios"; +import store from "@/store/index.js"; export const fsDiskInfoRequest = () => instance.post('/fs/disk-info', {}) @@ -14,6 +15,7 @@ export const fsSignFileRequest = (path = '') => instance.post('/fs/sign-file', { export const fsUploadRequest = (path = '', file, onProgress) => { return axios.post(`${import.meta.env.VITE_API_URL}/fs/upload`, file, { headers: { + 'Token': store.getState().user.token, 'Content-Type': 'application/octet-stream', 'Path': encodeURIComponent(path) }, From ae010b993b4f9bfb584d8c3e684660893ea36732 Mon Sep 17 00:00:00 2001 From: asforest Date: Tue, 10 Dec 2024 13:53:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=E7=9A=84=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/task.js | 2 ++ src/pages/Dashboard/Log/index.jsx | 23 +++++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/api/task.js b/src/api/task.js index c3e43fd..1dc9147 100644 --- a/src/api/task.js +++ b/src/api/task.js @@ -12,3 +12,5 @@ export const taskTestRequest = () => instance.post('/task/test', {}) export const taskRevertRequest = () => instance.post('/task/revert', {}) export const taskUploadRequest = () => instance.post('/task/upload', {}) + +export const taskStatusRequest = () => instance.post('/task/status', {}) diff --git a/src/pages/Dashboard/Log/index.jsx b/src/pages/Dashboard/Log/index.jsx index 1984452..6ba15d8 100644 --- a/src/pages/Dashboard/Log/index.jsx +++ b/src/pages/Dashboard/Log/index.jsx @@ -1,6 +1,6 @@ import React, {useEffect, useRef, useState} from "react"; import {Button, Input, message, Modal} from "antd"; -import {taskCombineRequest, taskPackRequest, taskRevertRequest, taskTestRequest, taskUploadRequest} from "@/api/task.js"; +import {taskCombineRequest, taskPackRequest, taskRevertRequest, taskTestRequest, taskUploadRequest, taskStatusRequest} from "@/api/task.js"; import {terminalFullRequest, terminalMoreRequest} from "@/api/terminal.js"; import {RotateCcw} from "lucide-react"; import {generateRandomStr} from "@/utils/tool.js"; @@ -95,6 +95,16 @@ const Index = () => { } } + const taskStatus = async () => { + const {code, msg, data} = await taskStatusRequest(); + if (code === 1) { + messageApi.success('任务已提交.') + await terminalMore() + } else { + messageApi.error(msg) + } + } + const copy = async (item) => { await navigator.clipboard.writeText(`${showTime(item.time)}-${item.level}-${item.content}`); messageApi.success('复制成功!') @@ -125,11 +135,12 @@ const Index = () => {
- - - - + + + + + +