diff --git a/src/api/login.ts b/src/api/login.ts deleted file mode 100644 index de2bfbd8..00000000 --- a/src/api/login.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { Captcha, LoginFormData, LoginResponseData } from '@/types/api/login'; -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; - -/** - * 登录 - * @param data - */ -export function login(data: LoginFormData): AxiosPromise { - return request({ - url: '/youlai-auth/oauth/token', - method: 'post', - params: data, - headers: { - Authorization: 'Basic bWFsbC1hZG1pbi13ZWI6MTIzNDU2' // 客户端信息Base64明文：mall-admin-web:123456 - } - }); -} - -/** - * 注销 - */ -export function logout() { - return request({ - url: '/youlai-auth/oauth/logout', - method: 'delete' - }); -} - -/** - * 获取图片验证码 - */ -export function getCaptcha(): AxiosPromise { - return request({ - url: '/captcha?t=' + new Date().getTime().toString(), - method: 'get' - }); -} diff --git a/src/api/user.ts b/src/api/user.ts index a283a0dd..adb5d78e 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -4,9 +4,34 @@ import { UserFormData, UserInfo, UserPageResult, - UserQueryParam + UserQueryParam, + LoginFormData } from '@/types/api/user'; +/** + * 登录 + */ +export function login(data: LoginFormData): AxiosPromise { + return request({ + url: '/youlai-auth/oauth2/token', + method: 'post', + params: data, + headers: { + Authorization: 'Basic dnVlMy1lbGVtZW50LWFkbWluOnNlY3JldA==' // 客户端信息Base64明文：vue3-element-admin:secret + } + }); +} + +/** + * 注销 + */ +export function logout() { + return request({ + url: '/youlai-auth/oauth/logout', + method: 'delete' + }); +} + /** * 登录成功后获取用户信息（昵称、头像、权限集合和角色集合） */ diff --git a/src/permission.ts b/src/permission.ts index 190523e7..cc783240 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -1,7 +1,6 @@ import router from '@/router'; import { ElMessage } from 'element-plus'; import useStore from '@/store'; -import { hasLogin } from '@/utils/auth'; import NProgress from 'nprogress'; import 'nprogress/nprogress.css'; NProgress.configure({ showSpinner: false }); // 进度环显示/隐藏 @@ -12,8 +11,8 @@ const whiteList = ['/login']; router.beforeEach(async (to, from, next) => { NProgress.start(); const { user, permission } = useStore(); - - if (hasLogin()) { + const hasToken = user.token; + if (hasToken) { // 登录成功，跳转到首页 if (to.path === '/login') { next({ path: '/' }); @@ -29,7 +28,7 @@ router.beforeEach(async (to, from, next) => { } else { try { await user.getUserInfo(); - const roles = user.roles; + const roles = user.roles || ['ROOT']; const accessRoutes: any = await permission.generateRoutes(roles); accessRoutes.forEach((route: any) => { router.addRoute(route); diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 10e014cd..f87e7685 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -1,10 +1,9 @@ import { defineStore } from 'pinia'; -import { LoginFormData } from '@/types/api/login'; +import { LoginFormData } from '@/types/api/user'; import { UserState } from '@/types/store/user'; import { localStorage } from '@/utils/storage'; -import { login, logout } from '@/api/login'; -import { getUserInfo } from '@/api/user'; +import { getUserInfo, login, logout } from '@/api/user'; import { resetRouter } from '@/router'; const useUserStore = defineStore({ @@ -21,19 +20,18 @@ const useUserStore = defineStore({ this.$reset(); }, /** - * 登录 + * 登录 login */ login(loginData: LoginFormData) { - const { username, password, code, uuid } = loginData; + const { username, password } = loginData; return new Promise((resolve, reject) => { login({ + grant_type: 'password', username: username.trim(), - password: password, - grant_type: 'captcha', - code: code, - uuid: uuid + password: password }) .then(response => { + console.log('response.data', response.data); const { access_token, token_type } = response.data; const accessToken = token_type + ' ' + access_token; localStorage.set('token', accessToken); diff --git a/src/types/api/login.d.ts b/src/types/api/login.d.ts deleted file mode 100644 index 75905c8a..00000000 --- a/src/types/api/login.d.ts +++ /dev/null @@ -1,26 +0,0 @@ -/** - * 登录表单类型声明 - */ -export interface LoginFormData { - username: string; - password: string; - grant_type: string; - code: string; - uuid: string; -} - -/** - * 登录响应类型声明 - */ -export interface LoginResponseData { - access_token: string; - token_type: string; -} - -/** - * 验证码类型声明 - */ -export interface Captcha { - img: string; - uuid: string; -} diff --git a/src/types/api/user.d.ts b/src/types/api/user.d.ts index fe8b9add..30e6ccbc 100644 --- a/src/types/api/user.d.ts +++ b/src/types/api/user.d.ts @@ -1,7 +1,24 @@ import { PageQueryParam, PageResult } from './base'; /** - * 登录用户类型声明 + * 登录表单 + */ +export interface LoginFormData { + username: string; + password: string; + grant_type: string; +} + +/** + * 登录响应 + */ +export interface LoginResponseData { + access_token: string; + token_type: string; +} + +/** + * 登录用户信息 */ export interface UserInfo { nickname: string; @@ -11,7 +28,7 @@ export interface UserInfo { } /** - * 用户查询参数类型声明 + * 用户查询参数 */ export interface UserQueryParam extends PageQueryParam { keywords: string; diff --git a/src/utils/auth.ts b/src/utils/auth.ts deleted file mode 100644 index 7b669dbe..00000000 --- a/src/utils/auth.ts +++ /dev/null @@ -1,13 +0,0 @@ -import Cookies from 'js-cookie'; - -const SESSION_ID_KEY = 'GATEWAY_SESSION_ID'; - -export const hasLogin = () => { - const sessionId = Cookies.get(SESSION_ID_KEY); - console.log('sessionId', sessionId); - if (sessionId) { - return true; - } else { - return false; - } -}; diff --git a/src/utils/request.ts b/src/utils/request.ts index e3d5259f..92be874b 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -33,19 +33,21 @@ service.interceptors.request.use( service.interceptors.response.use( (response: AxiosResponse) => { const { code, msg } = response.data; - if (code === '00000') { - return response.data; - } else { - // 响应数据为二进制流处理(Excel导出) - if (response.data instanceof ArrayBuffer) { - return response; + if (code) { + // 有状态码判断是否为00000,除此皆为异常响应 + if (code === '00000') { + return response.data; + } else { + ElMessage({ + message: response.data.msg || '系统出错', + type: 'error' + }); + return Promise.reject(new Error(msg || 'Error')); } - - ElMessage({ - message: msg || '系统出错', - type: 'error' - }); - return Promise.reject(new Error(msg || 'Error')); + } else { + // 无状态码响应直接返回 + console.log('response', response); + return response; } }, error => { @@ -53,7 +55,6 @@ service.interceptors.response.use( if (code === 'A0230') { // token 过期 localStorage.clear(); // 清除浏览器全部缓存 - //window.location.href = '/'; // 跳转登录页 ElMessageBox.alert('当前页面已失效，请重新登录', '提示', {}); } else { ElMessage({ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 6922ddad..af75d527 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -58,28 +58,6 @@ - - - - - - - -
- -
- - { passwordRef.value.focus(); @@ -190,7 +162,7 @@ function showPwd() { } /** - * login + * 登录处理 */ function handleLogin() { loginFormRef.value.validate((valid: boolean) => { @@ -204,9 +176,6 @@ function handleLogin() { }) .catch(() => { state.loading = false; - - // 生成验证码 - handleCaptchaGenerate(); }); } else { return false; @@ -214,17 +183,6 @@ function handleLogin() { }); } -/** - * 获取验证码 - */ -function handleCaptchaGenerate() { - getCaptcha().then(({ data }) => { - const { img, uuid } = data; - state.captchaBase64 = img; - state.loginForm.uuid = uuid; - }); -} - watch( route, () => { @@ -249,7 +207,6 @@ function getOtherQuery(query: any) { } onMounted(() => { - handleCaptchaGenerate(); window.onresize = () => { if (state.clientHeight > document.documentElement.clientHeight) { state.showCopyright = false; @@ -261,9 +218,6 @@ onMounted(() => {