diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index 812914d1..62c401d0 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -68,8 +68,6 @@ export default function () { } else { getUser(); } - } else { - message.error(data); } }) .catch((error) => { @@ -87,8 +85,6 @@ export default function () { if (location.pathname === '/') { history.push('/crontab'); } - } else { - message.error(data); } needLoading && setLoading(false); }) diff --git a/src/pages/config/index.tsx b/src/pages/config/index.tsx index 72670fbf..ecd2ebf6 100644 --- a/src/pages/config/index.tsx +++ b/src/pages/config/index.tsx @@ -25,8 +25,10 @@ const Config = () => { const [confirmLoading, setConfirmLoading] = useState(false); const getConfig = (name: string) => { - request.get(`${config.apiPrefix}configs/${name}`).then((data: any) => { - setValue(data.data); + request.get(`${config.apiPrefix}configs/${name}`).then(({ code, data }) => { + if (code === 200) { + setValue(data); + } }); }; @@ -34,8 +36,10 @@ const Config = () => { setLoading(true); request .get(`${config.apiPrefix}configs/files`) - .then((data: any) => { - setData(data.data); + .then(({ code, data }) => { + if (code === 200) { + setData(data); + } }) .finally(() => setLoading(false)); }; @@ -50,8 +54,10 @@ const Config = () => { .post(`${config.apiPrefix}configs/save`, { data: { content, name: select }, }) - .then((data: any) => { - message.success(data.message); + .then(({ code, data }) => { + if (code === 200) { + message.success('保存成功'); + } setConfirmLoading(false); }); }; diff --git a/src/pages/crontab/detail.tsx b/src/pages/crontab/detail.tsx index d2aad83e..e2c7208f 100644 --- a/src/pages/crontab/detail.tsx +++ b/src/pages/crontab/detail.tsx @@ -123,9 +123,11 @@ const CronDetailModal = ({ .get( `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`, ) - .then((data) => { - setLog(data.data); - setIsLogModalVisible(true); + .then(({ code, data }) => { + if (code === 200) { + setLog(data); + setIsLogModalVisible(true); + } }); }; @@ -137,9 +139,9 @@ const CronDetailModal = ({ setLoading(true); request .get(`${config.apiPrefix}crons/${cron.id}/logs`) - .then((data: any) => { - if (data.code === 200) { - setLogs(data.data); + .then(({ code, data }) => { + if (code === 200) { + setLogs(data); } }) .finally(() => setLoading(false)); @@ -165,8 +167,10 @@ const CronDetailModal = ({ setScriptInfo({ parent: p, filename: s }); request .get(`${config.apiPrefix}scripts/${s}?path=${p || ''}`) - .then((data) => { - setValue(data.data); + .then(({ code, data }) => { + if (code === 200) { + setValue(data); + } }); } else { setValidTabs([validTabs[0]]); @@ -198,12 +202,10 @@ const CronDetailModal = ({ content, }, }) - .then((_data: any) => { - if (_data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { setValue(content); message.success(`保存成功`); - } else { - message.error(_data); } resolve(null); }) @@ -231,14 +233,12 @@ const CronDetailModal = ({ onOk() { request .put(`${config.apiPrefix}crons/run`, { data: [currentCron.id] }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { setCurrentCron({ ...currentCron, status: CrontabStatus.running }); setTimeout(() => { getLogs(); }, 1000); - } else { - message.error(data); } }); }, @@ -263,11 +263,9 @@ const CronDetailModal = ({ onOk() { request .put(`${config.apiPrefix}crons/stop`, { data: [currentCron.id] }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { setCurrentCron({ ...currentCron, status: CrontabStatus.idle }); - } else { - message.error(data); } }); }, @@ -300,14 +298,12 @@ const CronDetailModal = ({ data: [currentCron.id], }, ) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { setCurrentCron({ ...currentCron, isDisabled: currentCron.isDisabled === 1 ? 0 : 1, }); - } else { - message.error(data); } }); }, @@ -340,14 +336,12 @@ const CronDetailModal = ({ data: [currentCron.id], }, ) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { setCurrentCron({ ...currentCron, isPinned: currentCron.isPinned === 1 ? 0 : 1, }); - } else { - message.error(data); } }); }, diff --git a/src/pages/crontab/index.tsx b/src/pages/crontab/index.tsx index 956e3ba9..a5fc1c0f 100644 --- a/src/pages/crontab/index.tsx +++ b/src/pages/crontab/index.tsx @@ -433,20 +433,22 @@ const Crontab = () => { } request .get(url) - .then((_data: any) => { - const { data, total } = _data.data; - setValue( - data.map((x) => { - return { - ...x, - nextRunTime: cron_parser - .parseExpression(x.schedule) - .next() - .toDate(), - }; - }), - ); - setTotal(total); + .then(({ code, data: _data }) => { + if (code === 200) { + const { data, total } = _data; + setValue( + data.map((x) => { + return { + ...x, + nextRunTime: cron_parser + .parseExpression(x.schedule) + .next() + .toDate(), + }; + }), + ); + setTotal(total); + } }) .finally(() => setLoading(false)); }; @@ -476,8 +478,8 @@ const Crontab = () => { onOk() { request .delete(`${config.apiPrefix}crons`, { data: [record.id] }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { message.success('删除成功'); const result = [...value]; const i = result.findIndex((x) => x.id === record.id); @@ -485,8 +487,6 @@ const Crontab = () => { result.splice(i, 1); setValue(result); } - } else { - message.error(data); } }); }, @@ -511,8 +511,8 @@ const Crontab = () => { onOk() { request .put(`${config.apiPrefix}crons/run`, { data: [record.id] }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { const result = [...value]; const i = result.findIndex((x) => x.id === record.id); if (i !== -1) { @@ -522,8 +522,6 @@ const Crontab = () => { }); setValue(result); } - } else { - message.error(data); } }); }, @@ -548,8 +546,8 @@ const Crontab = () => { onOk() { request .put(`${config.apiPrefix}crons/stop`, { data: [record.id] }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { const result = [...value]; const i = result.findIndex((x) => x.id === record.id); if (i !== -1) { @@ -560,8 +558,6 @@ const Crontab = () => { }); setValue(result); } - } else { - message.error(data); } }); }, @@ -594,8 +590,8 @@ const Crontab = () => { data: [record.id], }, ) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { const newStatus = record.isDisabled === 1 ? 0 : 1; const result = [...value]; const i = result.findIndex((x) => x.id === record.id); @@ -606,8 +602,6 @@ const Crontab = () => { }); setValue(result); } - } else { - message.error(data); } }); }, @@ -640,8 +634,8 @@ const Crontab = () => { data: [record.id], }, ) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { const newStatus = record.isPinned === 1 ? 0 : 1; const result = [...value]; const i = result.findIndex((x) => x.id === record.id); @@ -652,8 +646,6 @@ const Crontab = () => { }); setValue(result); } - } else { - message.error(data); } }); }, @@ -755,19 +747,21 @@ const Crontab = () => { const getCronDetail = (cron: any) => { request .get(`${config.apiPrefix}crons/${cron.id}`) - .then((data: any) => { - const index = value.findIndex((x) => x.id === cron.id); - const result = [...value]; - data.data.nextRunTime = cron_parser - .parseExpression(data.data.schedule) - .next() - .toDate(); - if (index !== -1) { - result.splice(index, 1, { - ...cron, - ...data.data, - }); - setValue(result); + .then(({ code, data }) => { + if (code === 200) { + const index = value.findIndex((x) => x.id === cron.id); + const result = [...value]; + data.nextRunTime = cron_parser + .parseExpression(data.schedule) + .next() + .toDate(); + if (index !== -1) { + result.splice(index, 1, { + ...cron, + ...data, + }); + setValue(result); + } } }) .finally(() => setLoading(false)); @@ -795,13 +789,11 @@ const Crontab = () => { onOk() { request .delete(`${config.apiPrefix}crons`, { data: selectedRowIds }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { message.success('批量删除成功'); setSelectedRowIds([]); getCrons(); - } else { - message.error(data); } }); }, @@ -820,11 +812,9 @@ const Crontab = () => { .put(`${config.apiPrefix}crons/${OperationPath[operationStatus]}`, { data: selectedRowIds, }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { getCrons(); - } else { - message.error(data); } }); }, @@ -1029,9 +1019,11 @@ const Crontab = () => { setLoading(true); request .get(`${config.apiPrefix}crons/views`) - .then((data: any) => { - setCronViews(data.data); - setEnabledCronViews(data.data.filter((x) => !x.isDisabled)); + .then(({ code, data }) => { + if (code === 200) { + setCronViews(data); + setEnabledCronViews(data.filter((x) => !x.isDisabled)); + } }) .finally(() => { setLoading(false); diff --git a/src/pages/crontab/logModal.tsx b/src/pages/crontab/logModal.tsx index 6d595b89..a80214f0 100644 --- a/src/pages/crontab/logModal.tsx +++ b/src/pages/crontab/logModal.tsx @@ -41,9 +41,12 @@ const CronLogModal = ({ } request .get(logUrl ? logUrl : `${config.apiPrefix}crons/${cron.id}/log`) - .then((data: any) => { - if (localStorage.getItem('logCron') === String(cron.id)) { - const log = data.data as string; + .then(({ code, data }) => { + if ( + code === 200 && + localStorage.getItem('logCron') === String(cron.id) + ) { + const log = data as string; setValue(log || '暂无日志'); setExecuting( log && !log.includes('执行结束') && !log.includes('重启面板'), diff --git a/src/pages/crontab/modal.tsx b/src/pages/crontab/modal.tsx index 1d913382..7e458e5e 100644 --- a/src/pages/crontab/modal.tsx +++ b/src/pages/crontab/modal.tsx @@ -32,8 +32,6 @@ const CronModal = ({ if (code === 200) { message.success(cron ? '更新Cron成功' : '新建Cron成功'); handleCancel(data); - } else { - message.error(data); } setLoading(false); } catch (error: any) { @@ -142,8 +140,6 @@ const CronLabelModal = ({ action === 'post' ? '添加Labels成功' : '删除Labels成功', ); handleCancel(true); - } else { - message.error(data); } setLoading(false); } catch (error) { diff --git a/src/pages/crontab/viewCreateModal.tsx b/src/pages/crontab/viewCreateModal.tsx index a796eccf..38a2fa4e 100644 --- a/src/pages/crontab/viewCreateModal.tsx +++ b/src/pages/crontab/viewCreateModal.tsx @@ -66,9 +66,7 @@ const ViewCreateModal = ({ }, ); - if (code !== 200) { - message.error(data); - } else { + if (code === 200) { handleCancel(data); } setLoading(false); diff --git a/src/pages/crontab/viewManageModal.tsx b/src/pages/crontab/viewManageModal.tsx index b39ef601..820603cb 100644 --- a/src/pages/crontab/viewManageModal.tsx +++ b/src/pages/crontab/viewManageModal.tsx @@ -141,12 +141,10 @@ const ViewManageModal = ({ onOk() { request .delete(`${config.apiPrefix}crons/views`, { data: [record.id] }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { message.success('删除成功'); cronViewChange(); - } else { - message.error(data); } }); }, @@ -162,14 +160,12 @@ const ViewManageModal = ({ .put(`${config.apiPrefix}crons/views/${checked ? 'enable' : 'disable'}`, { data: [record.id], }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { const _list = [...list]; _list.splice(index, 1, { ...list[index], isDisabled: !checked }); setList(_list); cronViewChange(); - } else { - message.error(data); } }); }; @@ -190,15 +186,13 @@ const ViewManageModal = ({ .put(`${config.apiPrefix}crons/views/move`, { data: { fromIndex: dragIndex, toIndex: hoverIndex, id: dragRow.id }, }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { const newData = [...list]; newData.splice(dragIndex, 1); - newData.splice(hoverIndex, 0, { ...dragRow, ...data.data }); + newData.splice(hoverIndex, 0, { ...dragRow, ...data }); setList(newData); cronViewChange(); - } else { - message.error(data); } }); }, diff --git a/src/pages/dependence/index.tsx b/src/pages/dependence/index.tsx index 0bebfb05..52482f48 100644 --- a/src/pages/dependence/index.tsx +++ b/src/pages/dependence/index.tsx @@ -175,8 +175,10 @@ const Dependence = () => { .get( `${config.apiPrefix}dependencies?searchValue=${searchText}&type=${type}`, ) - .then((data: any) => { - setValue(data.data); + .then(({ code, data }) => { + if (code === 200) { + setValue(data); + } }) .finally(() => setLoading(false)); }; @@ -212,18 +214,14 @@ const Dependence = () => { .delete(`${config.apiPrefix}dependencies${force ? '/force' : ''}`, { data: [record.id], }) - .then((data: any) => { - if (data.code === 200) { - if (force) { - const i = value.findIndex((x) => x.id === data.data[0].id); - if (i !== -1) { - const result = [...value]; - result.splice(i, 1); - setValue(result); - } + .then(({ code, data }) => { + if (code === 200 && force) { + const i = value.findIndex((x) => x.id === data.data[0].id); + if (i !== -1) { + const result = [...value]; + result.splice(i, 1); + setValue(result); } - } else { - message.error(data); } }); }, @@ -250,11 +248,9 @@ const Dependence = () => { .put(`${config.apiPrefix}dependencies/reinstall`, { data: [record.id], }) - .then((data: any) => { - if (data.code === 200) { - handleDependence(data.data[0]); - } else { - message.error(data); + .then(({ code, data }) => { + if (code === 200) { + handleDependence(data[0]); } }); }, @@ -309,12 +305,10 @@ const Dependence = () => { .delete(`${config.apiPrefix}dependencies${forceUrl}`, { data: selectedRowIds, }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { setSelectedRowIds([]); getDependencies(); - } else { - message.error(data); } }); }, @@ -333,12 +327,10 @@ const Dependence = () => { .put(`${config.apiPrefix}dependencies/reinstall`, { data: selectedRowIds, }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { setSelectedRowIds([]); getDependencies(); - } else { - message.error(data); } }); }, @@ -351,15 +343,17 @@ const Dependence = () => { const getDependenceDetail = (dependence: any) => { request .get(`${config.apiPrefix}dependencies/${dependence.id}`) - .then((data: any) => { - const index = value.findIndex((x) => x.id === dependence.id); - const result = [...value]; - if (index !== -1) { - result.splice(index, 1, { - ...dependence, - ...data.data, - }); - setValue(result); + .then(({ code, data }) => { + if (code === 200) { + const index = value.findIndex((x) => x.id === dependence.id); + const result = [...value]; + if (index !== -1) { + result.splice(index, 1, { + ...dependence, + ...data, + }); + setValue(result); + } } }) .finally(() => setLoading(false)); diff --git a/src/pages/dependence/logModal.tsx b/src/pages/dependence/logModal.tsx index f99368a7..962b2a3a 100644 --- a/src/pages/dependence/logModal.tsx +++ b/src/pages/dependence/logModal.tsx @@ -48,9 +48,12 @@ const DependenceLogModal = ({ setLoading(true); request .get(`${config.apiPrefix}dependencies/${dependence.id}`) - .then((data: any) => { - if (localStorage.getItem('logDependence') === String(dependence.id)) { - const log = (data.data.log || []).join('') as string; + .then(({ code, data }) => { + if ( + code === 200 && + localStorage.getItem('logDependence') === String(dependence.id) + ) { + const log = (data.log || []).join('') as string; setValue(log); setExecuting(!log.includes('结束时间')); setIsRemoveFailed(log.includes('删除失败')); @@ -67,8 +70,10 @@ const DependenceLogModal = ({ .delete(`${config.apiPrefix}dependencies/force`, { data: [dependence.id], }) - .then((data: any) => { - cancel(true); + .then(({ code, data }) => { + if (code === 200) { + cancel(true); + } }) .finally(() => { setRemoveLoading(false); diff --git a/src/pages/dependence/modal.tsx b/src/pages/dependence/modal.tsx index 6cd089d8..6c3fb9d3 100644 --- a/src/pages/dependence/modal.tsx +++ b/src/pages/dependence/modal.tsx @@ -53,9 +53,7 @@ const DependenceModal = ({ }, ); - if (code !== 200) { - message.error(data); - } else { + if (code === 200) { handleCancel(data); } setLoading(false); diff --git a/src/pages/diff/index.tsx b/src/pages/diff/index.tsx index a07e6b8a..30b78d0f 100644 --- a/src/pages/diff/index.tsx +++ b/src/pages/diff/index.tsx @@ -22,15 +22,23 @@ const Diff = () => { const editorRef = useRef(null); const getConfig = () => { - request.get(`${config.apiPrefix}configs/${current}`).then((data) => { - setCurrentValue(data.data); - }); + request + .get(`${config.apiPrefix}configs/${current}`) + .then(({ code, data }) => { + if (code === 200) { + setCurrentValue(data); + } + }); }; const getSample = () => { - request.get(`${config.apiPrefix}configs/${origin}`).then((data) => { - setOriginValue(data.data); - }); + request + .get(`${config.apiPrefix}configs/${origin}`) + .then(({ code, data }) => { + if (code === 200) { + setOriginValue(data); + } + }); }; const updateConfig = () => { @@ -42,8 +50,10 @@ const Diff = () => { .post(`${config.apiPrefix}configs/save`, { data: { content, name: current }, }) - .then((data: any) => { - message.success(data.message); + .then(({ code, data }) => { + if (code === 200) { + message.success('保存成功'); + } }); }; @@ -51,8 +61,10 @@ const Diff = () => { setLoading(true); request .get(`${config.apiPrefix}configs/files`) - .then((data: any) => { - setFiles(data.data); + .then(({ code, data }) => { + if (code === 200) { + setFiles(data); + } }) .finally(() => setLoading(false)); }; diff --git a/src/pages/env/editNameModal.tsx b/src/pages/env/editNameModal.tsx index 1984411a..e07a64d2 100644 --- a/src/pages/env/editNameModal.tsx +++ b/src/pages/env/editNameModal.tsx @@ -28,8 +28,6 @@ const EditNameModal = ({ if (code === 200) { message.success('更新环境变量名称成功'); handleCancel(); - } else { - message.error(data); } setLoading(false); } catch (error) { diff --git a/src/pages/env/index.tsx b/src/pages/env/index.tsx index 47a669c7..e30baa00 100644 --- a/src/pages/env/index.tsx +++ b/src/pages/env/index.tsx @@ -255,8 +255,10 @@ const Env = () => { setLoading(true); request .get(`${config.apiPrefix}envs?searchValue=${searchText}`) - .then((data: any) => { - setValue(data.data); + .then(({ code, data }) => { + if (code === 200) { + setValue(data); + } }) .finally(() => setLoading(false)); }; @@ -284,8 +286,8 @@ const Env = () => { data: [record.id], }, ) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { message.success( `${record.status === Status.已禁用 ? '启用' : '禁用'}成功`, ); @@ -297,8 +299,6 @@ const Env = () => { status: newStatus, }); setValue(result); - } else { - message.error(data); } }); }, @@ -333,14 +333,12 @@ const Env = () => { onOk() { request .delete(`${config.apiPrefix}envs`, { data: [record.id] }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { message.success('删除成功'); const result = [...value]; result.splice(index, 1); setValue(result); - } else { - message.error(data); } }); }, @@ -390,14 +388,12 @@ const Env = () => { .put(`${config.apiPrefix}envs/${dragRow.id}/move`, { data: { fromIndex: dragIndex, toIndex: hoverIndex }, }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { const newData = [...value]; newData.splice(dragIndex, 1); newData.splice(hoverIndex, 0, { ...dragRow, ...data.data }); setValue([...newData]); - } else { - message.error(data); } }); }, @@ -426,13 +422,11 @@ const Env = () => { onOk() { request .delete(`${config.apiPrefix}envs`, { data: selectedRowIds }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { message.success('批量删除成功'); setSelectedRowIds([]); getEnvs(); - } else { - message.error(data); } }); }, @@ -451,11 +445,9 @@ const Env = () => { .put(`${config.apiPrefix}envs/${OperationPath[operationStatus]}`, { data: selectedRowIds, }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { getEnvs(); - } else { - message.error(data); } }); }, diff --git a/src/pages/env/modal.tsx b/src/pages/env/modal.tsx index 8e6cdd63..6029112f 100644 --- a/src/pages/env/modal.tsx +++ b/src/pages/env/modal.tsx @@ -44,8 +44,6 @@ const EnvModal = ({ if (code === 200) { message.success(env ? '更新变量成功' : '新建变量成功'); handleCancel(data); - } else { - message.error(data); } setLoading(false); } catch (error: any) { diff --git a/src/pages/error/index.tsx b/src/pages/error/index.tsx index bb4d9d64..c7c138a9 100644 --- a/src/pages/error/index.tsx +++ b/src/pages/error/index.tsx @@ -17,8 +17,10 @@ const Error = () => { setLoading(true); request .get(`${config.apiPrefix}public/panel/log`) - .then((data: any) => { - setData(data.data); + .then(({ code, data }) => { + if (code === 200) { + setData(data); + } }) .finally(() => setLoading(false)); }; diff --git a/src/pages/initialization/index.tsx b/src/pages/initialization/index.tsx index 23caa9e0..ab49de9b 100644 --- a/src/pages/initialization/index.tsx +++ b/src/pages/initialization/index.tsx @@ -41,11 +41,9 @@ const Initialization = () => { password: values.password, }, }) - .then((data) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { next(); - } else { - message.error(data.message); } }) .finally(() => setLoading(false)); @@ -59,11 +57,9 @@ const Initialization = () => { ...values, }, }) - .then((_data: any) => { - if (_data && _data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { next(); - } else { - message.error(_data.message); } }) .finally(() => setLoading(false)); diff --git a/src/pages/log/index.tsx b/src/pages/log/index.tsx index 92327785..9155a293 100644 --- a/src/pages/log/index.tsx +++ b/src/pages/log/index.tsx @@ -54,9 +54,11 @@ const Log = () => { setLoading(true); request .get(`${config.apiPrefix}logs`) - .then((data) => { - setData(data.data); - setFilterData(data.data); + .then(({ code, data }) => { + if (code === 200) { + setData(data); + setFilterData(data); + } }) .finally(() => setLoading(false)); }; @@ -64,8 +66,10 @@ const Log = () => { const getLog = (node: any) => { request .get(`${config.apiPrefix}logs/${node.title}?path=${node.parent || ''}`) - .then((data) => { - setValue(data.data); + .then(({ code, data }) => { + if (code === 200) { + setValue(data); + } }); }; diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index 9f8fe06a..8d7d0c8b 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -40,15 +40,7 @@ const Login = () => { }, }) .then((data) => { - if (data.code === 420) { - setLoginInfo({ - username: values.username, - password: values.password, - }); - setTwoFactor(true); - } else { - checkResponse(data); - } + checkResponse(data, values); setLoading(false); }) .catch(function (error) { @@ -64,11 +56,7 @@ const Login = () => { data: { ...loginInfo, code: values.code }, }) .then((data: any) => { - if (data.code === 430) { - message.error(data.message); - } else { - checkResponse(data); - } + checkResponse(data); setVerifying(false); }) .catch((error: any) => { @@ -77,8 +65,11 @@ const Login = () => { }); }; - const checkResponse = (data: any) => { - if (data.code === 200) { + const checkResponse = ( + { code, data, message: _message }: any, + values?: any, + ) => { + if (code === 200) { const { token, lastip, @@ -86,7 +77,7 @@ const Login = () => { lastlogon, retries = 0, platform, - } = data.data; + } = data; localStorage.setItem(config.authKey, token); notification.success({ message: '登录成功!', @@ -105,13 +96,14 @@ const Login = () => { }); reloadUser(true); history.push('/crontab'); - } else if (data.code === 100) { - message.warn(data.message); - } else if (data.code === 410) { - message.error(data.message); - setWaitTime(data.data); - } else { - message.error(data.message); + } else if (code === 410) { + setWaitTime(data); + } else if (code === 420) { + setLoginInfo({ + username: values.username, + password: values.password, + }); + setTwoFactor(true); } }; diff --git a/src/pages/script/editModal.tsx b/src/pages/script/editModal.tsx index cf233455..e54ee5b9 100644 --- a/src/pages/script/editModal.tsx +++ b/src/pages/script/editModal.tsx @@ -67,8 +67,10 @@ const EditModal = ({ const getDetail = (node: any) => { request .get(`${config.apiPrefix}scripts/${node.title}?path=${node.parent || ''}`) - .then((data) => { - setValue(data.data); + .then(({ code, data }) => { + if (code === 200) { + setValue(data); + } }); }; @@ -83,8 +85,10 @@ const EditModal = ({ content, }, }) - .then((data) => { - setIsRunning(true); + .then(({ code, data }) => { + if (code === 200) { + setIsRunning(true); + } }); }; @@ -101,8 +105,10 @@ const EditModal = ({ content, }, }) - .then((data) => { - setIsRunning(false); + .then(({ code, data }) => { + if (code === 200) { + setIsRunning(false); + } }); }; diff --git a/src/pages/script/editNameModal.tsx b/src/pages/script/editNameModal.tsx index 04f3648e..29015c54 100644 --- a/src/pages/script/editNameModal.tsx +++ b/src/pages/script/editNameModal.tsx @@ -57,8 +57,6 @@ const EditScriptNameModal = ({ path, key: `${key}${filename}`, }); - } else { - message.error(data); } setLoading(false); }) diff --git a/src/pages/script/index.tsx b/src/pages/script/index.tsx index e9bc1689..46f02e24 100644 --- a/src/pages/script/index.tsx +++ b/src/pages/script/index.tsx @@ -99,10 +99,12 @@ const Script = () => { setLoading(true); request .get(`${config.apiPrefix}scripts`) - .then((data) => { - setData(data.data); - setFilterData(data.data); - initGetScript(); + .then(({ code, data }) => { + if (code === 200) { + setData(data); + setFilterData(data); + initGetScript(); + } }) .finally(() => setLoading(false)); }; @@ -110,8 +112,10 @@ const Script = () => { const getDetail = (node: any) => { request .get(`${config.apiPrefix}scripts/${node.title}?path=${node.parent || ''}`) - .then((data) => { - setValue(data.data); + .then(({ code, data }) => { + if (code === 200) { + setValue(data); + } }); }; @@ -231,13 +235,11 @@ const Script = () => { content, }, }) - .then((_data: any) => { - if (_data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { message.success(`保存成功`); setValue(content); setIsEditing(false); - } else { - message.error(_data); } resolve(null); }) @@ -270,8 +272,8 @@ const Script = () => { path: currentNode.parent || '', }, }) - .then((_data: any) => { - if (_data.code === 200) { + .then(({ code }) => { + if (code === 200) { message.success(`删除成功`); let newData = [...data]; if (currentNode.parent) { @@ -295,8 +297,6 @@ const Script = () => { } } setData(newData); - } else { - message.error(_data); } }); }, @@ -346,15 +346,17 @@ const Script = () => { filename: currentNode.title, }, }) - .then((_data: any) => { - const blob = new Blob([_data], { type: 'application/json' }); - const url = URL.createObjectURL(blob); - const a = document.createElement('a'); - a.href = url; - a.download = currentNode.title; - document.documentElement.appendChild(a); - a.click(); - document.documentElement.removeChild(a); + .then(({ code, data }) => { + if (code === 200) { + const blob = new Blob([data], { type: 'application/json' }); + const url = URL.createObjectURL(blob); + const a = document.createElement('a'); + a.href = url; + a.download = currentNode.title; + document.documentElement.appendChild(a); + a.click(); + document.documentElement.removeChild(a); + } }); }; diff --git a/src/pages/script/saveModal.tsx b/src/pages/script/saveModal.tsx index 64ee9b41..24d81907 100644 --- a/src/pages/script/saveModal.tsx +++ b/src/pages/script/saveModal.tsx @@ -26,8 +26,6 @@ const SaveModal = ({ if (code === 200) { message.success('保存文件成功'); handleCancel(data); - } else { - message.error(data); } setLoading(false); }); diff --git a/src/pages/script/setting.tsx b/src/pages/script/setting.tsx index 6ac84062..e3ca2a9d 100644 --- a/src/pages/script/setting.tsx +++ b/src/pages/script/setting.tsx @@ -26,8 +26,6 @@ const SettingModal = ({ if (code === 200) { message.success('保存文件成功'); handleCancel(data); - } else { - message.error(data); } setLoading(false); }); diff --git a/src/pages/setting/appModal.tsx b/src/pages/setting/appModal.tsx index 0b12d7f1..fe44089a 100644 --- a/src/pages/setting/appModal.tsx +++ b/src/pages/setting/appModal.tsx @@ -30,8 +30,6 @@ const AppModal = ({ if (code === 200) { message.success(app ? '更新应用成功' : '新建应用成功'); handleCancel(data); - } else { - message.error(data); } setLoading(false); } catch (error) { diff --git a/src/pages/setting/checkUpdate.tsx b/src/pages/setting/checkUpdate.tsx index fed7677b..0a0895dd 100644 --- a/src/pages/setting/checkUpdate.tsx +++ b/src/pages/setting/checkUpdate.tsx @@ -17,17 +17,14 @@ const CheckUpdate = ({ socketMessage }: any) => { message.loading('检查更新中...', 0); request .put(`${config.apiPrefix}system/update-check`) - .then((_data: any) => { + .then(({ code, data }) => { message.destroy(); - const { code, data } = _data; if (code === 200) { if (data.hasNewVersion) { showConfirmUpdateModal(data); } else { showForceUpdateModal(); } - } else { - message.error(data); } }) .catch((error: any) => { diff --git a/src/pages/setting/index.tsx b/src/pages/setting/index.tsx index b138331c..56539cb9 100644 --- a/src/pages/setting/index.tsx +++ b/src/pages/setting/index.tsx @@ -144,8 +144,10 @@ const Setting = () => { setLoading(true); request .get(`${config.apiPrefix}apps`) - .then((data: any) => { - setDataSource(data.data); + .then(({ code, data }) => { + if (code === 200) { + setDataSource(data); + } }) .finally(() => setLoading(false)); }; @@ -175,14 +177,12 @@ const Setting = () => { onOk() { request .delete(`${config.apiPrefix}apps`, { data: [record.id] }) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { message.success('删除成功'); const result = [...dataSource]; result.splice(index, 1); setDataSource(result); - } else { - message.error(data); } }); }, @@ -209,12 +209,10 @@ const Setting = () => { onOk() { request .put(`${config.apiPrefix}apps/${record.id}/reset-secret`) - .then((data: any) => { - if (data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { message.success('重置成功'); - handleApp(data.data); - } else { - message.error(data); + handleApp(data); } }); }, @@ -247,8 +245,10 @@ const Setting = () => { const getLoginLog = () => { request .get(`${config.apiPrefix}user/login-log`) - .then((data: any) => { - setLoginLogData(data.data); + .then(({ code, data }) => { + if (code === 200) { + setLoginLogData(data); + } }) .catch((error: any) => { console.log(error); @@ -271,8 +271,10 @@ const Setting = () => { const getNotification = () => { request .get(`${config.apiPrefix}user/notification`) - .then((data: any) => { - setNotificationInfo(data.data); + .then(({ code, data }) => { + if (code === 200) { + setNotificationInfo(data); + } }) .catch((error: any) => { console.log(error); @@ -282,9 +284,9 @@ const Setting = () => { const getLogRemoveFrequency = () => { request .get(`${config.apiPrefix}system/log/remove`) - .then((data: any) => { - if (data.data.info) { - const { frequency } = data.data.info; + .then(({ code, data }) => { + if (code === 200 && data.info) { + const { frequency } = data.info; setLogRemoveFrequency(frequency); } }) @@ -299,8 +301,10 @@ const Setting = () => { .put(`${config.apiPrefix}system/log/remove`, { data: { frequency: logRemoveFrequency }, }) - .then((data: any) => { - message.success('更新成功'); + .then(({ code, data }) => { + if (code === 200) { + message.success('更新成功'); + } }) .catch((error: any) => { console.log(error); diff --git a/src/pages/setting/notification.tsx b/src/pages/setting/notification.tsx index 5fee3057..a016867b 100644 --- a/src/pages/setting/notification.tsx +++ b/src/pages/setting/notification.tsx @@ -23,11 +23,9 @@ const NotificationSetting = ({ data }: any) => { ...values, }, }) - .then((_data: any) => { - if (_data && _data.code === 200) { + .then(({ code, data }) => { + if (code === 200) { message.success(values.type ? '通知发送成功' : '通知关闭成功'); - } else { - message.error(_data.message); } }) .catch((error: any) => { @@ -75,22 +73,20 @@ const NotificationSetting = ({ data }: any) => { rules={[{ required: x.required }]} style={{ maxWidth: 400 }} > - { - x.items ? ( - - ) : ( - - ) - } + {x.items ? ( + + ) : ( + + )} ))}