From 01d86353033240ab19654812b2da8c0d152db531 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Fri, 10 May 2024 18:30:41 +0800
Subject: [PATCH] uu

---
 common/manageServer.js | 12 +++++++++++-
 common/request.js      |  7 ++++---
 common/upload.js       |  7 +++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/common/manageServer.js b/common/manageServer.js
index 8ee5e7e..792cbca 100644
--- a/common/manageServer.js
+++ b/common/manageServer.js
@@ -1,6 +1,15 @@
 import { goto } from "./untool";
 import { showToast, showLoading, hideLoading } from "./untool"
-import { setSessionXToken } from "@/session"
+import { setSessionXToken, getSessionXToken } from "@/session"
+
+const getCommonReqData = ()=> {
+	const xToken = getSessionXToken()
+	return {
+		header: {
+			"X-Token": xToken,
+		}
+	}
+}
 
 // 请求接口
 function dealRequest(def, url, param) {
@@ -83,6 +92,7 @@ function handleResponse({
 }
 
 export {
+	getCommonReqData,
 	dealRequest,
 	handleResponse
 }
\ No newline at end of file
diff --git a/common/request.js b/common/request.js
index 3518558..7fd6ea2 100644
--- a/common/request.js
+++ b/common/request.js
@@ -1,17 +1,18 @@
-import { dealRequest } from "./manageServer"
+import { dealRequest, getCommonReqData } from "./manageServer"
 import { showToast } from "./untool"
 import { host } from "./api"
 import { getSessionXToken } from "@/session"
 
 const coreRequestBase = (url, reqParams, options = {}, methodType = "POST") => {
-	const xToken = getSessionXToken()
+	
+	let comReqData = getCommonReqData()
 	
 	return new Promise((resolve, reject) => {
 		uni.request({
 			url: `${host}${url}`,
 			data: reqParams,
 			header: {
-				"X-Token": xToken,
+				...comReqData.header,
 				...options
 			},
 			method: methodType,
diff --git a/common/upload.js b/common/upload.js
index 791c6e6..776ec95 100644
--- a/common/upload.js
+++ b/common/upload.js
@@ -1,7 +1,6 @@
-import { handleResponse } from './manageServer.js'
+import { handleResponse, getCommonReqData } from './manageServer.js'
 import { apiUrls, host } from './api'  //接口配置
 import { showToast } from "./untool"
-import { getSessionXToken } from "@/session"
 
 
 const chooseFile = function (action = 'chooseImage', opt = {}) {
@@ -33,14 +32,14 @@ const chooseFile = function (action = 'chooseImage', opt = {}) {
 
 const doRequest =  function (file) {
   return new Promise((resolve, reject) => {
-	const xToken = getSessionXToken()
+	let comReqData = getCommonReqData()
     uni.uploadFile({
       url: `${host}${apiUrls.uploadFile}`,
 	  fileType: 'image', // TODO
       filePath: file,
       name: 'file',
 	  header: {
-		  "X-Token": xToken,
+		  ...comReqData.header,
 	  },
       formData: {
         // 'user': 'test'