From 0ae51d9345fa5b7464fd14d44db5fc84de0c2ac9 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 17 Mar 2026 15:15:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95token=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=9E=8D=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/vue/api.ts.j2 | 10 +++-- vue-vben-admin/apps/web-antd/.env.development | 2 +- vue-vben-admin/apps/web-antd/.env.production | 2 +- .../apps/web-antd/src/api/core/auth.ts | 16 ++++--- .../apps/web-antd/src/api/core/user.ts | 6 ++- .../apps/web-antd/src/api/request.ts | 1 + vue-vben-admin/apps/web-antd/src/api/user.ts | 9 ++-- .../apps/web-antd/src/api/user/user.ts | 43 ------------------- .../apps/web-antd/src/store/auth.ts | 7 ++- 9 files changed, 34 insertions(+), 62 deletions(-) delete mode 100644 vue-vben-admin/apps/web-antd/src/api/user/user.ts diff --git a/templates/vue/api.ts.j2 b/templates/vue/api.ts.j2 index 5799abb..0ebc805 100644 --- a/templates/vue/api.ts.j2 +++ b/templates/vue/api.ts.j2 @@ -5,6 +5,7 @@ import { requestClient } from '#/api/request'; import { useAppConfig } from '@vben/hooks'; +import { useAccessStore } from '@vben/stores'; export namespace {{entity}}Api { @@ -16,7 +17,7 @@ export namespace {{entity}}Api { */ export function page(params: any) { return requestClient.post(applicationConfig.javaURL+'/{{old_table}}/page', params, - { headers: {'Content-Type': 'application/json', Token: '917e9898-8a0a-4079-a16a-e456457e070c', version: '1.0.1', familyId: 0}}); + { headers: {'Content-Type': 'application/json', Token: useAccessStore().accessToken, version: '1.0.1'}}); } /** @@ -31,7 +32,7 @@ export namespace {{entity}}Api { */ export function add(data: any) { return requestClient.post(applicationConfig.javaURL+'/{{old_table}}/add', data, - { headers: {'Content-Type': 'application/json', Token: '917e9898-8a0a-4079-a16a-e456457e070c', version: '1.0.1', familyId: 0}}); + { headers: {'Content-Type': 'application/json', Token: useAccessStore().accessToken, version: '1.0.1'}}); } /** @@ -39,7 +40,7 @@ export namespace {{entity}}Api { */ export function save(data: any) { return requestClient.post(applicationConfig.javaURL+'/{{old_table}}/modify', data, - { headers: {'Content-Type': 'application/json', Token: '917e9898-8a0a-4079-a16a-e456457e070c', version: '1.0.1', familyId: 0}}); + { headers: {'Content-Type': 'application/json', Token: useAccessStore().accessToken, version: '1.0.1'}}); } /** @@ -53,7 +54,8 @@ export namespace {{entity}}Api { * 枚举列表 */ export function enumList(params: any) { - return requestClient.post(applicationConfig.javaURL+'/health-enums/optionList', params,{ headers: {'Content-Type': 'application/json', Token: '917e9898-8a0a-4079-a16a-e456457e070c', version: '1.0.1'}}); + return requestClient.post(applicationConfig.javaURL+'/health-enums/optionList', params, + { headers: {'Content-Type': 'application/json', Token: useAccessStore().accessToken, version: '1.0.1'}}); } } \ No newline at end of file diff --git a/vue-vben-admin/apps/web-antd/.env.development b/vue-vben-admin/apps/web-antd/.env.development index dfd03c1..aa22a53 100644 --- a/vue-vben-admin/apps/web-antd/.env.development +++ b/vue-vben-admin/apps/web-antd/.env.development @@ -6,7 +6,7 @@ VITE_BASE=/ # 接口地址 VITE_GLOB_API_URL=/api # VITE_GLOB_API_URL=http://localhost:8083/api/models -VITE_GLOB_JAVA_API_URL=http://192.168.1.87:8084/mg/models +VITE_GLOB_JAVA_API_URL=http://192.168.1.47:8084/mg/models # 是否开启 Nitro Mock服务，true 为开启，false 为关闭 VITE_NITRO_MOCK=true diff --git a/vue-vben-admin/apps/web-antd/.env.production b/vue-vben-admin/apps/web-antd/.env.production index 04feb7f..7144605 100644 --- a/vue-vben-admin/apps/web-antd/.env.production +++ b/vue-vben-admin/apps/web-antd/.env.production @@ -4,7 +4,7 @@ VITE_BASE=/ VITE_GLOB_API_URL=https://mock-napi.vben.pro/api # VITE_GLOB_API_URL=http://localhost:8083/api/models -VITE_GLOB_JAVA_API_URL=http://192.168.1.87:8084/mg/models +VITE_GLOB_JAVA_API_URL=http://192.168.1.47:8084/mg/models # 是否开启压缩，可以设置为 none, brotli, gzip VITE_COMPRESS=none diff --git a/vue-vben-admin/apps/web-antd/src/api/core/auth.ts b/vue-vben-admin/apps/web-antd/src/api/core/auth.ts index 71d9f99..1077651 100644 --- a/vue-vben-admin/apps/web-antd/src/api/core/auth.ts +++ b/vue-vben-admin/apps/web-antd/src/api/core/auth.ts @@ -1,4 +1,5 @@ import { baseRequestClient, requestClient } from '#/api/request'; +import { useAppConfig } from '@vben/hooks'; export namespace AuthApi { /** 登录接口参数 */ @@ -13,23 +14,26 @@ export namespace AuthApi { } export interface RefreshTokenResult { - data: string; - status: number; + result: string; + code: number; } } +const applicationConfig = useAppConfig(import.meta.env, import.meta.env.PROD); +console.log('=== 接口域名 ===', applicationConfig.javaURL) + /** * 登录 */ export async function loginApi(data: AuthApi.LoginParams) { - return requestClient.post('/auth/login', data); + return requestClient.post(applicationConfig.javaURL+'/auth/login', data); } /** * 刷新accessToken */ export async function refreshTokenApi() { - return baseRequestClient.post('/auth/refresh', { + return baseRequestClient.post(applicationConfig.javaURL+'/auth/refresh', { withCredentials: true, }); } @@ -38,7 +42,7 @@ export async function refreshTokenApi() { * 退出登录 */ export async function logoutApi() { - return baseRequestClient.post('/auth/logout', { + return baseRequestClient.post(applicationConfig.javaURL+'/auth/logout', { withCredentials: true, }); } @@ -47,5 +51,5 @@ export async function logoutApi() { * 获取用户权限码 */ export async function getAccessCodesApi() { - return requestClient.get('/auth/codes'); + return requestClient.get(applicationConfig.javaURL+'/auth/codes'); } diff --git a/vue-vben-admin/apps/web-antd/src/api/core/user.ts b/vue-vben-admin/apps/web-antd/src/api/core/user.ts index 7e28ea8..3887406 100644 --- a/vue-vben-admin/apps/web-antd/src/api/core/user.ts +++ b/vue-vben-admin/apps/web-antd/src/api/core/user.ts @@ -2,9 +2,13 @@ import type { UserInfo } from '@vben/types'; import { requestClient } from '#/api/request'; +import { useAppConfig } from '@vben/hooks'; + +const applicationConfig = useAppConfig(import.meta.env, import.meta.env.PROD); + /** * 获取用户信息 */ export async function getUserInfoApi() { - return requestClient.get('/user/info'); + return requestClient.get(applicationConfig.javaURL+'/auth/user/info'); } diff --git a/vue-vben-admin/apps/web-antd/src/api/request.ts b/vue-vben-admin/apps/web-antd/src/api/request.ts index 288dddd..a513ae1 100644 --- a/vue-vben-admin/apps/web-antd/src/api/request.ts +++ b/vue-vben-admin/apps/web-antd/src/api/request.ts @@ -7,6 +7,7 @@ import { useAppConfig } from '@vben/hooks'; import { preferences } from '@vben/preferences'; import { authenticateResponseInterceptor, + //todo 适配返回数据的适配器 defaultResponseInterceptor, errorMessageResponseInterceptor, RequestClient, diff --git a/vue-vben-admin/apps/web-antd/src/api/user.ts b/vue-vben-admin/apps/web-antd/src/api/user.ts index e60f328..b992bca 100644 --- a/vue-vben-admin/apps/web-antd/src/api/user.ts +++ b/vue-vben-admin/apps/web-antd/src/api/user.ts @@ -5,6 +5,7 @@ import { requestClient } from '#/api/request'; import { useAppConfig } from '@vben/hooks'; +import { useAccessStore } from '@vben/stores'; export namespace userApi { @@ -16,7 +17,7 @@ export namespace userApi { */ export function page(params: any) { return requestClient.post(applicationConfig.javaURL+'/health-user/page', params, - { headers: {'Content-Type': 'application/json', Token: 'ded93460-0cf5-45db-81ae-7608dbd3f51e', version: '1.0.1', familyId: 0}}); + { headers: {'Content-Type': 'application/json', Token: useAccessStore().accessToken, version: '1.0.1'}}); } /** @@ -31,7 +32,7 @@ export namespace userApi { */ export function add(data: any) { return requestClient.post(applicationConfig.javaURL+'/health-user/add', data, - { headers: {'Content-Type': 'application/json', Token: 'ded93460-0cf5-45db-81ae-7608dbd3f51e', version: '1.0.1', familyId: 0}}); + { headers: {'Content-Type': 'application/json', Token: 'ded93460-0cf5-45db-81ae-7608dbd3f51e', version: '1.0.1'}}); } /** @@ -39,7 +40,7 @@ export namespace userApi { */ export function save(data: any) { return requestClient.post(applicationConfig.javaURL+'/health-user/modify', data, - { headers: {'Content-Type': 'application/json', Token: 'ded93460-0cf5-45db-81ae-7608dbd3f51e', version: '1.0.1', familyId: 0}}); + { headers: {'Content-Type': 'application/json', Token: 'ded93460-0cf5-45db-81ae-7608dbd3f51e', version: '1.0.1'}}); } /** @@ -56,4 +57,4 @@ export namespace userApi { return requestClient.post(applicationConfig.javaURL+'/health-enums/optionList', params,{ headers: {'Content-Type': 'application/json', Token: 'ded93460-0cf5-45db-81ae-7608dbd3f51e', version: '1.0.1'}}); } -} \ No newline at end of file +} diff --git a/vue-vben-admin/apps/web-antd/src/api/user/user.ts b/vue-vben-admin/apps/web-antd/src/api/user/user.ts deleted file mode 100644 index ae39635..0000000 --- a/vue-vben-admin/apps/web-antd/src/api/user/user.ts +++ /dev/null @@ -1,43 +0,0 @@ -/** - * 自动生成 API - * 负责调用后端接口 - */ - -import { requestClient } from '#/api/request'; -import { useAppConfig } from '@vben/hooks'; - -export namespace userApi { - - const applicationConfig = useAppConfig(import.meta.env, import.meta.env.PROD); - - console.log('=== 接口域名 ===', applicationConfig.javaURL + '/health-user/page') - /** - * 分页查询 - */ - export function page(params: any) { - return requestClient.post(applicationConfig.javaURL + '/health-user/page', params , - { headers: {'Content-Type': 'application/json', Token: 'ded93460-0cf5-45db-81ae-7608dbd3f51e', version: '1.0.1'} }); - } - - /** - * 获取详情 - */ - export function get(id: number) { - return requestClient.get(applicationConfig.javaURL + '/health_user/' + id); - } - - /** - * 新增 / 修改 - */ - export function save(data: any) { - return requestClient.post(applicationConfig.javaURL + '/health_user', data); - } - - /** - * 删除 - */ - export function remove(id: number) { - return requestClient.delete(applicationConfig.javaURL + '/health_user/' + id); - } - -} diff --git a/vue-vben-admin/apps/web-antd/src/store/auth.ts b/vue-vben-admin/apps/web-antd/src/store/auth.ts index bd496d1..ac4b699 100644 --- a/vue-vben-admin/apps/web-antd/src/store/auth.ts +++ b/vue-vben-admin/apps/web-antd/src/store/auth.ts @@ -21,6 +21,7 @@ export const useAuthStore = defineStore('auth', () => { const loginLoading = ref(false); /** + * todo zmm 适配自定义框架 * 异步处理登录操作 * Asynchronously handle the login process * @param params 登录表单数据 @@ -35,7 +36,9 @@ export const useAuthStore = defineStore('auth', () => { loginLoading.value = true; const { accessToken } = await loginApi(params); - // 如果成功获取到 accessToken + console.log('[login]>>>1 :',accessToken) + + // 如果成功获取到 accessToken if (accessToken) { accessStore.setAccessToken(accessToken); @@ -44,7 +47,7 @@ export const useAuthStore = defineStore('auth', () => { fetchUserInfo(), getAccessCodesApi(), ]); - + console.log('[login]>>>2 :',fetchUserInfoResult) userInfo = fetchUserInfoResult; userStore.setUserInfo(userInfo);