From d04c3cd74e5ee2adf252f1d2dffd0dd10653ab76 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Sun, 15 Aug 2021 15:56:29 +0800
Subject: [PATCH] 调整App请求主机地址管理逻辑
---
bases/Fetcher.js | 96 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 17 deletions(-)
diff --git a/bases/Fetcher.js b/bases/Fetcher.js
index b683b42..d7e05c7 100644
--- a/bases/Fetcher.js
+++ b/bases/Fetcher.js
@@ -18,8 +18,12 @@
this._data = {
urlPrefix: options.urlPrefix || ['/api/common/', '/api/common/'],
};
- if (project.host.mock) {
- this._defaultConfig.url = Fetcher.host + project.host.assetsPath.replace('/assets', '/mocks');
+ if (project.host.mock === 'on') {
+ 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;
}
@@ -50,8 +54,12 @@
spellURL(devSuffix, serSuffix) {
let url = '';
// mock 模式
- if (project.host.mock) {
+ if (project.host.mock === 'on') {
url = this._data.urlPrefix[0].replace('api/', '') + devSuffix + '.json';
+ }
+ // 强制实际请求模式
+ else if (project.host.mock === 'real') {
+ url = this._data.urlPrefix[1] + (serSuffix || devSuffix);
}
// 正常模式
else {
@@ -99,7 +107,7 @@
* @return {Promise<any>}
*/
post(url, data, remap = [], options = null) {
- if (project.host.mock) {
+ if (project.host.mock === 'on') {
return this.get(url, data, remap = [], options);
}
const params = Qs.stringify(data);
@@ -124,12 +132,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
@@ -149,6 +167,24 @@
},
});
});
+ }
+
+ _saveCookies(cookies) {
+ const localCookies = JSON.parse(wx.getStorageSync('cookies') || '{}');
+ cookies.forEach(cookie => {
+ const mc = cookie.match(/([a-zA-Z0-9_\-]+)=(.*?);/);
+ localCookies[mc[1]] = mc[2];
+ });
+ wx.setStorageSync('cookies', JSON.stringify(localCookies));
+ }
+
+ _getCookies() {
+ const localCookies = JSON.parse(wx.getStorageSync('cookies') || '{}');
+ const cookiesArr = [];
+ Object.keys(localCookies).forEach(key => {
+ cookiesArr.push(key + '=' + localCookies[key]);
+ });
+ return cookiesArr.join('; ');
}
/**
@@ -247,7 +283,9 @@
} else {
msg += '解析通讯数据异常！';
}
- this.message('error', msg);
+ setTimeout(() => {
+ this.message('fail', msg);
+ }, 20);
}
/**
@@ -280,12 +318,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;
}
}
@@ -509,7 +553,7 @@
title: msg,
icon: 'none',
mask: true,
- duration: type === 'error' ? 5000 : 3000,
+ duration: type === 'fail' ? 3000 : 2000,
});
}
@@ -545,22 +589,40 @@
if (process.env.TARO_ENV === 'h5') {
// 开发
if (Fetcher.inDevMod) {
- return window.location.protocol + '//' + window.location.host;
+ // 网址访问
+ if (window.location.protocol.indexOf('http') >= 0) {
+ return window.location.protocol + '//' + window.location.host;
+ }
+ // 文件访问
+ else {
+ return project.host.hosts[project.host.devType];
+ }
}
// 生产
else {
- // 如果网址参数有指定服务器类型，匹配指定的服务器地址
+ // 如果网址参数有指定服务器
const sever = Tools.getUrlParam('sever');
- if (sever && typeof project.host.hosts[sever] !== 'undefined') {
- return project.host.hosts[sever];
+ if (sever) {
+ // 如果是完整网址，直接使用地址
+ if (sever.indexOf('http') >= 0) {
+ return sever;
+ }
+ // 如果有匹配服务器，使用指定的服务器地址
+ if (typeof project.host.hosts[sever] !== 'undefined') {
+ return project.host.hosts[sever];
+ }
+ // 否则使用本地
+ else {
+ return project.host.hosts.lc;
+ }
}
// 网页域名提取服务器地址
else if (window.location.protocol.indexOf('http') >= 0) {
return window.location.protocol + '//' + window.location.host;
}
- // 非 http 协议打开时，使用设置的服务器地址
- else if (project.host.server) {
- return project.host.hosts[project.host.severType];
+ // 既不指定server也不是域名访问，使用设置的服务器地址
+ else {
+ return project.host.hosts[project.host.serverType];
}
}
}
@@ -572,7 +634,7 @@
}
// 生产
else {
- return project.host.hosts[project.host.severType];
+ return project.host.hosts[project.host.serverType];
}
}
})();
--
Gitblit v1.9.1