修改接口返回

config/proxy.ts

@@ -18,13 +18,11 @@ export default {
     },
     '/web/': {
       // 要代理的地址
-      // target: 'http://yongxu.yehaoji.cn:8198',
-      target: 'http://yongxu.yehaoji.cn:8198',
+      target: 'http://yongxu.yehaoji.cn:8199',
       changeOrigin: true,
     },
     '/s/': {
       // 要代理的地址
-      // target: 'http://yongxu.yehaoji.cn:8198',
       target: 'http://192.168.0.224:18199/',
       changeOrigin: true,
     },

src/app.tsx

@@ -26,9 +26,9 @@ export async function getInitialState(): Promise<{
 }> {
   const fetchUserInfo = async () => {
     try {
-      const msg = await queryCurrentUser(localStorage.getItem('token'));
+      const msg: any = await queryCurrentUser(localStorage.getItem('token'));
       return {
-        name: msg.user_name,
+        name: msg.data.user_name,
       };
     } catch (error) {
       history.push(loginPath);

src/components/RightContent/AvatarDropdown.tsx

@@ -40,9 +40,9 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
 
   useEffect(() => {
     const token = localStorage.getItem('token');
-    currentUserInfo(token).then((res) => {
-      if (res && res.record_id) {
-        setAvatar(res?.photo);
+    currentUserInfo(token).then((res: any) => {
+      if (res.code === 0) {
+        setAvatar(res?.data?.photo);
       }
     });
   }, []);

src/pages/setting/UserManagement/check.tsx

@@ -38,8 +38,8 @@ const Check: React.FC<userCheckPros> = (props) => {
 
   useEffect(() => {
     queryUserDetail(id).then((res) => {
-      if (res && res.record_id) {
-        setDataDetail(res);
+      if (res.code === 0) {
+        setDataDetail(res.data);
       }
     });
   }, []);

src/pages/setting/UserManagement/edit.tsx

@@ -61,7 +61,7 @@ const Edit: React.FC<userEditPros> = (props) => {
       if (values) {
         const data = { ...values };
         if (values?.photo) {
-          data.photo = values?.photo?.file?.response?.url;
+          data.photo = values?.photo?.file?.response?.data?.url;
         }
         if (values?.password) {
           data.password = md5(values.password);
@@ -71,32 +71,32 @@ const Edit: React.FC<userEditPros> = (props) => {
           //  编辑
           editUser(data)
             .then((res) => {
-              if (res && !res.error) {
+              if (res.code === 0) {
                 message.success('编辑成功');
                 editCallback();
               } else {
-                message.error(res?.error?.message);
+                message.error(res?.message);
                 editCallback();
               }
             })
             .catch((e) => {
-              message.error(e?.error?.message);
+              message.error(e?.message);
               editCallback();
             });
         } else {
           // 新增
           createUser(data)
             .then((res) => {
-              if (res && !res.error) {
+              if (res.code === 0) {
                 message.success('保存成功');
                 editCallback();
               } else {
-                message.error(res?.error?.message);
+                message.error(res?.message);
                 editCallback();
               }
             })
             .catch((e) => {
-              message.error(e?.error?.message);
+              message.error(e?.message);
               editCallback();
             });
         }

src/pages/setting/UserManagement/index.tsx

@@ -43,9 +43,9 @@ const UserManagement: React.FC = () => {
       ...searchData,
     };
     queryUserList(params).then((res) => {
-      if (res && !res.error) {
-        setDataList(res.list);
-        setPagination(res.pagination);
+      if (res.code === 0) {
+        setDataList(res.data.list);
+        setPagination(res.data.pagination);
         setLoading(false);
       }
     });
@@ -94,7 +94,7 @@ const UserManagement: React.FC = () => {
   const toEnable = (record: any) => {
     enableUser(record.record_id)
       .then((res) => {
-        if (res && !res.error) {
+        if (res.code === 0) {
           message.success('启用成功');
           setLoading(true);
           getListData();
@@ -103,7 +103,7 @@ const UserManagement: React.FC = () => {
         }
       })
       .catch((e) => {
-        message.error(e?.error?.message);
+        message.error(e.message);
       });
   };
 
@@ -111,7 +111,7 @@ const UserManagement: React.FC = () => {
   const toDisable = (record: any) => {
     disableUser(record.record_id)
       .then((res) => {
-        if (res && !res.error) {
+        if (res.code === 0) {
           message.success('停用成功');
           setLoading(true);
           getListData();
@@ -120,7 +120,7 @@ const UserManagement: React.FC = () => {
         }
       })
       .catch((e) => {
-        message.error(e?.error?.message);
+        message.error(e?.message);
       });
   };
 
@@ -138,9 +138,9 @@ const UserManagement: React.FC = () => {
       ...searchData,
     };
     queryUserList(param).then((res) => {
-      if (res && !res.error) {
-        setDataList(res.list);
-        setPagination(res.pagination);
+      if (res.code === 0) {
+        setDataList(res.data.list);
+        setPagination(res.data.pagination);
         setLoading(false);
       }
     });

src/pages/user/Login/index.tsx

@@ -29,7 +29,9 @@ const Login: React.FC = () => {
    */
   const fetchCaptcha = () => {
     getCaptchaId().then(async (res) => {
-      setCaptcha_id(res.captcha_id);
+      if (res.code === 0) {
+        setCaptcha_id(res.data.captcha_id);
+      }
     });
   };
 
@@ -62,12 +64,13 @@ const Login: React.FC = () => {
         password: md5(values.password),
         captcha_id,
       };
-      const msg = await login(body);
-      if (!msg?.error) {
+      const msg: any = await login(body);
+
+      if (msg.code === 0) {
         if (localStorage.getItem('token') == null || localStorage.getItem('token') == undefined) {
           localStorage.setItem('token', '');
         }
-        localStorage.setItem('token', `${msg.token_type} ${msg.access_token}`);
+        localStorage.setItem('token', `${msg.data.token_type} ${msg.data.access_token}`);
         message.success(`欢迎登录系统`);
         await fetchUserInfo();
         history.push('/');
@@ -76,7 +79,7 @@ const Login: React.FC = () => {
         const { redirect } = query as { redirect: string };
         history.push(redirect || '/');
       } else {
-        message.error(msg?.error?.message || '登录失败');
+        message.error(msg?.message || '登录失败');
         fetchCaptcha();
       }
     } catch (error) {