Sfoglia il codice sorgente

refactor(message): 使用 globalMessage替代 App.useApp().message- 在多个页面中替换消息提示方式
- 优化代码结构,减少重复代码
- 提高消息提示的可复用性和一致性

nahida 9 mesi fa
parent
commit
007f5c4121

+ 7 - 6
app/(business)/system/dict-data/index/[dictid]/page.tsx

@@ -21,6 +21,7 @@ import {faCheck, faDownload, faPenToSquare, faToggleOff, faToggleOn, faXmark,} f
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 
 import {useRef, useState} from "react";
+import globalMessage from "@/app/_modules/globalMessage";
 
 //查询类型详情
 const queryTypeAPI = "/api/system/dict/type";
@@ -276,14 +277,14 @@ export default function DictData({ params }: { params: { dictid: string } }) {
 
     if (body != undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         if (actionTableRef.current) {
           actionTableRef.current.reload();
         }
         return true;
       }
 
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
     return false;
@@ -352,7 +353,7 @@ export default function DictData({ params }: { params: { dictid: string } }) {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         //刷新列表
         if (actionTableRef.current) {
           actionTableRef.current.reload();
@@ -360,7 +361,7 @@ export default function DictData({ params }: { params: { dictid: string } }) {
         setIsShowModifyDataModal(false);
         return true;
       }
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
   };
@@ -383,7 +384,7 @@ export default function DictData({ params }: { params: { dictid: string } }) {
     });
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("删除成功");
+        globalMessage.success("删除成功");
 
         //修改按钮变回不可点击
         setRowCanModify(false);
@@ -396,7 +397,7 @@ export default function DictData({ params }: { params: { dictid: string } }) {
           actionTableRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     setDeleteModalVisible(false);

+ 8 - 7
app/(business)/system/log/logininfor/page.tsx

@@ -10,12 +10,13 @@ import {
 } from "@ant-design/icons";
 import type {ActionType, ProColumns, ProFormInstance,} from "@ant-design/pro-components";
 import {PageContainer, ProTable,} from "@ant-design/pro-components";
-import {Button, Modal, Space, Tag} from "antd";
+import {App, Button, Modal, Space, Tag} from "antd";
 import {useRouter} from "next/navigation";
 import {faCheck, faDownload, faToggleOff, faToggleOn, faXmark,} from "@fortawesome/free-solid-svg-icons";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 
 import {useRef, useState} from "react";
+import globalMessage from "@/app/_modules/globalMessage";
 
 export default function OperLog() {
   const { push } = useRouter();
@@ -208,7 +209,7 @@ export default function OperLog() {
     );
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("删除成功");
+        globalMessage.success("删除成功");
 
         //删除按钮变回不可点击
         setRowCanDelete(false);
@@ -219,7 +220,7 @@ export default function OperLog() {
           actionRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     setDeleteModalVisible(false);
@@ -243,7 +244,7 @@ export default function OperLog() {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("清空成功");
+        globalMessage.success("清空成功");
         //选中行数据重置为空
         setSelectedRowKeys([]);
         //刷新列表
@@ -251,7 +252,7 @@ export default function OperLog() {
           actionRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     setClearModalVisible(false);
@@ -278,13 +279,13 @@ export default function OperLog() {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("解锁成功");
+        globalMessage.success("解锁成功");
         //刷新列表
         if (actionRef.current) {
           actionRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     setUnlockModalVisible(false);

+ 6 - 5
app/(business)/system/log/operlog/page.tsx

@@ -4,13 +4,14 @@ import {fetchApi, fetchFile} from "@/app/_modules/func";
 import {ClearOutlined, DeleteOutlined, ExclamationCircleFilled, EyeOutlined, ReloadOutlined,} from "@ant-design/icons";
 import type {ActionType, ProColumns, ProFormInstance,} from "@ant-design/pro-components";
 import {PageContainer, ProDescriptions, ProTable,} from "@ant-design/pro-components";
-import {Button, Modal, Space, Tag} from "antd";
+import {App, Button, Modal, Space, Tag} from "antd";
 import {useRouter} from "next/navigation";
 
 import {faCheck, faDownload, faToggleOff, faToggleOn, faXmark,} from "@fortawesome/free-solid-svg-icons";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 
 import {useRef, useState} from "react";
+import globalMessage from "@/app/_modules/globalMessage";
 
 export default function OperLog() {
   const { push } = useRouter();
@@ -257,7 +258,7 @@ export default function OperLog() {
     );
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("删除成功");
+        globalMessage.success("删除成功");
 
         //删除按钮变回不可点击
         setRowCanDelete(false);
@@ -268,7 +269,7 @@ export default function OperLog() {
           actionRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     setDeleteModalVisible(false);
@@ -282,7 +283,7 @@ export default function OperLog() {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("清空成功");
+        globalMessage.success("清空成功");
         //选中的数据恢复为空
         setSelectedRowKeys([]);
         //刷新列表
@@ -290,7 +291,7 @@ export default function OperLog() {
           actionRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     setClearModalVisible(false);

+ 7 - 6
app/(business)/system/menu/page.tsx

@@ -29,6 +29,7 @@ import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 
 import {IconMap} from "@/app/_modules/definies";
 import {useRef, useState} from "react";
+import globalMessage from "@/app/_modules/globalMessage";
 
 //查询表格数据API
 const queryAPI = "/api/system/menu/list";
@@ -260,7 +261,7 @@ export default function SysMenu() {
 
     if (body != undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         if (actionTableRef.current) {
           actionTableRef.current.reload();
         }
@@ -268,7 +269,7 @@ export default function SysMenu() {
         return true;
       }
 
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
     return false;
@@ -342,7 +343,7 @@ export default function SysMenu() {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         //刷新列表
         if (actionTableRef.current) {
           actionTableRef.current.reload();
@@ -350,7 +351,7 @@ export default function SysMenu() {
         setIsShowModifyDataModal(false);
         return true;
       }
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
   };
@@ -432,13 +433,13 @@ export default function SysMenu() {
     });
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("删除成功");
+        globalMessage.success("删除成功");
         //刷新列表
         if (actionTableRef.current) {
           actionTableRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     setDeleteModalVisible(false);

+ 9 - 7
app/(business)/system/notice/page.tsx

@@ -23,6 +23,7 @@ import {useRef, useState} from "react";
 import dynamic from "next/dynamic";
 import "@uiw/react-md-editor/markdown-editor.css";
 import "@uiw/react-markdown-preview/markdown.css";
+import globalMessage from "@/app/_modules/globalMessage";
 
 const MDEditor = dynamic(
   () => import("@uiw/react-md-editor").then((mod) => mod.default),
@@ -40,6 +41,7 @@ const queryDetailAPI = "/api/system/notice";
 //删除API
 const deleteAPI = "/api/system/notice";
 
+
 export default function Notice() {
   const { push } = useRouter();
 
@@ -205,14 +207,14 @@ export default function Notice() {
 
     if (body != undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         if (actionTableRef.current) {
           actionTableRef.current.reload();
         }
         return true;
       }
 
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
     return false;
@@ -277,7 +279,7 @@ export default function Notice() {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         //刷新列表
         if (actionTableRef.current) {
           actionTableRef.current.reload();
@@ -285,7 +287,7 @@ export default function Notice() {
         setIsShowModifyDataModal(false);
         return true;
       }
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
   };
@@ -302,13 +304,13 @@ export default function Notice() {
   //确定删除选中的数据
   const executeDeleteRow = async () => {
     if (deleteNoticeId === null) return;
-    
+
     const body = await fetchApi(`${deleteAPI}/${deleteNoticeId}`, push, {
       method: "DELETE",
     });
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("删除成功");
+        globalMessage.success("删除成功");
 
         //修改按钮变回不可点击
         setRowCanModify(false);
@@ -321,7 +323,7 @@ export default function Notice() {
           actionTableRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     setDeleteModalVisible(false);

+ 7 - 6
app/(business)/system/post/page.tsx

@@ -20,6 +20,7 @@ import {faCheck, faDownload, faPenToSquare, faToggleOff, faToggleOn, faXmark,} f
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 
 import React, {useRef, useState} from "react";
+import globalMessage from "@/app/_modules/globalMessage";
 
 //查询表格数据API
 const queryAPI = "/api/system/post/list";
@@ -184,14 +185,14 @@ export default function Post() {
 
     if (body != undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         if (actionTableRef.current) {
           actionTableRef.current.reload();
         }
         return true;
       }
 
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
     return false;
@@ -256,7 +257,7 @@ export default function Post() {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         //刷新列表
         if (actionTableRef.current) {
           actionTableRef.current.reload();
@@ -264,7 +265,7 @@ export default function Post() {
         setIsShowModifyDataModal(false);
         return true;
       }
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
   };
@@ -287,7 +288,7 @@ export default function Post() {
     });
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("删除成功");
+        globalMessage.success("删除成功");
 
         //修改按钮变回不可点击
         setRowCanModify(false);
@@ -300,7 +301,7 @@ export default function Post() {
           actionTableRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     setDeleteModalVisible(false);

+ 8 - 8
app/(business)/system/role/auth/[roleid]/page.tsx

@@ -5,14 +5,14 @@ import {DeleteOutlined, ExclamationCircleFilled, PlusOutlined, ReloadOutlined,}
 import type {ActionType, ProColumns, ProFormInstance,} from "@ant-design/pro-components";
 import {PageContainer, ProTable,} from "@ant-design/pro-components";
 
-import type {GetProp, UploadProps} from "antd";
-import {Button, Modal, Space, Tag, Upload,} from "antd";
+import {Button, GetProp, Modal, Space, Tag, Upload, UploadProps} from "antd";
 import {useRouter} from "next/navigation";
 
 import {faCheck, faToggleOff, faToggleOn, faXmark,} from "@fortawesome/free-solid-svg-icons";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 
 import {useRef, useState} from "react";
+import globalMessage from "@/app/_modules/globalMessage";
 
 type FileType = Parameters<GetProp<UploadProps, "beforeUpload">>[0];
 
@@ -269,9 +269,9 @@ export default function RoleAuth({ params }: { params: { roleid: string } }) {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("批量取消授权成功");
+        globalMessage.success("批量取消授权成功");
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
 
       setSelectedRowKeys([]);
@@ -308,9 +308,9 @@ export default function RoleAuth({ params }: { params: { roleid: string } }) {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("取消授权成功");
+        globalMessage.success("取消授权成功");
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
 
       //刷新表格
@@ -378,9 +378,9 @@ export default function RoleAuth({ params }: { params: { roleid: string } }) {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
 

+ 12 - 12
app/(business)/system/role/page.tsx

@@ -23,8 +23,7 @@ import {
   ProFormTreeSelect,
   ProTable,
 } from "@ant-design/pro-components";
-import type {GetProp, UploadProps} from "antd";
-import {Button, Dropdown, Form, Input, Modal, Select, Space, Switch, Upload,} from "antd";
+import {Button, Dropdown, Form, GetProp, Input, Modal, Select, Space, Switch, Upload, UploadProps} from "antd";
 import {useRouter} from "next/navigation";
 
 import {faDownload, faPenToSquare, faToggleOff, faToggleOn, faUsers,} from "@fortawesome/free-solid-svg-icons";
@@ -32,6 +31,7 @@ import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 
 import {TreeSelect} from "@/node_modules/antd/es/index";
 import {useRef, useState} from "react";
+import globalMessage from "@/app/_modules/globalMessage";
 
 type FileType = Parameters<GetProp<UploadProps, "beforeUpload">>[0];
 
@@ -321,9 +321,9 @@ export default function Role() {
     });
     if (body != undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(`修改${attachRowdata["roleName"]}权限范围成功`);
+        globalMessage.success(`修改${attachRowdata["roleName"]}权限范围成功`);
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     scopeFormRef.resetFields();
@@ -389,9 +389,9 @@ export default function Role() {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
         erroCallback();
       }
     }
@@ -457,14 +457,14 @@ export default function Role() {
 
     if (body != undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         if (actionRef.current) {
           actionRef.current.reload();
         }
         return true;
       }
 
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
     return false;
@@ -549,14 +549,14 @@ export default function Role() {
     if (body !== undefined) {
       setShowModifyRoleModal(false);
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         //刷新列表
         if (actionRef.current) {
           actionRef.current.reload();
         }
         return true;
       }
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
   };
@@ -577,7 +577,7 @@ export default function Role() {
     });
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("删除成功");
+        globalMessage.success("删除成功");
 
         //修改按钮变回不可点击
         setRowCanModify(false);
@@ -590,7 +590,7 @@ export default function Role() {
           actionRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     setDeleteModalVisible(false);

+ 3 - 2
app/(business)/system/user/auth/[userid]/page.tsx

@@ -9,6 +9,7 @@ import {fetchApi} from "@/app/_modules/func";
 
 import {useRouter} from "next/navigation";
 import {useEffect, useState} from "react";
+import globalMessage from "@/app/_modules/globalMessage";
 
 export default function UserAuth({ params }: { params: { userid: string } }) {
   const { push } = useRouter();
@@ -99,9 +100,9 @@ export default function UserAuth({ params }: { params: { userid: string } }) {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("授权成功");
+        globalMessage.success("授权成功");
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
 

+ 20 - 17
app/(business)/system/user/page.tsx

@@ -27,7 +27,6 @@ import {
   ProFormTreeSelect,
   ProTable,
 } from "@ant-design/pro-components";
-import type {GetProp, TreeDataNode, UploadProps} from "antd";
 import {
   Button,
   Checkbox,
@@ -35,6 +34,7 @@ import {
   Dropdown,
   Flex,
   Form,
+  GetProp,
   Input,
   Modal,
   Row,
@@ -42,8 +42,10 @@ import {
   Spin,
   Switch,
   Tree,
+  TreeDataNode,
   Typography,
   Upload,
+  UploadProps
 } from "antd";
 import {useRouter} from "next/navigation";
 
@@ -58,6 +60,7 @@ import {
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 
 import {useEffect, useMemo, useRef, useState} from "react";
+import globalMessage from "@/app/_modules/globalMessage";
 
 type FileType = Parameters<GetProp<UploadProps, "beforeUpload">>[0];
 
@@ -308,9 +311,9 @@ export default function User() {
     });
     if (body != undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(`修改${attachUserdata["userName"]}密码成功`);
+        globalMessage.success(`修改${attachUserdata["userName"]}密码成功`);
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     pwdFormRef.resetFields();
@@ -381,9 +384,9 @@ export default function User() {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
         erroCallback();
       }
     }
@@ -607,14 +610,14 @@ export default function User() {
 
     if (body != undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         if (actionRef.current) {
           actionRef.current.reload();
         }
         return true;
       }
 
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
     return false;
@@ -706,14 +709,14 @@ export default function User() {
 
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success(body.msg);
+        globalMessage.success(body.msg);
         //刷新列表
         if (actionRef.current) {
           actionRef.current.reload();
         }
         return true;
       }
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
       return false;
     }
   };
@@ -734,7 +737,7 @@ export default function User() {
     });
     if (body !== undefined) {
       if (body.code == 200) {
-        App.useApp().message.success("删除成功");
+        globalMessage.success("删除成功");
 
         //修改按钮变回不可点击
         setRowCanModify(false);
@@ -747,7 +750,7 @@ export default function User() {
           actionRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
     setDeleteModalVisible(false);
@@ -764,7 +767,7 @@ export default function User() {
       file.type ===
       "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
     if (!isExcel) {
-      App.useApp().message.error("请上传 xls、xlsx 格式文件!");
+      globalMessage.error("请上传 xls、xlsx 格式文件!");
       setFileList([]);
     }
     return false;
@@ -791,9 +794,9 @@ export default function User() {
       setUploading(false);
       console.log(info.file.response);
       if (info.file.response.code == 200) {
-        App.useApp().message.success(info.file.response.msg);
+        globalMessage.success(info.file.response.msg);
       } else {
-        App.useApp().message.error(info.file.response.msg);
+        globalMessage.error(info.file.response.msg);
       }
     }
   };
@@ -809,7 +812,7 @@ export default function User() {
   //确定导入
   const executeImport = async () => {
     if (fileList.length == 0) {
-      App.useApp().message.error("请选择上传的文件");
+      globalMessage.error("请选择上传的文件");
       return;
     }
 
@@ -833,13 +836,13 @@ export default function User() {
     if (body !== undefined) {
       setFileList([]);
       if (body.code == 200) {
-        App.useApp().message.success("用户导入成功");
+        globalMessage.success("用户导入成功");
         //刷新列表
         if (actionRef.current) {
           actionRef.current.reload();
         }
       } else {
-        App.useApp().message.error(body.msg);
+        globalMessage.error(body.msg);
       }
     }
   };

+ 10 - 8
app/(business)/user/profile/page.tsx

@@ -14,6 +14,7 @@ import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 
 import {useRouter} from "@/node_modules/next/navigation";
 import {useState} from "react";
+import globalMessage from "@/app/_modules/globalMessage";
 
 type FileType = Parameters<GetProp<UploadProps, "beforeUpload">>[0];
 
@@ -28,16 +29,17 @@ const getBase64 = (img: FileType, callback: (url: string) => void) => {
 const beforeUpload = (file: FileType) => {
   const isJpgOrPng = file.type === "image/jpeg" || file.type === "image/png";
   if (!isJpgOrPng) {
-    App.useApp().message.error("只能上传 JPG/PNG 格式图片!");
+    globalMessage.error("只能上传 JPG/PNG 格式图片!");
   }
   const isLt2M = file.size / 1024 / 1024 < 2;
   if (!isLt2M) {
-    App.useApp().message.error("图片大小不能超过 2MB!");
+    globalMessage.error("图片大小不能超过 2MB!");
   }
   return isJpgOrPng && isLt2M;
 };
 
 export default function Profile() {
+  const { message } = App.useApp();
   const [imageUrl, setImageUrl] = useState<string>();
 
   const { push } = useRouter();
@@ -124,28 +126,28 @@ export default function Profile() {
       body: formData,
     });
     if (body.code == 200) {
-      App.useApp().message.success("上传头像成功");
+      globalMessage.success("上传头像成功");
       setImageUrl("/api" + body.imgUrl);
     } else {
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
     }
   };
 
   const executeUpdateProfile = async (values: any) => {
     const body = await updateProfile(values);
     if (body.code == 200) {
-      App.useApp().message.success("修改成功");
+      globalMessage.success("修改成功");
     } else {
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
     }
   };
 
   const executeUpdatePassword = async (values: any) => {
     const body = await updatePassword(values);
     if (body.code == 200) {
-      App.useApp().message.success("修改成功");
+      globalMessage.success("修改成功");
     } else {
-      App.useApp().message.error(body.msg);
+      globalMessage.error(body.msg);
     }
   };