token刷新修复

common/http.js

@@ -54,19 +54,23 @@ export default {
 			// console.log('getTokenString ',options.url )
 			options.header.Authorization = await (this.getTokenString());
 		}
-		// #endif
-		options.url = this.config.baseUrl + options.url;
-		// console.log('options.url ', options.url)
-		return new Promise((resolve, reject) => {
-			options.success = (e) => {
-				// console.log(e, 'successsuccesssuccesssuccesssuccess')
+		// #endif
+		options.original_url = options.url;
+		options.url = this.config.baseUrl + options.url;
+		
+		console.log('options.url ', options.url)
+		return new  Promise(  (resolve, reject) =>  {
+			options.success = async (e) => {
+				console.log(e, 'successsuccesssuccesssuccesssuccess')
 				let res = e.data;
 				if (e.statusCode === 200) {
 					if (res.code == 500201) {
 						// 未登录
-						clearToken();
-						getToken();
-						if (filterNoToken.indexOf(options.url) === -1) {
+						clearToken();
+						console.log('111111111');
+					 	await getToken();
+						if (filterNoToken.indexOf(options.original_url) === -1) {
+							console.log('222222222',options);
 							return this.request(options);
 						}
 					} else {

common/token.js

@@ -4,13 +4,14 @@ let token = null;
 let requestLoginTime = 0;
 
 // 获取token
-export const getToken = async () => {
-	if (getToken.promise) return getToken.promise;
+export const getToken = async () => {
+	// console.log("token-000000000000000000",getToken.promise);
 	if (!token) token = uni.getStorageSync('token');
 	// token格式化
 	if (token && typeof token === "string") {
 		token = JSON.parse(token);
-	}
+	}
+	// console.log("token-1111111111111",token);
 	console.log("checkToken", checkToken(token));
 	if (!token) {
 		getToken.promise = login();
@@ -84,11 +85,14 @@ const checkToken = t => {
 
 // 设置token
 const setToken = async t => {
-	// console.log('bbbbbbbbbbbbbbbbbbbbbbb', t);
-	token = formatToken(t);
-	// console.log('tttttttttt', token);
-	uni.setStorageSync("token", token);
-	return t.token;
+	try{
+		token = formatToken(t);
+		uni.setStorageSync("token", token);
+		return t.token;
+	}catch(e){
+		console.log('token-set--errr',e);
+	}
+	
 };
 
 // 清除token  
@@ -101,6 +105,6 @@ export const clearToken = async () => {
 // 处理token的格式
 const formatToken = t => {
 	t.token = "Bearer " + t.accessToken;
-	t.time = ((t.expiration - 600) * 1000);
+	t.time = ((t.expiration - 300) * 1000);
 	return t;
 };