From acbdfc4639721da71176894983d852a5fd696a04 Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: Mon, 24 Jul 2023 11:22:20 +0000
Subject: [PATCH] =?UTF-8?q?!31=20=E3=80=90=E8=BD=BB=E9=87=8F=E7=BA=A7=20PR?=
 =?UTF-8?q?=E3=80=91=E6=96=B0=E5=A2=9E=E5=85=A8=E5=B1=80=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=A4=B4=20clientid=20=E9=80=82=E9=85=8D=E5=90=8E=E7=AB=AF=20t?=
 =?UTF-8?q?oken=20=E6=A0=A1=E9=AA=8C=20Merge=20pull=20request=20!31=20from?=
 =?UTF-8?q?=20MichelleChung/ts?=
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 | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

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 ef7346b..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
-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 74f0d19..d2130fe 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -16,6 +16,7 @@ let downloadLoadingInstance: LoadingInstance;
 export const isRelogin = { show: false };
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
+axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID;
 // 创建 axios 实例
 const service = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API,