fixed(api, auth): 调整api的使用，调整auth对token client_id等的使用方法

Author: dodolalorc

src/api/browser-events.ts

@@ -1,8 +1,8 @@
+import { clearAuth } from '@/utils/auth'
+
 export default {
   onBeforeUnmount() {
-    localStorage.removeItem('token')
-    localStorage.removeItem('client_id')
-    localStorage.removeItem('role')
+    clearAuth()
     console.log('Token and role have been removed from localStorage')
   },
 }

src/api/http-client/index.ts

@@ -1,4 +1,5 @@
 import axios from 'axios'
+import { getAuthToken, getClientIdFromStorage } from '@/utils/auth'
 
 // 创建一个 axios 实例
 const instance = axios.create({
@@ -8,14 +9,12 @@ const instance = axios.create({
 // 请求拦截器：在请求发送之前附加 Authorization 头
 instance.interceptors.request.use(
   (config) => {
-    // 直接从localStorage获取client_id
-    const clientId = localStorage.getItem('client_id')
-    const token = localStorage.getItem('token')
+    const clientId = getClientIdFromStorage()
+    const token = getAuthToken()
 
     if (token) {
       config.headers['Authorization'] = `Bearer ${token}`
       config.headers['Content-Type'] = 'application/json'
-      // 如果存在client_id，则使用它
       if (clientId) {
         config.headers['clientid'] = clientId
       }

src/api/request.ts

@@ -1,14 +1,21 @@
 import axios from 'axios'
-import { authConfig } from '@/config/request.config'
-const authToken = localStorage.getItem(authConfig.tokenKey)
-const clientId = localStorage.getItem(authConfig.clientIdKey)
+import { requestConfig } from '@/config/request.config'
+import { getAuthHeaders } from '@/utils/auth'
+
 const request = axios.create({
-  baseURL: 'http://59.110.62.188:8080/',
+  baseURL: requestConfig.baseURL,
   timeout: 60000,
-  headers: {
-    Authorization: `Bearer ${authToken}`,
-    clientId: `${clientId}`,
-  },
+})
+
+request.interceptors.request.use((config) => {
+  const authHeaders = getAuthHeaders()
+  config.headers = config.headers || {}
+
+  Object.entries(authHeaders).forEach(([key, value]) => {
+    ; (config.headers as Record<string, string>)[key] = value
+  })
+
+  return config
 })
 
 export default request

src/api/student-files.api.ts

@@ -0,0 +1,35 @@
+import request from '@/api/request'
+
+export interface StudentListParams {
+  pageNum: number
+  pageSize: number
+  [key: string]: any
+}
+
+export interface StudentDetailData {
+  fundUserInfoVo: Record<string, any>
+  fundProjectVo: any[]
+  fundScholarshipVo: any[]
+  fundPunishVo: any[]
+}
+
+export const studentFilesApi = {
+  getStudentList: (params: StudentListParams) => request.get('/grow/userInfo/listAll', { params }),
+
+  getStudentDetail: (userId: string) => request.get('/grow/userInfo/detail', { params: { userId } }),
+
+  exportStudentInfo: (userId: string) =>
+    request.get('/grow/userOwnInfo/exportAll', {
+      params: { userId },
+      responseType: 'blob',
+    }),
+
+  exportSelectedStudentInfo: (userIds: string[]) =>
+    request.post(
+      '/grow/userOwnInfo/exportOne',
+      { userId: userIds },
+      {
+        responseType: 'blob',
+      },
+    ),
+}

src/api/user.api.ts

@@ -133,6 +133,11 @@ export interface AddProjectPayload {
   experience: string
 }
 
+export interface UpdatePasswordPayload {
+  oldPassword: string
+  newPassword: string
+}
+
 // 用户相关API
 export const userApi = {
   // 检查登录状态
@@ -158,6 +163,9 @@ export const userApi = {
   addSocialExperience: (data: AddProjectPayload): Promise<ApiResponse<void>> =>
     post('/grow/project/addProject', data),
 
+  updatePassword: (data: UpdatePasswordPayload): Promise<ApiResponse<void>> =>
+    put('/system/user/profile/updatePwd', data),
+
   uploadAvatar: (file: File): Promise<ApiResponse<{ imgUrl: string }>> => {
     const formData = new FormData()
     formData.append('avatarfile', file)

src/components/logout-action/index.vue

@@ -42,6 +42,7 @@ import { WarningFilled } from '@element-plus/icons-vue'
 import { useRouter } from 'vue-router'
 import { userApi } from '@/api/user.api'
 import { useUserStore } from '@/stores/user-store'
+import { clearClientId } from '@/utils/auth'
 
 withDefaults(
   defineProps<{
@@ -83,7 +84,7 @@ const handleLogout = async () => {
       ElMessage.success('退出成功！')
       outerVisible.value = false
       userStore.logout()
-      localStorage.removeItem('client_id')
+      clearClientId()
       setTimeout(() => {
         router.push('/')
       }, 120)

src/components/nav-bar/index.vue

@@ -63,7 +63,7 @@ import LogoutAction from '@/components/logout-action/index.vue'
 import { useUserStore } from '@/stores/user-store'
 import Coins from '@/components/coins/index.vue'
 import { CoinType } from '@/types/goods-info'
-import { authConfig } from '@/config/request.config'
+import { getAuthToken } from '@/utils/auth'
 
 const router = useRouter()
 const route = useRoute()
@@ -161,7 +161,7 @@ const navigateTo = (path: string) => {
 }
 
 onMounted(async () => {
-  if (!localStorage.getItem(authConfig.tokenKey)) {
+  if (!getAuthToken()) {
     return
   }
 

src/config/request.config.ts

@@ -9,6 +9,8 @@ export interface RequestConfig {
 export interface AuthConfig {
   tokenKey: string
   clientIdKey: string
+  roleKey: string
+  roleGroupKey: string
   clientId: string
 }
 
@@ -23,5 +25,7 @@ export const requestConfig: RequestConfig = {
 export const authConfig: AuthConfig = {
   tokenKey: 'auth_token',
   clientIdKey: 'client_id',
+  roleKey: 'role',
+  roleGroupKey: 'roleGroup',
   clientId: getClientId(),
 }

src/core/request.core.ts

@@ -4,7 +4,7 @@ import axios, {
   type AxiosResponse,
   type InternalAxiosRequestConfig,
 } from 'axios'
-import { authConfig } from '@/config/request.config'
+import { clearAuth, getAuthToken, getClientIdFromStorage } from '@/utils/auth'
 import type { ApiResponse, RequestOptions, ErrorResponse } from '@/types/request.types'
 
 export class RequestCore {
@@ -17,18 +17,6 @@ export class RequestCore {
     this.setupInterceptors()
   }
 
-  /**
-   * 获取认证令牌
-   */
-  private getAuthToken(): string | null {
-    try {
-      return localStorage.getItem(authConfig.tokenKey)
-    } catch (error) {
-      console.warn('Failed to get auth token from localStorage:', error)
-      return null
-    }
-  }
-
   /**
    * 设置请求拦截器
    */
@@ -37,13 +25,16 @@ export class RequestCore {
     this.requestInterceptor = this.instance.interceptors.request.use(
       (config: InternalAxiosRequestConfig) => {
         // 获取认证令牌
-        const token = this.getAuthToken()
+        const token = getAuthToken()
+        const clientId = getClientIdFromStorage()
 
         // 添加认证头
         if (token) {
           config.headers = config.headers || {}
           config.headers.Authorization = `Bearer ${token}`
-          config.headers.clientId = authConfig.clientId
+          if (clientId) {
+            config.headers.clientid = clientId
+          }
         }
 
         // 这里可以添加其他全局请求处理逻辑
@@ -116,8 +107,7 @@ export class RequestCore {
    * 处理认证失败
    */
   private handleUnauthorized(): void {
-    // 清除本地认证信息
-    localStorage.removeItem(authConfig.tokenKey)
+    clearAuth()
 
     // 这里可以添加跳转到登录页的逻辑
     console.warn('Authentication failed, redirecting to login...')

src/mixins/clear-local-storage.ts

@@ -1,8 +1,8 @@
+import { clearAuth } from '@/utils/auth'
+
 export default {
   onBeforeUnmount() {
-    localStorage.removeItem('token')
-    localStorage.removeItem('client_id')
-    localStorage.removeItem('role')
+    clearAuth()
     console.log('Token and role have been removed from localStorage')
   },
 }