调整App请求主机地址管理逻辑

Tevin

2021-08-15 d04c3cd74e5ee2adf252f1d2dffd0dd10653ab76

 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;
        }
@@ -280,7 +284,7 @@
            msg += '解析通讯数据异常！';
        }
        setTimeout(() => {
            this.message('error', msg);
            this.message('fail', msg);
        }, 20);
    }

@@ -549,7 +553,7 @@
            title: msg,
            icon: 'none',
            mask: true,
            duration: type === 'error' ? 5000 : 3000,
            duration: type === 'fail' ? 3000 : 2000,
        });
    }

@@ -585,21 +589,39 @@
        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) {
                // 既不指定server也不是域名访问，使用设置的服务器地址
                else {
                    return project.host.hosts[project.host.serverType];
                }
            }