From 35979043dee0e0a29c67646c9d8b6a62228983dc Mon Sep 17 00:00:00 2001 From: yhli Date: Wed, 27 Jul 2022 22:33:07 +0800 Subject: [PATCH 01/27] update login --- src/api/login/index.ts | 19 ++++--------- src/api/menu/index.ts | 17 ++--------- src/api/user/index.ts | 14 +++++++++ src/stores/userInfo.ts | 1 + src/utils/request.ts | 34 +++++++++++----------- src/views/login/component/account.vue | 41 ++++++++++++++++++--------- vite.config.ts | 6 ++-- 7 files changed, 73 insertions(+), 59 deletions(-) create mode 100644 src/api/user/index.ts diff --git a/src/api/login/index.ts b/src/api/login/index.ts index a3bade1..e3489fb 100644 --- a/src/api/login/index.ts +++ b/src/api/login/index.ts @@ -1,25 +1,18 @@ import request from '/@/utils/request'; +const commonUrl = '/api/v1/Account'; /** * 登录api接口集合 * @method signIn 用户登录 - * @method signOut 用户退出登录 + * @method getCodeImg 获取验证码 */ export function useLoginApi() { return { signIn: (params: object) => { - return request({ - url: '/user/signIn', - method: 'post', - data: params, - }); - }, - signOut: (params: object) => { - return request({ - url: '/user/signOut', - method: 'post', - data: params, - }); + return request.post(commonUrl + "/login", params); }, + getCodeImg: () => { + return request.get(commonUrl + "/getCapchaCode"); + } }; } diff --git a/src/api/menu/index.ts b/src/api/menu/index.ts index 9c16bb7..9faace3 100644 --- a/src/api/menu/index.ts +++ b/src/api/menu/index.ts @@ -1,5 +1,5 @@ import request from '/@/utils/request'; - +const commonUrl = '/api/v1/Menu'; /** * 后端控制菜单模拟json，路径在 https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu * 后端控制路由，isRequestRoutes 为 true，则开启后端控制路由 @@ -8,19 +8,8 @@ import request from '/@/utils/request'; */ export function useMenuApi() { return { - getMenuAdmin: (params?: object) => { - return request({ - url: '/gitee/lyt-top/vue-next-admin-images/raw/master/menu/adminMenu.json', - method: 'get', - params, - }); - }, - getMenuTest: (params?: object) => { - return request({ - url: '/gitee/lyt-top/vue-next-admin-images/raw/master/menu/testMenu.json', - method: 'get', - params, - }); + listMenus: () => { + return request.get(commonUrl + "/list") }, }; } diff --git a/src/api/user/index.ts b/src/api/user/index.ts new file mode 100644 index 0000000..1370d61 --- /dev/null +++ b/src/api/user/index.ts @@ -0,0 +1,14 @@ +import request from '/@/utils/request'; +const commonUrl = '/api/v1/User'; +/** + * 用户api接口集合 + * @method signIn 用户登录 + * @method signOut 用户退出登录 + */ +export function useUserApi() { + return { + getUserById: (id: string) => { + return request.get(commonUrl + "/get/" + id) + }, + }; +} diff --git a/src/stores/userInfo.ts b/src/stores/userInfo.ts index 6ae3b6c..a0d3570 100644 --- a/src/stores/userInfo.ts +++ b/src/stores/userInfo.ts @@ -34,6 +34,7 @@ export const useUserInfo = defineStore('userInfo', { setTimeout(() => { // 模拟数据，请求接口时，记得删除多余代码及对应依赖的引入 const userName = Cookies.get('userName'); + const userId = Cookies.get('userId'); // 模拟数据 let defaultRoles: Array = []; let defaultAuthBtnList: Array = []; diff --git a/src/utils/request.ts b/src/utils/request.ts index c1cb090..83571b7 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -26,22 +26,23 @@ service.interceptors.request.use( // 添加响应拦截器 service.interceptors.response.use( - (response) => { + response => { // 对响应数据做点什么 const res = response.data; - if (res.code && res.code !== 0) { - // `token` 过期或者账号已在别处登录 - if (res.code === 401 || res.code === 4001) { - Session.clear(); // 清除浏览器全部临时缓存 - window.location.href = '/'; // 去登录页 - ElMessageBox.alert('你已被登出，请重新登录', '提示', {}) - .then(() => {}) - .catch(() => {}); - } - return Promise.reject(service.interceptors.response); - } else { - return response.data; - } + return res + // if (res.code && res.code !== 0) { + // // `token` 过期或者账号已在别处登录 + // if (res.code === 401 || res.code === 4001) { + // Session.clear(); // 清除浏览器全部临时缓存 + // window.location.href = '/'; // 去登录页 + // ElMessageBox.alert('你已被登出，请重新登录', '提示', {}) + // .then(() => {}) + // .catch(() => {}); + // } + // return Promise.reject(service.interceptors.response); + // } else { + // return response.data; + // } }, (error) => { // 对响应错误做点什么 @@ -50,8 +51,9 @@ service.interceptors.response.use( } else if (error.message == 'Network Error') { ElMessage.error('网络连接错误'); } else { - if (error.response.data) ElMessage.error(error.response.statusText); - else ElMessage.error('接口路径找不到'); + // if (error.response.data) ElMessage.error(error.response.statusText); + // else ElMessage.error('接口路径找不到'); + ElMessage.warning(error.response.data.message) } return Promise.reject(error); } diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue index 277a7fe..5270d8c 100644 --- a/src/views/login/component/account.vue +++ b/src/views/login/component/account.vue @@ -44,7 +44,10 @@ - +
+ +
+