From 19a311effa16e6d2e3ca46bc4062a8d22634fed5 Mon Sep 17 00:00:00 2001 From: "Michelle.Chung" <1242874891@qq.com> Date: Mon, 24 Jul 2023 18:09:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E5=A2=9E=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E8=AF=B7=E6=B1=82=E5=A4=B4=20clientid=20=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E5=88=A4=E6=96=AD=20token=20=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=9C=89=E6=95=88=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.ts | 2 +- src/utils/request.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/api/login.ts b/src/api/login.ts index ef7346b..e062a3b 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -4,7 +4,7 @@ import { LoginData, LoginResult, VerifyCodeResult, TenantInfo } from './types'; import { UserInfo } from '@/api/system/user/types'; // pc端固定客户端授权id -const clientId = 'e5cd7e4891bf95d1d19206ce24a7b32e'; +export const clientId = 'e5cd7e4891bf95d1d19206ce24a7b32e'; /** * @param data {LoginData} diff --git a/src/utils/request.ts b/src/utils/request.ts index 74f0d19..d20193b 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -10,12 +10,14 @@ import FileSaver from 'file-saver'; import { getLanguage } from '@/lang'; import { encryptBase64, encryptWithAes, generateAesKey } from '@/utils/crypto'; import { encrypt } from '@/utils/jsencrypt'; +import { clientId } from '@/api/login'; let downloadLoadingInstance: LoadingInstance; // 是否显示重新登录 export const isRelogin = { show: false }; axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'; +axios.defaults.headers['clientid'] = clientId; // 创建 axios 实例 const service = axios.create({ baseURL: import.meta.env.VITE_APP_BASE_API, From 75a4f468e949c194622f187eff02320a3901f90e Mon Sep 17 00:00:00 2001 From: "Michelle.Chung" <1242874891@qq.com> Date: Mon, 24 Jul 2023 18:53:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=20clientid,=20=E7=BB=9F=E4=B8=80=E4=BB=8E=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=BC=95=E5=85=A5=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +++ .env.production | 3 +++ src/api/login.ts | 2 +- src/types/env.d.ts | 1 + src/utils/request.ts | 3 +-- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.env.development b/.env.development index ce7bb36..6d2f8dd 100644 --- a/.env.development +++ b/.env.development @@ -20,3 +20,6 @@ VITE_APP_PORT = 80 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换 VITE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==' + +# 客户端id +VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e' diff --git a/.env.production b/.env.production index 1fdd82d..d723d2a 100644 --- a/.env.production +++ b/.env.production @@ -23,3 +23,6 @@ VITE_APP_PORT = 80 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换 VITE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==' + +# 客户端id +VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e' diff --git a/src/api/login.ts b/src/api/login.ts index e062a3b..9efc86d 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -4,7 +4,7 @@ import { LoginData, LoginResult, VerifyCodeResult, TenantInfo } from './types'; import { UserInfo } from '@/api/system/user/types'; // pc端固定客户端授权id -export const clientId = 'e5cd7e4891bf95d1d19206ce24a7b32e'; +const clientId = import.meta.env.VITE_APP_CLIENT_ID; /** * @param data {LoginData} diff --git a/src/types/env.d.ts b/src/types/env.d.ts index 922fe4c..fabf641 100644 --- a/src/types/env.d.ts +++ b/src/types/env.d.ts @@ -68,6 +68,7 @@ interface ImportMetaEnv { VITE_APP_POWERJOB_ADMIN: string; VITE_APP_ENV: string; VITE_APP_RSA_PUBLIC_KEY: string; + VITE_APP_CLIENT_ID: string; } interface ImportMeta { readonly env: ImportMetaEnv; diff --git a/src/utils/request.ts b/src/utils/request.ts index d20193b..d2130fe 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -10,14 +10,13 @@ import FileSaver from 'file-saver'; import { getLanguage } from '@/lang'; import { encryptBase64, encryptWithAes, generateAesKey } from '@/utils/crypto'; import { encrypt } from '@/utils/jsencrypt'; -import { clientId } from '@/api/login'; let downloadLoadingInstance: LoadingInstance; // 是否显示重新登录 export const isRelogin = { show: false }; axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'; -axios.defaults.headers['clientid'] = clientId; +axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID; // 创建 axios 实例 const service = axios.create({ baseURL: import.meta.env.VITE_APP_BASE_API,