Pārlūkot izejas kodu

feat: 登录联调

lanceJiang 1 gadu atpakaļ
vecāks
revīzija
7b2160126e
4 mainītis faili ar 15 papildinājumiem un 4 dzēšanām
  1. 7 0
      src/api/login/index.ts
  2. 1 1
      src/router/index.ts
  3. 5 1
      src/store/modules/user.ts
  4. 2 2
      src/utils/request.ts

+ 7 - 0
src/api/login/index.ts

@@ -32,3 +32,10 @@ export function getGeetConfig(): AxiosPromise {
 		method: 'get'
 	})
 }
+
+export function getMenuPermissions(): AxiosPromise {
+	return request({
+		url: `/sys/resource/list-menu-permissions`,
+		method: 'get'
+	})
+}

+ 1 - 1
src/router/index.ts

@@ -208,7 +208,7 @@ export const devAllRouters: Array<AppRouteRecordRaw> = [
 				name: 'adminManage',
 				component: 'demo/adminManage/index',
 				meta: { title: 'demo_adminManage' }
-			},
+			}
 		]
 	}
 

+ 5 - 1
src/store/modules/user.ts

@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { UserState } from '@/types'
 import { ls } from '@/utils'
-import { login, logout } from '@/api/login'
+import { login, logout, getMenuPermissions } from '@/api/login'
 import router, { resetRouter } from '@/router'
 // eslint-disable-next-line
 // @ts-ignore
@@ -51,7 +51,11 @@ const useUserStore = defineStore({
 		 *  获取用户信息(昵称、头像、角色集合、权限集合)
 		 */
 		getUserInfo() {
+			getMenuPermissions().then(res => {
+				console.error(res, 'res.......')
+			})
 			return new Promise(resolve => {
+				console.log('fetch 获取用户信息')
 				this.isLogin = true
 				resolve(true)
 			})

+ 2 - 2
src/utils/request.ts

@@ -38,8 +38,8 @@ axiosInstance.interceptors.request.use(
 		const token = ls.get('token')
 		// const { token } = useStore().user
 		// 让每个请求携带自定义token 请根据实际情况自行修改
-		if (!config.headers['Authorization'] && token) {
-			config.headers['Authorization'] = `Bearer ${token}`
+		if (!config.headers['accessToken'] && token) {
+			config.headers['accessToken'] = token
 		}
 		showFullPageLoadingHandler(config, () => {
 			// 目前只有两种语言 若有新增 请另外处理 todo...