From 973c786fa51b657fa134b01c311f72386386c251 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 19 Aug 2021 10:48:19 +0800
Subject: [PATCH] 移动端请求打通App请求模式
---
bases/Fetcher.js | 133 +++++++++++++++++++++++++++++++++----------
1 files changed, 101 insertions(+), 32 deletions(-)
diff --git a/bases/Fetcher.js b/bases/Fetcher.js
index aae3313..7507469 100644
--- a/bases/Fetcher.js
+++ b/bases/Fetcher.js
@@ -19,7 +19,11 @@
urlPrefix: options.urlPrefix || ['/api/common/', '/api/common/'],
};
if (project.host.mock === 'on') {
- this._defaultConfig.url = Fetcher.host + project.host.assetsPath.replace('/assets', '/mocks');
+ if (project.host.assetsPath.indexOf('..') === 0) {
+ this._defaultConfig.url = Fetcher.host + '/' + project.host.assetsPath.replace('/assets', '/mocks');
+ } else {
+ this._defaultConfig.url = Fetcher.host + project.host.assetsPath.replace('/assets', '/mocks');
+ }
} else {
this._defaultConfig.url = Fetcher.host;
}
@@ -29,17 +33,35 @@
* 请求配置
* @private
*/
- _defaultConfig = {
- url: '',
- header: {
- 'X-Requested-With': 'XMLHttpRequest',
- 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
- 'Ax-Rq-Type': 'separation',
- },
- credentials: 'same-origin',
- dataType: 'json',
- timeout: 30 * 1000,
- };
+ _defaultConfig = (() => {
+ // 跨域模式，一般为 App 内嵌页面
+ if (project.host.cors) {
+ return {
+ url: '',
+ header: {
+ 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+ },
+ mode: 'cors',
+ credentials: 'include',
+ dataType: 'json',
+ timeout: 30 * 1000,
+ };
+ }
+ // 正常模式，小程序、普通H5
+ else {
+ return {
+ url: '',
+ header: {
+ 'X-Requested-With': 'XMLHttpRequest',
+ 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+ 'Ax-Rq-Type': 'separation',
+ },
+ credentials: 'same-origin',
+ dataType: 'json',
+ timeout: 30 * 1000,
+ };
+ }
+ })();
/**
* 拼写 URL 地址
@@ -128,12 +150,22 @@
*/
query(type, url, data = null, remap, options = {}) {
return new Promise((resolve, reject) => {
+ const header = {
+ ...this._defaultConfig.header,
+ };
+ if (process.env.TARO_ENV === 'weapp') {
+ header['Cookie'] = this._getCookies();
+ }
Taro.request({
...this._defaultConfig,
+ header,
url: this._defaultConfig.url + url,
method: type.toUpperCase(),
data,
success: response => {
+ if (process.env.TARO_ENV === 'weapp') {
+ this._saveCookies(response.cookies);
+ }
/**
* @type {{state: {code, http, msg}, data: Object}}
* @example response.state.code
@@ -153,6 +185,24 @@
},
});
});
+ }
+
+ _saveCookies(cookies) {
+ const localCookies = JSON.parse(Taro.getStorageSync('cookies') || '{}');
+ cookies.forEach(cookie => {
+ const mc = cookie.match(/([a-zA-Z0-9_\-]+)=(.*?);/);
+ localCookies[mc[1]] = mc[2];
+ });
+ Taro.setStorageSync('cookies', JSON.stringify(localCookies));
+ }
+
+ _getCookies() {
+ const localCookies = JSON.parse(Taro.getStorageSync('cookies') || '{}');
+ const cookiesArr = [];
+ Object.keys(localCookies).forEach(key => {
+ cookiesArr.push(key + '=' + localCookies[key]);
+ });
+ return cookiesArr.join('; ');
}
/**
@@ -251,7 +301,9 @@
} else {
msg += '解析通讯数据异常！';
}
- this.message('error', msg);
+ setTimeout(() => {
+ this.message('fail', msg);
+ }, 20);
}
/**
@@ -284,12 +336,18 @@
return response.data;
}
} else if (response.state.code === 2001) {
- this.message('info', response.state.msg);
+ setTimeout(() => {
+ this.message('info', response.state.msg);
+ }, 20);
return null;
} else if (response.state.code === 9001) {
- // this._showLoginExpired();
+ if (process.env.TARO_ENV === 'weapp') {
+ Taro.navigateTo({ url: '/pages/home/index/index?mode=login' });
+ }
} else {
- this.message('error', response.state.msg);
+ setTimeout(() => {
+ this.message('error', response.state.msg);
+ }, 20);
return null;
}
}
@@ -513,7 +571,7 @@
title: msg,
icon: 'none',
mask: true,
- duration: type === 'error' ? 5000 : 3000,
+ duration: type === 'fail' ? 3000 : 2000,
});
}
@@ -545,30 +603,41 @@
* @type {String}
*/
static host = (() => {
- // 网页
+ // 网页模式
if (process.env.TARO_ENV === 'h5') {
- // 开发
- if (Fetcher.inDevMod) {
+ // 如果网址参数有指定服务器
+ const server = Tools.getUrlParam('server');
+ if (server) {
+ // 如果是完整网址，直接使用地址
+ if (server.indexOf('http') >= 0) {
+ return server;
+ }
+ // 如果有匹配服务器，使用指定的服务器地址
+ if (typeof project.host.hosts[server] !== 'undefined') {
+ return project.host.hosts[server];
+ }
+ // 否则使用本地
+ else {
+ return project.host.hosts.lc;
+ }
+ }
+ // 网页域名提取服务器地址
+ else if (window.location.protocol.indexOf('http') >= 0) {
return window.location.protocol + '//' + window.location.host;
}
- // 生产
+ // 既不指定server也不是域名访问，使用设置的服务器地址
else {
- // 如果网址参数有指定服务器类型，匹配指定的服务器地址
- const sever = Tools.getUrlParam('sever');
- if (sever && typeof project.host.hosts[sever] !== 'undefined') {
- return project.host.hosts[sever];
+ // 开发
+ if (Fetcher.inDevMod) {
+ return project.host.hosts[project.host.devType];
}
- // 网页域名提取服务器地址
- else if (window.location.protocol.indexOf('http') >= 0) {
- return window.location.protocol + '//' + window.location.host;
- }
- // 非 http 协议打开时，使用设置的服务器地址
- else if (project.host.server) {
+ // 生产
+ else {
return project.host.hosts[project.host.serverType];
}
}
}
- // 小程序
+ // 小程序模式
else if (process.env.TARO_ENV === 'weapp') {
// 开发
if (Fetcher.inDevMod) {
--
Gitblit v1.9.1