重构前端错误提示

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) {

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) => {

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);

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 ? (
-                <Select placeholder={x.placeholder || `请选择${x.label}`}>
-                  {x.items.map((y) => (
-                    <Option key={y.value} value={y.value}>
-                      {y.label || y.value}
-                    </Option>
-                  ))}
-                </Select>
-              ) : (
-                <Input.TextArea
-                  autoSize={true}
-                  placeholder={x.placeholder || `请输入${x.label}`}
-                />
-              )
-            }
+            {x.items ? (
+              <Select placeholder={x.placeholder || `请选择${x.label}`}>
+                {x.items.map((y) => (
+                  <Option key={y.value} value={y.value}>
+                    {y.label || y.value}
+                  </Option>
+                ))}
+              </Select>
+            ) : (
+              <Input.TextArea
+                autoSize={true}
+                placeholder={x.placeholder || `请输入${x.label}`}
+              />
+            )}
           </Form.Item>
         ))}
         <Button type="primary" htmlType="submit">

src/pages/setting/security.tsx

@@ -27,9 +27,11 @@ const SecuritySettings = ({ user, userChange }: any) => {
           password: values.password,
         },
       })
-      .then((data: any) => {
-        localStorage.removeItem(config.authKey);
-        history.push('/login');
+      .then(({ code, data }) => {
+        if (code === 200) {
+          localStorage.removeItem(config.authKey);
+          history.push('/login');
+        }
       })
       .catch((error: any) => {
         console.log(error);
@@ -48,8 +50,8 @@ const SecuritySettings = ({ user, userChange }: any) => {
   const deactiveTowFactor = () => {
     request
       .put(`${config.apiPrefix}user/two-factor/deactive`)
-      .then((data: any) => {
-        if (data.data) {
+      .then(({ code, data }) => {
+        if (code === 200 && data) {
           setTwoFactorActivated(false);
           userChange();
         }
@@ -63,14 +65,16 @@ const SecuritySettings = ({ user, userChange }: any) => {
     setLoading(true);
     request
       .put(`${config.apiPrefix}user/two-factor/active`, { data: { code } })
-      .then((data: any) => {
-        if (data.data) {
-          message.success('激活成功');
-          setTwoFactoring(false);
-          setTwoFactorActivated(true);
-          userChange();
-        } else {
-          message.success('验证失败');
+      .then(({ code, data }) => {
+        if (code === 200) {
+          if (data) {
+            message.success('激活成功');
+            setTwoFactoring(false);
+            setTwoFactorActivated(true);
+            userChange();
+          } else {
+            message.success('验证失败');
+          }
         }
       })
       .catch((error: any) => {
@@ -82,8 +86,10 @@ const SecuritySettings = ({ user, userChange }: any) => {
   const getTwoFactorInfo = () => {
     request
       .get(`${config.apiPrefix}user/two-factor/init`)
-      .then((data: any) => {
-        setTwoFactorInfo(data.data);
+      .then(({ code, data }) => {
+        if (code === 200) {
+          setTwoFactorInfo(data);
+        }
       })
       .catch((error: any) => {
         console.log(error);