From c069b536369a905e1729b61da6dd539e7c00eebc Mon Sep 17 00:00:00 2001 From: Teo <2642673902@qq.com> Date: Tue, 29 Jul 2025 16:24:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ego=E6=9C=8D=E5=8A=A1token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 ++++-- src/api/login.ts | 15 +++++++++++++++ src/api/project/leave/index.ts | 6 +++--- src/store/modules/user.ts | 1 + src/utils/request-go.ts | 19 +++++++++++++++++++ src/utils/request.ts | 2 +- src/views/login.vue | 6 +++++- src/views/project/leave/index.vue | 12 ++++++------ vite.config.ts | 8 +++++++- 9 files changed, 61 insertions(+), 14 deletions(-) create mode 100644 src/utils/request-go.ts diff --git a/.env.development b/.env.development index 90ccd20..cafdc42 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,10 @@ VITE_APP_TITLE = 新能源项目管理平台 VITE_APP_ENV = 'development' # 开发环境 -# VITE_APP_BASE_API = 'http://192.168.110.119:8899' -VITE_APP_BASE_API = 'http://58.17.134.85:8899' +VITE_APP_BASE_API = 'http://192.168.110.119:8899' +# VITE_APP_BASE_API = 'http://58.17.134.85:8899' +# GO开发环境 +VITE_APP_BASE_API_GO = 'http://192.168.110.159:8919' # 无人机接口地址 diff --git a/src/api/login.ts b/src/api/login.ts index 854b387..6620fb1 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -2,6 +2,7 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; import { LoginData, LoginResult, TenantInfo, UserProject, VerifyCodeResult } from './types'; import { UserInfo } from '@/api/system/user/types'; +import requestGo from '@/utils/request-go'; // pc端固定客户端授权id const clientId = import.meta.env.VITE_APP_CLIENT_ID; @@ -119,3 +120,17 @@ export function getUserProject(): AxiosPromise { method: 'get' }); } + +//获取Go服务Token +export function getGoToken(): AxiosPromise { + return requestGo({ + url: '/zm/api/v1/system/login', + method: 'post', + data: { + status: 'yjdsj', + verifyCode: '1111', + username: 'admin', + password: 'zmkg@2023A' + } + }); +} diff --git a/src/api/project/leave/index.ts b/src/api/project/leave/index.ts index 50bdc04..39242b9 100644 --- a/src/api/project/leave/index.ts +++ b/src/api/project/leave/index.ts @@ -1,8 +1,8 @@ -import request from '@/utils/request'; +// import request from '@/utils/request'; import { AxiosPromise } from 'axios'; import { LeaveVO, LeaveForm, LeaveQuery } from '@/api/project/leave/types'; import { AuditReissueCardForm } from '../reissueCard/types'; - +import request from '@/utils/request-go'; /** * 查询施工人员请假申请列表 * @param query @@ -11,7 +11,7 @@ import { AuditReissueCardForm } from '../reissueCard/types'; export const listLeave = (query?: LeaveQuery): AxiosPromise => { return request({ - url: '/project/leave/list', + url: '/zm/api/v1/system/busAskforleave/list', method: 'get', params: query }); diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index e048c98..4198eae 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -115,6 +115,7 @@ export const useUserStore = defineStore('user', () => { roles.value = []; permissions.value = []; removeToken(); + $cache.local.remove('goToken'); // 清除Go服务Token缓存 // 清除项目缓存 $cache.local.remove('selectedProject'); $cache.local.remove('ProjectTeamList'); diff --git a/src/utils/request-go.ts b/src/utils/request-go.ts new file mode 100644 index 0000000..c367513 --- /dev/null +++ b/src/utils/request-go.ts @@ -0,0 +1,19 @@ +import $cache from '@/plugins/cache'; +// src/utils/request-go.ts +import request from '@/utils/request'; + +const BASE_GO_URL = import.meta.env.VITE_APP_BASE_API_GO; + +/** + * 包装 request 请求，统一使用 Go 服务地址作为 baseURL + * @param config 原始请求配置 + */ +export default function requestGo(config: any) { + return request({ + baseURL: BASE_GO_URL, + ...config, + headers: { + 'Authorization': `Bearer ${$cache.local.get('goToken') || ''}` + } + }); +} diff --git a/src/utils/request.ts b/src/utils/request.ts index a55cd93..e065dc2 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -45,7 +45,7 @@ service.interceptors.request.use( // 是否需要加密 const isEncrypt = config.headers?.isEncrypt === 'true'; - if (getToken() && !isToken) { + if (getToken() && !isToken && !config.headers?.Authorization) { config.headers['Authorization'] = 'Bearer ' + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改 } // get请求映射params参数 diff --git a/src/views/login.vue b/src/views/login.vue index 62927ea..32ddabf 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -79,7 +79,7 @@