feats

.env

@@ -1 +1 @@
-VITE_SERVER_BASE=/api
+VITE_SERVER_BASE=

generateService.js

@@ -47,7 +47,7 @@ axios.get(swagger).then((res) => {
       const f = acc[fname] || [requestStr, ''];
       const content = [
         ...commentTpl(api.summary),
-        apiTpl(apiName, method, path),
+        `export ${apiTpl(apiName, method, path)}`,
         '',
       ]
 

src/layouts/AuthLayout/components/Header/User.jsx

@@ -2,6 +2,15 @@ import React, { useState, forwardRef, useRef, useImperativeHandle } from 'react'
 import { Avatar, Button, Dropdown, Menu, Form, Input, Modal } from 'antd';
 import md5 from 'md5';
 
+const DefaultAvatar = ({ color = '#1296db' }) => (
+  <svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+    <path
+      d="M938.666667 883.2c0-8.533333 0-42.666667-21.333334-81.066667-12.8-25.6-34.133333-42.666667-59.733333-59.733333-29.866667-17.066667-68.266667-34.133333-115.2-42.666667-4.266667 0-34.133333-4.266667-59.733333-12.8-29.866667-8.533333-42.666667-12.8-46.933334-17.066666v-25.6c4.266667-55.466667 34.133333-85.333333 59.733334-110.933334 8.533333-8.533333 17.066667-17.066667 25.6-29.866666 29.866667-42.666667 34.133333-85.333333 34.133333-93.866667 0-8.533333 0-12.8-4.266667-21.333333s-8.533333-17.066667-12.8-21.333334c0-12.8 4.266667-25.6 4.266667-34.133333 0-21.333333 4.266667-55.466667-4.266667-89.6 0-4.266667 0-12.8-4.266666-21.333333-8.533333-25.6-17.066667-46.933333-34.133334-64-8.533333 0-68.266667-59.733333-230.4-72.533334H405.333333c-8.533333 0-17.066667 0-25.6 4.266667-29.866667 8.533333-34.133333 29.866667-38.4 38.4v25.6l-4.266666 4.266667c-4.266667 4.266667-46.933333 42.666667-51.2 93.866666-4.266667 34.133333-4.266667 85.333333 0 123.733334-4.266667 8.533333-12.8 17.066667-12.8 38.4 0 8.533333 4.266667 51.2 34.133333 89.6 8.533333 8.533333 12.8 17.066667 25.6 29.866666 25.6 29.866667 55.466667 59.733333 59.733333 110.933334v25.6c-8.533333 4.266667-21.333333 12.8-51.2 21.333333s-59.733333 12.8-64 12.8c-42.666667 8.533333-81.066667 21.333333-110.933333 38.4-25.6 17.066667-46.933333 38.4-59.733333 59.733333-21.333333 38.4-21.333333 72.533333-21.333334 81.066667v21.333333c0 17.066667 17.066667 34.133333 38.4 34.133334h776.533334c21.333333 0 38.4-17.066667 38.4-38.4v-17.066667z"
+      fill={color}
+    ></path>
+  </svg>
+)
+
 const ChangePassword = forwardRef((props, ref) => {
   const [visible, setVisible] = useState(false);
 
@@ -77,7 +86,7 @@ export default (props) => {
   return (
     <Dropdown menu={{ items, onClick }}>
       <div className="user-info">
-        <Avatar size={24} src="https://joeschmoe.io/api/v1/random" />
+        <Avatar size={24} src={user.avatar || <DefaultAvatar />} />
         <span className='font'>{user.name}</span>
         <ChangePassword ref={passRef} />
       </div>

src/pages/login/LoginForm.jsx

@@ -1,19 +1,50 @@
 import React from 'react';
 import { Button, Form, Input, Radio } from 'antd';
+import md5 from 'md5';
+import { login } from '@/service/login';
+
+const submitStyle = {
+  width: '100%',
+  marginTop: '24px',
+  borderRadius: '4px',
+}
 
 export default (props) => {
+  const { onSuccess } = props;
   const [form] = Form.useForm();
+  const [loading, setLoading] = React.useState(false);
+
+  const onFinish = (values) => {
+    const data = {
+      ...values,
+      password: md5(values.password)
+    }
+
+    setLoading(true);
+    login(data).then(() => {
+      onSuccess();
+      setLoading(false);
+    }).catch(() => {
+      setLoading(false);
+    });
+  }
 
   return (
-    <Form form={form} layout="vertical">
-      <Form.Item label="用户名" required>
+    <Form form={form} layout="vertical" onFinish={onFinish}>
+      <Form.Item name="account" label="用户名" required>
         <Input placeholder="请输入用户名" style={{ borderRadius: '4px' }} />
       </Form.Item>
-      <Form.Item label="密 码" required>
+      <Form.Item name="password" label="密 码" required>
         <Input.Password placeholder="请输入密码" style={{ borderRadius: '4px' }} />
       </Form.Item>
       <Form.Item>
-        <Button type="primary" size='large' style={{ width: '100%', marginTop: '24px', borderRadius: '4px' }}>登录</Button>
+        <Button
+          type="primary"
+          size='large'
+          style={submitStyle}
+          loading={loading}
+          htmlType="submit"
+        >登录</Button>
       </Form.Item>
     </Form>
   )

src/pages/login/Particles.jsx

@@ -0,0 +1,24 @@
+import React from 'react'
+
+export default (props) => {
+  React.useEffect(() => {
+    const baseUrl = import.meta.env.BASE_URL;
+    const oScript = document.createElement("script");
+    oScript.type = "text\/javascript";
+    oScript.onload = () => {
+      particlesJS.load('particles-js', `${baseUrl}particles/particles.json`, function() {
+        console.log('callback - particles.js config loaded');
+      });
+    }
+    document.querySelector('head').appendChild(oScript);
+    oScript.src = `${baseUrl}particles/particles.min.js`;
+
+    return () => {
+      document.querySelector('head').removeChild(oScript);
+    }
+  }, [])
+
+  return (
+    <div id="particles-js"></div>
+  )
+}

src/pages/login/index.jsx

@@ -1,6 +1,8 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { Helmet } from "react-helmet";
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { useModel } from '@/store';
+import Particles from './Particles';
 import LoginForm from './LoginForm';
 import LoginEffect from './Effect';
 import './style.less';
@@ -8,34 +10,29 @@ import './style.less';
 const year = new Date().getFullYear();
 
 export default (props) => {
+  const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
   const { app } = useModel('system');
 
-  const baseUrl = import.meta.env.BASE_URL;
   const title = `欢迎使用${app.fullName}`;
   const copyright = `${app.company} @ ${year}`;
 
-  useEffect(() => {
-    const oScript = document.createElement("script");
-    oScript.type = "text\/javascript";
-    oScript.onload = () => {
-      particlesJS.load('particles-js', `${baseUrl}particles/particles.json`, function() {
-        console.log('callback - particles.js config loaded');
-      });
-    }
-    document.querySelector('head').appendChild(oScript);
-    oScript.src = `${baseUrl}particles/particles.min.js`;
+  console.log(searchParams)
 
-    return () => {
-      document.querySelector('head').removeChild(oScript);
+  const onSuccess = () => {
+    if (searchParams.back) {
+      navigate(-1);
+    } else {
+      navigate('/');
     }
-  }, [])
+  };
 
   return (
     <div className='login-page'>
       <Helmet>
         <title>{app.fullName}</title>
       </Helmet>
-      <div id="particles-js"></div>
+      <Particles />
       <div className="login-page-container">
         <div className="login-card">
           <div className="login-card-left">
@@ -43,7 +40,7 @@ export default (props) => {
               <div className="login-form">
                 <h2>登录系统</h2>
                 <div className="login-subtitle">{title}</div>
-                <LoginForm />
+                <LoginForm onSuccess={onSuccess} />
               </div>
             </div>
             <div className="login-copyright">

src/service/login.js

@@ -3,14 +3,14 @@ import request from '@/utils/request';
 /*
  * 修改密码
  */
-const changePassword = (data) => request(`/api/admin/change-password`, { data, method: 'put' });
+export const changePassword = (data) => request(`/api/admin/change-password`, { data, method: 'put' });
 
 /*
  * 后台登录
  */
-const login = (data) => request('/api/admin/login', { data, method: 'post' });
+export const login = (data) => request('/api/admin/login', { data, method: 'post' });
 
 /*
  * 登出
  */
-const logout = () => request('/api/admin/logout', { method: 'post' });
+export const logout = (data) => request('/api/admin/logout', { data, method: 'post' });

src/service/syslogin.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getSysLogin = (params) => request('/api/sysLogin', { params });
+export const getSysLogin = (params) => request('/api/sysLogin', { params });
 
 /*
  * 新增数据
  */
-const postSysLogin = (data) => request('/api/sysLogin', { data, method: 'post' });
+export const postSysLogin = (data) => request('/api/sysLogin', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getSysLoginById = (id) => request(`/api/sysLogin/${id}`);
+export const getSysLoginById = (id) => request(`/api/sysLogin/${id}`);
 
 /*
  * 更新数据
  */
-const putSysLogin = (id, data) => request(`/api/sysLogin/${id}`, { data, method: 'put' });
+export const putSysLogin = (id, data) => request(`/api/sysLogin/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteSysLogin = (id) => request(`/api/sysLogin/${id}`, { method: 'delete' });
+export const deleteSysLogin = (id) => request(`/api/sysLogin/${id}`, { method: 'delete' });

src/service/sysorg.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getSysOrg = (params) => request('/api/sysOrg', { params });
+export const getSysOrg = (params) => request('/api/sysOrg', { params });
 
 /*
  * 新增数据
  */
-const postSysOrg = (data) => request('/api/sysOrg', { data, method: 'post' });
+export const postSysOrg = (data) => request('/api/sysOrg', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getSysOrgById = (id) => request(`/api/sysOrg/${id}`);
+export const getSysOrgById = (id) => request(`/api/sysOrg/${id}`);
 
 /*
  * 更新数据
  */
-const putSysOrg = (id, data) => request(`/api/sysOrg/${id}`, { data, method: 'put' });
+export const putSysOrg = (id, data) => request(`/api/sysOrg/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteSysOrg = (id) => request(`/api/sysOrg/${id}`, { method: 'delete' });
+export const deleteSysOrg = (id) => request(`/api/sysOrg/${id}`, { method: 'delete' });

src/service/sysposition.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getSysPosition = (params) => request('/api/sysPosition', { params });
+export const getSysPosition = (params) => request('/api/sysPosition', { params });
 
 /*
  * 新增数据
  */
-const postSysPosition = (data) => request('/api/sysPosition', { data, method: 'post' });
+export const postSysPosition = (data) => request('/api/sysPosition', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getSysPositionById = (id) => request(`/api/sysPosition/${id}`);
+export const getSysPositionById = (id) => request(`/api/sysPosition/${id}`);
 
 /*
  * 更新数据
  */
-const putSysPosition = (id, data) => request(`/api/sysPosition/${id}`, { data, method: 'put' });
+export const putSysPosition = (id, data) => request(`/api/sysPosition/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteSysPosition = (id) => request(`/api/sysPosition/${id}`, { method: 'delete' });
+export const deleteSysPosition = (id) => request(`/api/sysPosition/${id}`, { method: 'delete' });

src/service/sysresource.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getSysResource = (params) => request('/api/sysResource', { params });
+export const getSysResource = (params) => request('/api/sysResource', { params });
 
 /*
  * 新增数据
  */
-const postSysResource = (data) => request('/api/sysResource', { data, method: 'post' });
+export const postSysResource = (data) => request('/api/sysResource', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getSysResourceById = (id) => request(`/api/sysResource/${id}`);
+export const getSysResourceById = (id) => request(`/api/sysResource/${id}`);
 
 /*
  * 更新数据
  */
-const putSysResource = (id, data) => request(`/api/sysResource/${id}`, { data, method: 'put' });
+export const putSysResource = (id, data) => request(`/api/sysResource/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteSysResource = (id) => request(`/api/sysResource/${id}`, { method: 'delete' });
+export const deleteSysResource = (id) => request(`/api/sysResource/${id}`, { method: 'delete' });

src/service/sysrole.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getSysRole = (params) => request('/api/sysRole', { params });
+export const getSysRole = (params) => request('/api/sysRole', { params });
 
 /*
  * 新增数据
  */
-const postSysRole = (data) => request('/api/sysRole', { data, method: 'post' });
+export const postSysRole = (data) => request('/api/sysRole', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getSysRoleById = (id) => request(`/api/sysRole/${id}`);
+export const getSysRoleById = (id) => request(`/api/sysRole/${id}`);
 
 /*
  * 更新数据
  */
-const putSysRole = (id, data) => request(`/api/sysRole/${id}`, { data, method: 'put' });
+export const putSysRole = (id, data) => request(`/api/sysRole/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteSysRole = (id) => request(`/api/sysRole/${id}`, { method: 'delete' });
+export const deleteSysRole = (id) => request(`/api/sysRole/${id}`, { method: 'delete' });

src/service/sysroleresource.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getSysRoleResource = (params) => request('/api/sysRoleResource', { params });
+export const getSysRoleResource = (params) => request('/api/sysRoleResource', { params });
 
 /*
  * 新增数据
  */
-const postSysRoleResource = (data) => request('/api/sysRoleResource', { data, method: 'post' });
+export const postSysRoleResource = (data) => request('/api/sysRoleResource', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getSysRoleResourceById = (id) => request(`/api/sysRoleResource/${id}`);
+export const getSysRoleResourceById = (id) => request(`/api/sysRoleResource/${id}`);
 
 /*
  * 更新数据
  */
-const putSysRoleResource = (id, data) => request(`/api/sysRoleResource/${id}`, { data, method: 'put' });
+export const putSysRoleResource = (id, data) => request(`/api/sysRoleResource/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteSysRoleResource = (id) => request(`/api/sysRoleResource/${id}`, { method: 'delete' });
+export const deleteSysRoleResource = (id) => request(`/api/sysRoleResource/${id}`, { method: 'delete' });

src/service/sysuser.js

@@ -3,24 +3,29 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getSysUser = (params) => request('/api/sysUser', { params });
+export const getSysUser = (params) => request('/api/sysUser', { params });
 
 /*
  * 新增数据
  */
-const postSysUser = (data) => request('/api/sysUser', { data, method: 'post' });
+export const postSysUser = (data) => request('/api/sysUser', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getSysUserById = (id) => request(`/api/sysUser/${id}`);
+export const getSysUserById = (id) => request(`/api/sysUser/${id}`);
+
+/*
+ * 通过ID查询单条数据
+ */
+export const currentUser = () => request(`/api/sysUser/current`);
 
 /*
  * 更新数据
  */
-const putSysUser = (id, data) => request(`/api/sysUser/${id}`, { data, method: 'put' });
+export const putSysUser = (id, data) => request(`/api/sysUser/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteSysUser = (id) => request(`/api/sysUser/${id}`, { method: 'delete' });
+export const deleteSysUser = (id) => request(`/api/sysUser/${id}`, { method: 'delete' });

src/service/sysuserduty.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getSysUserDuty = (params) => request('/api/sysUserDuty', { params });
+export const getSysUserDuty = (params) => request('/api/sysUserDuty', { params });
 
 /*
  * 新增数据
  */
-const postSysUserDuty = (data) => request('/api/sysUserDuty', { data, method: 'post' });
+export const postSysUserDuty = (data) => request('/api/sysUserDuty', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getSysUserDutyById = (id) => request(`/api/sysUserDuty/${id}`);
+export const getSysUserDutyById = (id) => request(`/api/sysUserDuty/${id}`);
 
 /*
  * 更新数据
  */
-const putSysUserDuty = (id, data) => request(`/api/sysUserDuty/${id}`, { data, method: 'put' });
+export const putSysUserDuty = (id, data) => request(`/api/sysUserDuty/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteSysUserDuty = (id) => request(`/api/sysUserDuty/${id}`, { method: 'delete' });
+export const deleteSysUserDuty = (id) => request(`/api/sysUserDuty/${id}`, { method: 'delete' });

src/service/sysuserrole.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getSysUserRole = (params) => request('/api/sysUserRole', { params });
+export const getSysUserRole = (params) => request('/api/sysUserRole', { params });
 
 /*
  * 新增数据
  */
-const postSysUserRole = (data) => request('/api/sysUserRole', { data, method: 'post' });
+export const postSysUserRole = (data) => request('/api/sysUserRole', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getSysUserRoleById = (id) => request(`/api/sysUserRole/${id}`);
+export const getSysUserRoleById = (id) => request(`/api/sysUserRole/${id}`);
 
 /*
  * 更新数据
  */
-const putSysUserRole = (id, data) => request(`/api/sysUserRole/${id}`, { data, method: 'put' });
+export const putSysUserRole = (id, data) => request(`/api/sysUserRole/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteSysUserRole = (id) => request(`/api/sysUserRole/${id}`, { method: 'delete' });
+export const deleteSysUserRole = (id) => request(`/api/sysUserRole/${id}`, { method: 'delete' });

src/service/taattach.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaAttach = (params) => request('/api/taAttach', { params });
+export const getTaAttach = (params) => request('/api/taAttach', { params });
 
 /*
  * 新增数据
  */
-const postTaAttach = (data) => request('/api/taAttach', { data, method: 'post' });
+export const postTaAttach = (data) => request('/api/taAttach', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaAttachById = (id) => request(`/api/taAttach/${id}`);
+export const getTaAttachById = (id) => request(`/api/taAttach/${id}`);
 
 /*
  * 更新数据
  */
-const putTaAttach = (id, data) => request(`/api/taAttach/${id}`, { data, method: 'put' });
+export const putTaAttach = (id, data) => request(`/api/taAttach/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaAttach = (id) => request(`/api/taAttach/${id}`, { method: 'delete' });
+export const deleteTaAttach = (id) => request(`/api/taAttach/${id}`, { method: 'delete' });

src/service/tacheck.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaMockCheck = (params) => request('/api/taMockCheck', { params });
+export const getTaMockCheck = (params) => request('/api/taMockCheck', { params });
 
 /*
  * 新增数据
  */
-const postTaMockCheck = (data) => request('/api/taMockCheck', { data, method: 'post' });
+export const postTaMockCheck = (data) => request('/api/taMockCheck', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaMockCheckById = (id) => request(`/api/taMockCheck/${id}`);
+export const getTaMockCheckById = (id) => request(`/api/taMockCheck/${id}`);
 
 /*
  * 更新数据
  */
-const putTaMockCheck = (id, data) => request(`/api/taMockCheck/${id}`, { data, method: 'put' });
+export const putTaMockCheck = (id, data) => request(`/api/taMockCheck/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaMockCheck = (id) => request(`/api/taMockCheck/${id}`, { method: 'delete' });
+export const deleteTaMockCheck = (id) => request(`/api/taMockCheck/${id}`, { method: 'delete' });

src/service/tacheckanswer.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaCheckAnswer = (params) => request('/api/taCheckAnswer', { params });
+export const getTaCheckAnswer = (params) => request('/api/taCheckAnswer', { params });
 
 /*
  * 新增数据
  */
-const postTaCheckAnswer = (data) => request('/api/taCheckAnswer', { data, method: 'post' });
+export const postTaCheckAnswer = (data) => request('/api/taCheckAnswer', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaCheckAnswerById = (id) => request(`/api/taCheckAnswer/${id}`);
+export const getTaCheckAnswerById = (id) => request(`/api/taCheckAnswer/${id}`);
 
 /*
  * 更新数据
  */
-const putTaCheckAnswer = (id, data) => request(`/api/taCheckAnswer/${id}`, { data, method: 'put' });
+export const putTaCheckAnswer = (id, data) => request(`/api/taCheckAnswer/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaCheckAnswer = (id) => request(`/api/taCheckAnswer/${id}`, { method: 'delete' });
+export const deleteTaCheckAnswer = (id) => request(`/api/taCheckAnswer/${id}`, { method: 'delete' });

src/service/tacheckansweritem.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaCheckAnswerItem = (params) => request('/api/taCheckAnswerItem', { params });
+export const getTaCheckAnswerItem = (params) => request('/api/taCheckAnswerItem', { params });
 
 /*
  * 新增数据
  */
-const postTaCheckAnswerItem = (data) => request('/api/taCheckAnswerItem', { data, method: 'post' });
+export const postTaCheckAnswerItem = (data) => request('/api/taCheckAnswerItem', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaCheckAnswerItemById = (id) => request(`/api/taCheckAnswerItem/${id}`);
+export const getTaCheckAnswerItemById = (id) => request(`/api/taCheckAnswerItem/${id}`);
 
 /*
  * 更新数据
  */
-const putTaCheckAnswerItem = (id, data) => request(`/api/taCheckAnswerItem/${id}`, { data, method: 'put' });
+export const putTaCheckAnswerItem = (id, data) => request(`/api/taCheckAnswerItem/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaCheckAnswerItem = (id) => request(`/api/taCheckAnswerItem/${id}`, { method: 'delete' });
+export const deleteTaCheckAnswerItem = (id) => request(`/api/taCheckAnswerItem/${id}`, { method: 'delete' });

src/service/tacheckitem.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaCheckItem = (params) => request('/api/taCheckItem', { params });
+export const getTaCheckItem = (params) => request('/api/taCheckItem', { params });
 
 /*
  * 新增数据
  */
-const postTaCheckItem = (data) => request('/api/taCheckItem', { data, method: 'post' });
+export const postTaCheckItem = (data) => request('/api/taCheckItem', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaCheckItemById = (id) => request(`/api/taCheckItem/${id}`);
+export const getTaCheckItemById = (id) => request(`/api/taCheckItem/${id}`);
 
 /*
  * 更新数据
  */
-const putTaCheckItem = (id, data) => request(`/api/taCheckItem/${id}`, { data, method: 'put' });
+export const putTaCheckItem = (id, data) => request(`/api/taCheckItem/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaCheckItem = (id) => request(`/api/taCheckItem/${id}`, { method: 'delete' });
+export const deleteTaCheckItem = (id) => request(`/api/taCheckItem/${id}`, { method: 'delete' });

src/service/tacheckscore.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaCheckScore = (params) => request('/api/taCheckScore', { params });
+export const getTaCheckScore = (params) => request('/api/taCheckScore', { params });
 
 /*
  * 新增数据
  */
-const postTaCheckScore = (data) => request('/api/taCheckScore', { data, method: 'post' });
+export const postTaCheckScore = (data) => request('/api/taCheckScore', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaCheckScoreById = (id) => request(`/api/taCheckScore/${id}`);
+export const getTaCheckScoreById = (id) => request(`/api/taCheckScore/${id}`);
 
 /*
  * 更新数据
  */
-const putTaCheckScore = (id, data) => request(`/api/taCheckScore/${id}`, { data, method: 'put' });
+export const putTaCheckScore = (id, data) => request(`/api/taCheckScore/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaCheckScore = (id) => request(`/api/taCheckScore/${id}`, { method: 'delete' });
+export const deleteTaCheckScore = (id) => request(`/api/taCheckScore/${id}`, { method: 'delete' });

src/service/taissue.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaIssue = (params) => request('/api/taIssue', { params });
+export const getTaIssue = (params) => request('/api/taIssue', { params });
 
 /*
  * 新增数据
  */
-const postTaIssue = (data) => request('/api/taIssue', { data, method: 'post' });
+export const postTaIssue = (data) => request('/api/taIssue', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaIssueById = (id) => request(`/api/taIssue/${id}`);
+export const getTaIssueById = (id) => request(`/api/taIssue/${id}`);
 
 /*
  * 更新数据
  */
-const putTaIssue = (id, data) => request(`/api/taIssue/${id}`, { data, method: 'put' });
+export const putTaIssue = (id, data) => request(`/api/taIssue/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaIssue = (id) => request(`/api/taIssue/${id}`, { method: 'delete' });
+export const deleteTaIssue = (id) => request(`/api/taIssue/${id}`, { method: 'delete' });

src/service/taissueprocess.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaIssueProcess = (params) => request('/api/taIssueProcess', { params });
+export const getTaIssueProcess = (params) => request('/api/taIssueProcess', { params });
 
 /*
  * 新增数据
  */
-const postTaIssueProcess = (data) => request('/api/taIssueProcess', { data, method: 'post' });
+export const postTaIssueProcess = (data) => request('/api/taIssueProcess', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaIssueProcessById = (id) => request(`/api/taIssueProcess/${id}`);
+export const getTaIssueProcessById = (id) => request(`/api/taIssueProcess/${id}`);
 
 /*
  * 更新数据
  */
-const putTaIssueProcess = (id, data) => request(`/api/taIssueProcess/${id}`, { data, method: 'put' });
+export const putTaIssueProcess = (id, data) => request(`/api/taIssueProcess/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaIssueProcess = (id) => request(`/api/taIssueProcess/${id}`, { method: 'delete' });
+export const deleteTaIssueProcess = (id) => request(`/api/taIssueProcess/${id}`, { method: 'delete' });

src/service/tanotice.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaNotice = (params) => request('/api/taNotice', { params });
+export const getTaNotice = (params) => request('/api/taNotice', { params });
 
 /*
  * 新增数据
  */
-const postTaNotice = (data) => request('/api/taNotice', { data, method: 'post' });
+export const postTaNotice = (data) => request('/api/taNotice', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaNoticeById = (id) => request(`/api/taNotice/${id}`);
+export const getTaNoticeById = (id) => request(`/api/taNotice/${id}`);
 
 /*
  * 更新数据
  */
-const putTaNotice = (id, data) => request(`/api/taNotice/${id}`, { data, method: 'put' });
+export const putTaNotice = (id, data) => request(`/api/taNotice/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaNotice = (id) => request(`/api/taNotice/${id}`, { method: 'delete' });
+export const deleteTaNotice = (id) => request(`/api/taNotice/${id}`, { method: 'delete' });

src/service/taorgconfig.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaOrgConfig = (params) => request('/api/taOrgConfig', { params });
+export const getTaOrgConfig = (params) => request('/api/taOrgConfig', { params });
 
 /*
  * 新增数据
  */
-const postTaOrgConfig = (data) => request('/api/taOrgConfig', { data, method: 'post' });
+export const postTaOrgConfig = (data) => request('/api/taOrgConfig', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaOrgConfigById = (id) => request(`/api/taOrgConfig/${id}`);
+export const getTaOrgConfigById = (id) => request(`/api/taOrgConfig/${id}`);
 
 /*
  * 更新数据
  */
-const putTaOrgConfig = (id, data) => request(`/api/taOrgConfig/${id}`, { data, method: 'put' });
+export const putTaOrgConfig = (id, data) => request(`/api/taOrgConfig/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaOrgConfig = (id) => request(`/api/taOrgConfig/${id}`, { method: 'delete' });
+export const deleteTaOrgConfig = (id) => request(`/api/taOrgConfig/${id}`, { method: 'delete' });

src/service/taperson.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaPerson = (params) => request('/api/taPerson', { params });
+export const getTaPerson = (params) => request('/api/taPerson', { params });
 
 /*
  * 新增数据
  */
-const postTaPerson = (data) => request('/api/taPerson', { data, method: 'post' });
+export const postTaPerson = (data) => request('/api/taPerson', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaPersonById = (id) => request(`/api/taPerson/${id}`);
+export const getTaPersonById = (id) => request(`/api/taPerson/${id}`);
 
 /*
  * 更新数据
  */
-const putTaPerson = (id, data) => request(`/api/taPerson/${id}`, { data, method: 'put' });
+export const putTaPerson = (id, data) => request(`/api/taPerson/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaPerson = (id) => request(`/api/taPerson/${id}`, { method: 'delete' });
+export const deleteTaPerson = (id) => request(`/api/taPerson/${id}`, { method: 'delete' });

src/service/tapersonreflect.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaPersonReflect = (params) => request('/api/taPersonReflect', { params });
+export const getTaPersonReflect = (params) => request('/api/taPersonReflect', { params });
 
 /*
  * 新增数据
  */
-const postTaPersonReflect = (data) => request('/api/taPersonReflect', { data, method: 'post' });
+export const postTaPersonReflect = (data) => request('/api/taPersonReflect', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaPersonReflectById = (id) => request(`/api/taPersonReflect/${id}`);
+export const getTaPersonReflectById = (id) => request(`/api/taPersonReflect/${id}`);
 
 /*
  * 更新数据
  */
-const putTaPersonReflect = (id, data) => request(`/api/taPersonReflect/${id}`, { data, method: 'put' });
+export const putTaPersonReflect = (id, data) => request(`/api/taPersonReflect/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaPersonReflect = (id) => request(`/api/taPersonReflect/${id}`, { method: 'delete' });
+export const deleteTaPersonReflect = (id) => request(`/api/taPersonReflect/${id}`, { method: 'delete' });

src/service/tdissuetype.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTdIssueType = (params) => request('/api/tdIssueType', { params });
+export const getTdIssueType = (params) => request('/api/tdIssueType', { params });
 
 /*
  * 新增数据
  */
-const postTdIssueType = (data) => request('/api/tdIssueType', { data, method: 'post' });
+export const postTdIssueType = (data) => request('/api/tdIssueType', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTdIssueTypeById = (id) => request(`/api/tdIssueType/${id}`);
+export const getTdIssueTypeById = (id) => request(`/api/tdIssueType/${id}`);
 
 /*
  * 更新数据
  */
-const putTdIssueType = (id, data) => request(`/api/tdIssueType/${id}`, { data, method: 'put' });
+export const putTdIssueType = (id, data) => request(`/api/tdIssueType/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTdIssueType = (id) => request(`/api/tdIssueType/${id}`, { method: 'delete' });
+export const deleteTdIssueType = (id) => request(`/api/tdIssueType/${id}`, { method: 'delete' });

src/service/tdlocquanswer.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTdLocQuAnswer = (params) => request('/api/tdLocQuAnswer', { params });
+export const getTdLocQuAnswer = (params) => request('/api/tdLocQuAnswer', { params });
 
 /*
  * 新增数据
  */
-const postTdLocQuAnswer = (data) => request('/api/tdLocQuAnswer', { data, method: 'post' });
+export const postTdLocQuAnswer = (data) => request('/api/tdLocQuAnswer', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTdLocQuAnswerById = (id) => request(`/api/tdLocQuAnswer/${id}`);
+export const getTdLocQuAnswerById = (id) => request(`/api/tdLocQuAnswer/${id}`);
 
 /*
  * 更新数据
  */
-const putTdLocQuAnswer = (id, data) => request(`/api/tdLocQuAnswer/${id}`, { data, method: 'put' });
+export const putTdLocQuAnswer = (id, data) => request(`/api/tdLocQuAnswer/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTdLocQuAnswer = (id) => request(`/api/tdLocQuAnswer/${id}`, { method: 'delete' });
+export const deleteTdLocQuAnswer = (id) => request(`/api/tdLocQuAnswer/${id}`, { method: 'delete' });

src/service/tdlocquestion.js

@@ -3,49 +3,49 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTaCheckItemQu = (params) => request('/api/taCheckItemQu', { params });
+export const getTaCheckItemQu = (params) => request('/api/taCheckItemQu', { params });
 
 /*
  * 新增数据
  */
-const postTaCheckItemQu = (data) => request('/api/taCheckItemQu', { data, method: 'post' });
+export const postTaCheckItemQu = (data) => request('/api/taCheckItemQu', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTaCheckItemQuById = (id) => request(`/api/taCheckItemQu/${id}`);
+export const getTaCheckItemQuById = (id) => request(`/api/taCheckItemQu/${id}`);
 
 /*
  * 更新数据
  */
-const putTaCheckItemQu = (id, data) => request(`/api/taCheckItemQu/${id}`, { data, method: 'put' });
+export const putTaCheckItemQu = (id, data) => request(`/api/taCheckItemQu/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTaCheckItemQu = (id) => request(`/api/taCheckItemQu/${id}`, { method: 'delete' });
+export const deleteTaCheckItemQu = (id) => request(`/api/taCheckItemQu/${id}`, { method: 'delete' });
 
 /*
  * 分页查询
  */
-const getTdLocQuestion = (params) => request('/api/tdLocQuestion', { params });
+export const getTdLocQuestion = (params) => request('/api/tdLocQuestion', { params });
 
 /*
  * 新增数据
  */
-const postTdLocQuestion = (data) => request('/api/tdLocQuestion', { data, method: 'post' });
+export const postTdLocQuestion = (data) => request('/api/tdLocQuestion', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTdLocQuestionById = (id) => request(`/api/tdLocQuestion/${id}`);
+export const getTdLocQuestionById = (id) => request(`/api/tdLocQuestion/${id}`);
 
 /*
  * 更新数据
  */
-const putTdLocQuestion = (id, data) => request(`/api/tdLocQuestion/${id}`, { data, method: 'put' });
+export const putTdLocQuestion = (id, data) => request(`/api/tdLocQuestion/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTdLocQuestion = (id) => request(`/api/tdLocQuestion/${id}`, { method: 'delete' });
+export const deleteTdLocQuestion = (id) => request(`/api/tdLocQuestion/${id}`, { method: 'delete' });

src/service/tdloctype.js

@@ -3,24 +3,24 @@ import request from '@/utils/request';
 /*
  * 分页查询
  */
-const getTdLocType = (params) => request('/api/tdLocType', { params });
+export const getTdLocType = (params) => request('/api/tdLocType', { params });
 
 /*
  * 新增数据
  */
-const postTdLocType = (data) => request('/api/tdLocType', { data, method: 'post' });
+export const postTdLocType = (data) => request('/api/tdLocType', { data, method: 'post' });
 
 /*
  * 通过ID查询单条数据
  */
-const getTdLocTypeById = (id) => request(`/api/tdLocType/${id}`);
+export const getTdLocTypeById = (id) => request(`/api/tdLocType/${id}`);
 
 /*
  * 更新数据
  */
-const putTdLocType = (id, data) => request(`/api/tdLocType/${id}`, { data, method: 'put' });
+export const putTdLocType = (id, data) => request(`/api/tdLocType/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据
  */
-const deleteTdLocType = (id) => request(`/api/tdLocType/${id}`, { method: 'delete' });
+export const deleteTdLocType = (id) => request(`/api/tdLocType/${id}`, { method: 'delete' });

src/service/wxma.js

@@ -3,14 +3,14 @@ import request from '@/utils/request';
 /*
  * 授权手机
  */
-const putAuthPhone = (id, data) => request(`/api/ma/auth-phone`, { data, method: 'put' });
+export const putAuthPhone = (id, data) => request(`/api/ma/auth-phone`, { data, method: 'put' });
 
 /*
  * 授权头像
  */
-const putAuthUser = (id, data) => request(`/api/ma/auth-user`, { data, method: 'put' });
+export const putAuthUser = (id, data) => request(`/api/ma/auth-user`, { data, method: 'put' });
 
 /*
  * 小程序登录
  */
-const postLogin = (data) => request('/api/ma/login', { data, method: 'post' });
+export const postLogin = (data) => request('/api/ma/login', { data, method: 'post' });

src/store/models/user.js

@@ -2,8 +2,7 @@ import { useState, useRef } from "react";
 import { defaultRoutes, authRoutes, mergeAuthRoutes } from '@/routes/routes';
 import { getMenuItems } from "@/routes/menus";
 import { getAuthedRoutes } from "@/routes/permissions";
-
-const queryCurrentUser = () => Promise.resolve({ id: 1, name: '管理员', resourcesList: [{ code: 'form' }, { code: 'table' }] });
+import { currentUser } from '@/service/sysuser';
 
 export default function useUser() {
   const [user, setUser] = useState();
@@ -11,7 +10,7 @@ export default function useUser() {
   const routesRef = useRef();
 
   const getCurrentUser = () => new Promise((resolve, reject) => {
-    queryCurrentUser().then(res => {
+    currentUser().then(res => {
       const permissions = (res.resourcesList || []).map(x => x.code);
 
       // authRoutes 是所有待验证授权的路由
@@ -21,7 +20,7 @@ export default function useUser() {
       menusRef.current = getMenuItems(authedRoutes);
       routesRef.current = mergeAuthRoutes(defaultRoutes, authedRoutes);
 
-      setUser(res);
+      setUser(res.user);
       resolve(res);
     }).catch(reject);
   });

src/utils/request.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { message } from 'antd';
 
 const instance = axios.create({
-  baseURL: import.meta.env.VITE_SERVER_BASE,
+  baseURL: import.meta.env.VITE_SERVER_BASE || '',
   timeout: 10000,
   withCredentials: true, // 跨域
 });
@@ -74,6 +74,7 @@ instance.interceptors.response.use(function (response) {
 
   console.error(error);
 
+  message.error('网络超时或异常...')
   return Promise.reject("网络异常, 请重试...");
 });
 

vite.config.js

@@ -5,7 +5,13 @@ import react from '@vitejs/plugin-react'
 // https://vitejs.dev/config/
 export default defineConfig({
   server: {
-    port: 3000
+    port: 3000,
+    proxy: {
+      '/api': {
+        target: 'http://192.168.89.147:9087',
+        changeOrigin: true,
+      },
+    }
   },
   plugins: [
     react(),