From fc39d84942dfa796f0f48c110aa5f069098b9069 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Fri, 7 Apr 2023 16:56:37 +0800
Subject: [PATCH] =?UTF-8?q?ref:=20=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=B4=E5=83=8F=E4=B8=8A=E4=BC=A0=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=20api=20prefix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login/index.ts          | 20 +++++++++++---------
 src/components/Upload/Image.vue |  3 ++-
 src/utils/request.ts            |  8 ++++----
 src/views/home/current-user.vue |  5 ++++-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/api/login/index.ts b/src/api/login/index.ts
index a5bf789a..091ab499 100644
--- a/src/api/login/index.ts
+++ b/src/api/login/index.ts
@@ -3,6 +3,12 @@ import { Session } from '/@/utils/storage';
 import { validateNull } from '/@/utils/validate';
 import { useUserInfo } from '/@/stores/userInfo';
 
+/**
+ * https://www.ietf.org/rfc/rfc6749.txt
+ * OAuth 协议 4.3.1 要求格式为 form 而不是 JSON 注意！
+ */
+const FORM_CONTENT_TYPE = 'application/x-www-form-urlencoded';
+
 /**
  * 登录
  * @param data
@@ -18,9 +24,8 @@ export const login = (data: any) => {
 		data: { password: password },
 		headers: {
 			skipToken: true,
-			'TENANT-ID': '1',
 			Authorization: basicAuth,
-			'Content-Type': 'application/x-www-form-urlencoded',
+			'Content-Type': FORM_CONTENT_TYPE,
 		},
 	});
 };
@@ -35,9 +40,8 @@ export const loginByMobile = (mobile: any, code: any) => {
 		url: '/auth/oauth2/token',
 		headers: {
 			skipToken: true,
-			'TENANT-ID': '1',
 			Authorization: basicAuth,
-			'Content-Type': 'application/x-www-form-urlencoded',
+			'Content-Type': FORM_CONTENT_TYPE,
 		},
 		method: 'post',
 		params: { mobile: 'SMS@' + mobile, code: code, grant_type, scope },
@@ -54,9 +58,8 @@ export const loginBySocial = (state: string, code: string) => {
 		url: '/auth/oauth2/token',
 		headers: {
 			skipToken: true,
-			'TENANT-ID': '1',
 			Authorization: basicAuth,
-			'Content-Type': 'application/x-www-form-urlencoded',
+			'Content-Type': FORM_CONTENT_TYPE,
 		},
 		method: 'post',
 		params: { mobile: state + '@' + code, code: code, grant_type, scope },
@@ -80,9 +83,8 @@ export const refreshTokenApi = (refresh_token: string) => {
 		url: '/auth/oauth2/token',
 		headers: {
 			skipToken: true,
-			'TENANT-ID': '1',
 			Authorization: basicAuth,
-			'Content-Type': 'application/x-www-form-urlencoded',
+			'Content-Type': FORM_CONTENT_TYPE,
 		},
 		method: 'post',
 		params: { refresh_token, grant_type, scope },
@@ -100,7 +102,7 @@ export const checkToken = (refreshTime: number, refreshLock: boolean) => {
 		headers: {
 			skipToken: true,
 			Authorization: basicAuth,
-			'Content-Type': 'application/x-www-form-urlencoded',
+			'Content-Type': FORM_CONTENT_TYPE,
 		},
 		method: 'get',
 		params: { token: Session.getToken() },
diff --git a/src/components/Upload/Image.vue b/src/components/Upload/Image.vue
index 6e712795..b2ffbf81 100644
--- a/src/components/Upload/Image.vue
+++ b/src/components/Upload/Image.vue
@@ -15,7 +15,8 @@
 			:accept="fileType.join(',')"
 		>
 			<template v-if="imageUrl">
-				<img :src="imageUrl.indexOf('http') > 0 ? baseURL + imageUrl : imageUrl" class="upload-image" />
+				<!-- 如果返回的是OSS 地址则不需要增加 baseURL -->
+				<img :src="imageUrl.includes('http') ? imageUrl : baseURL + imageUrl" class="upload-image" />
 				<div class="upload-handle" @click.stop>
 					<div class="handle-icon" @click="editImg" v-if="!self_disabled">
 						<el-icon><Edit /></el-icon>
diff --git a/src/utils/request.ts b/src/utils/request.ts
index b45042b4..803fece1 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -29,15 +29,15 @@ service.interceptors.request.use(
 			};
 		}
 
-		// 统一增加Authorization请求头
+		// 统一增加Authorization请求头, skipToken 跳过增加token
 		const token = Session.getToken();
-		if (token && !config.headers?.isToken) {
+		if (token && !config.headers?.skipToken) {
 			config.headers!['Authorization'] = `Bearer ${token}`;
 		}
 
 		// 统一增加TENANT-ID请求头
-		const tenantId = Session.getTenant()
-		if (tenantId && !config.headers?.skipTenant) {
+		const tenantId = Session.getTenant();
+		if (tenantId) {
 			config.headers!['TENANT-ID'] = tenantId;
 		}
 
diff --git a/src/views/home/current-user.vue b/src/views/home/current-user.vue
index 7f1faf30..6a260662 100644
--- a/src/views/home/current-user.vue
+++ b/src/views/home/current-user.vue
@@ -2,7 +2,7 @@
 	<el-card style="height: 100%">
 		<div style="display: flex; justify-content: space-between">
 			<div style="display: flex">
-				<el-avatar style="width: 60px; height: 60px" shape="circle" :size="100" fit="cover" :src="baseURL + userData.avatar" />
+				<el-avatar style="width: 60px; height: 60px" shape="circle" :size="100" fit="cover" :src="userData.avatar" />
 				<div class="info">
 					<span style="font-weight: 600; margin: 2px; font-size: 18px">{{ userData.name }}</span>
 					<span style="color: #6d737b; margin: 2px">{{ userData.deptName }} | {{ userData.postName }}</span>
@@ -19,6 +19,7 @@
 import { useUserInfo } from '/@/stores/userInfo';
 import { getObj } from '/@/api/admin/user';
 
+const { proxy } = getCurrentInstance();
 const date = ref(new Date());
 
 const userData = ref({
@@ -52,6 +53,8 @@ const initUserInfo = async (userId: any): Promise<void> => {
 		const res = await getObj(userId); // 执行查询操作
 		userData.value = res.data; // 将查询到的数据保存到 userData 变量中
 		userData.value.postName = res.data?.postList?.map((item: any) => item.postName).join(',') || ''; // 将 postList 中的 postName 合并成字符串并保存到 userData 变量中
+		// 文件上传增加后端前缀
+		userData.value.avatar = proxy.baseURL + res.data.avatar;
 	} finally {
 		loading.value = false; // 结束加载状态
 	}