From 33eaf431023208398d177bdc1ddd1fa6b88936d3 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 11 Mar 2021 14:53:38 +0800
Subject: [PATCH] 重新设计 app、小程序 主机地址设置与识别机制
---
bases/Pilot.js | 33 ++++++++++
common/Tools.js | 16 +++++
bases/Fetcher.js | 118 ++++++++++++++++++++-------------------
3 files changed, 107 insertions(+), 60 deletions(-)
diff --git a/bases/Fetcher.js b/bases/Fetcher.js
index 777ff95..f227744 100644
--- a/bases/Fetcher.js
+++ b/bases/Fetcher.js
@@ -18,18 +18,7 @@
this._data = {
urlPrefix: options.urlPrefix || ['/api/common/', '/api/common/'],
};
- // 网页
- if (process.env.TARO_ENV === 'h5') {
- this._defaultConfig.url = window.location.protocol + '//' + window.location.host;
- }
- // 小程序
- else if (process.env.TARO_ENV === 'weapp') {
- if (Fetcher.inDevMod) {
- this._defaultConfig.url = project.localHost;
- } else {
- this._defaultConfig.url = project.serverHost;
- }
- }
+ this._defaultConfig.url = Fetcher.host;
}
/**
@@ -436,17 +425,29 @@
if (!path) {
return '';
}
+ // 多项时，先拆分转换，再合并
if (path.indexOf(',') >= 0) {
return path.split(',').map(p => this.transImgPath(type, p)).join(',');
- } else {
+ }
+ // 单项时转换
+ else {
// 修复补齐
if (type === 'fix') {
- if (!path || /^(http|\/upload|\/static)/.test(path)) {
+ // 完整 URL，地址不变
+ if (/^http/.test(path)) {
return path;
- } else {
- return '/upload/' + path;
}
- } else if (type === 'cut') {
+ // 绝对路径
+ if (/^(\/upload|\/static)/.test(path)) {
+ return Fetcher.host + path;
+ }
+ // 部分路径
+ else {
+ return Fetcher.host + '/upload/' + path;
+ }
+ }
+ // 裁剪多余部分
+ else if (type === 'cut') {
const pathArr = path.split('upload/');
return pathArr[pathArr.length - 1];
}
@@ -499,52 +500,12 @@
}
/**
- * 转换图片路径（旧版运营平台）
- * @param {String} type - fix or cut
- * @param {String} path
- * @example
- * fix -> '/upload/4/5e6c91eeccedc.jpg'
- * cut -> '4/5e56307c489c7.jpg'
- */
- transImgPath(type, path) {
- if (!path) {
- return '';
- }
- if (path.indexOf(',') >= 0) {
- return path.split(',').map(p => this.transImgPath(type, p)).join(',');
- } else {
- // 修复补齐
- if (type === 'fix') {
- if (!path || /^(http|\/upload|\/static)/.test(path)) {
- return path;
- } else {
- return '/upload/' + path;
- }
- } else if (type === 'cut') {
- const pathArr = path.split('upload/');
- return pathArr[pathArr.length - 1];
- }
- }
- }
-
- /**
* 记录是否为本地开发模式
* @type {Boolean}
*/
static inDevMod = (() => {
// 网页
if (process.env.TARO_ENV === 'h5') {
- const reg = new RegExp('(^|&)query=([^&]*)(&|$)', 'i');
- const match = window.location.search.substr(1).match(reg);
- const param = match !== null ? decodeURIComponent(match[2]) : null;
- // 当处于 mock 请求模式，视为本地开发
- if (param === 'mock') {
- return true;
- }
- // 强制 real 请求，可在本地使用真实请求
- if (param === 'real') {
- return false;
- }
// 当没有 url 指定时，只有内网 ip 和 33**/35** 的端口号，视为本地开发模式
return /^(192|127|localhost).*?:3[35]\d{2}$/i.test(window.location.host);
}
@@ -561,4 +522,45 @@
}
})();
-}
\ No newline at end of file
+ /**
+ * 当前服务器主机地址
+ * @type {String}
+ */
+ static host = (() => {
+ // 网页
+ if (process.env.TARO_ENV === 'h5') {
+ // 开发
+ if (Fetcher.inDevMod) {
+ return window.location.protocol + '//' + window.location.host;
+ }
+ // 生产
+ else {
+ // 如果网址参数有指定服务器类型，匹配指定的服务器地址
+ const sever = Tools.getUrlParam('sever');
+ if (sever && typeof project.host.hosts[sever] !== 'undefined') {
+ return project.host.hosts[sever];
+ }
+ // 使用设置的默认服务器地址
+ else if (project.host.server) {
+ return project.host.server;
+ }
+ // 网页域名提取服务器地址
+ else {
+ return window.location.protocol + '//' + window.location.host;
+ }
+ }
+ }
+ // 小程序
+ else if (process.env.TARO_ENV === 'weapp') {
+ // 开发
+ if (Fetcher.inDevMod) {
+ return project.host.hosts[project.host.devType];
+ }
+ // 生产
+ else {
+ return project.host.server;
+ }
+ }
+ })();
+
+}
diff --git a/bases/Pilot.js b/bases/Pilot.js
index c92522b..17fb01e 100644
--- a/bases/Pilot.js
+++ b/bases/Pilot.js
@@ -3,6 +3,10 @@
* @author Tevin
*/
+import { Fetcher } from './Fetcher';
+import { Tools } from '@components/common/Tools';
+import project from '@project';
+
export class Pilot {
constructor() {
@@ -29,14 +33,18 @@
}
if (/^\$/.test(name)) {
if (name === '$data' && typeof dataAdd !== 'undefined') {
+ // 转换 dataAdd 中 assets 属性下的图片地址值
+ if (typeof dataAdd.assets !== 'undefined') {
+ dataAdd.assets = this._transDataAdd(dataAdd.assets);
+ }
// 当有传data值进来，初始值必须带data中的字段
const dataOrig = this.$data();
options.data = () => {
return {
...dataOrig,
...dataAdd,
- }
- }
+ };
+ };
} else {
options[name.replace('$', '')] = this[name];
}
@@ -47,4 +55,25 @@
return options;
}
+ _transDataAdd(assets = {}) {
+ const assets2 = {};
+ Object.keys(assets).forEach(key => {
+ let asset = '';
+ if (assets[key].indexOf('assets') > 0) {
+ asset = assets[key].split('assets')[1];
+ } else {
+ asset = assets[key].replace(/^[.\/\\]*/, '/');
+ }
+ // 网页
+ if (process.env.TARO_ENV === 'h5') {
+ assets2[key] = project.host.assetsPath + asset;
+ }
+ // 小程序
+ else if (process.env.TARO_ENV === 'weapp') {
+ assets2[key] = Fetcher.host + project.host.assetsPath + asset;
+ }
+ });
+ return assets2;
+ }
+
}
\ No newline at end of file
diff --git a/common/Tools.js b/common/Tools.js
index 0c4fb41..5aac0e5 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -22,6 +22,22 @@
}
/**
+ * URL参数解析
+ * @param {String} name
+ * @param {String} [search]
+ * @return {String|Null}
+ */
+ static getUrlParam(name, search = window.location.search) {
+ const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+ const r = search.substr(1).match(reg);
+ if (r !== null) {
+ return decodeURIComponent(r[2]);
+ } else {
+ return null;
+ }
+ }
+
+ /**
* 读取文件 base64
* @param {File} file
* @return {Promise<string>}
--
Gitblit v1.9.1