fix: 版本更新下载地址改用周尚CDN前缀
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
NODE_ENV = production
|
NODE_ENV = production
|
||||||
VUE_APP_ENV_NAME = zhoushang环境
|
VUE_APP_ENV_NAME = zhoushang环境
|
||||||
VUE_APP_UPGRADE_NAME = erp_pda_zhoushang_zhichang
|
VUE_APP_UPGRADE_NAME = erp_pda_zhoushang_zhichang
|
||||||
|
VUE_APP_UPGRADE_CDN_PREFIX = https://zsfzcdn.yushangfangzhi.com/version/erp_pda_zhoushang_zhichang
|
||||||
VUE_APP_PRODUCTION_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1
|
VUE_APP_PRODUCTION_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1
|
||||||
VUE_APP_DEV_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1
|
VUE_APP_DEV_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
NODE_ENV = production
|
NODE_ENV = production
|
||||||
VUE_APP_ENV_NAME = zhoushang环境
|
VUE_APP_ENV_NAME = zhoushang环境
|
||||||
VUE_APP_UPGRADE_NAME = erp_pda_zhoushang_zhichang
|
VUE_APP_UPGRADE_NAME = erp_pda_zhoushang_zhichang
|
||||||
|
VUE_APP_UPGRADE_CDN_PREFIX = https://zsfzcdn.yushangfangzhi.com/version/erp_pda_zhoushang_zhichang
|
||||||
VUE_APP_PRODUCTION_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1
|
VUE_APP_PRODUCTION_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1
|
||||||
VUE_APP_DEV_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1
|
VUE_APP_DEV_API_URL = https://zszc.yushangfangzhi.com/hcscm_weave/pda/v1
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ export const isDevelopment = process.env.NODE_ENV === 'development'
|
|||||||
|
|
||||||
const config = {
|
const config = {
|
||||||
upgradeName: process.env.VUE_APP_UPGRADE_NAME || 'erp_pda',
|
upgradeName: process.env.VUE_APP_UPGRADE_NAME || 'erp_pda',
|
||||||
|
upgradeCdnPrefix: process.env.VUE_APP_UPGRADE_CDN_PREFIX || '',
|
||||||
|
|
||||||
// 产品名称
|
// 产品名称
|
||||||
productName: '浩拓技术',
|
productName: '浩拓技术',
|
||||||
@@ -33,6 +34,20 @@ const config = {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function resolveUpgradeDownloadUrl(downloadUrl) {
|
||||||
|
const raw = String(downloadUrl || '').trim();
|
||||||
|
const prefix = String(config.upgradeCdnPrefix || '').trim().replace(/\/+$/, '');
|
||||||
|
if (!raw || !prefix) {
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
const path = raw.split('?')[0].split('#')[0];
|
||||||
|
const fileName = path.split('/').filter(Boolean).pop() || '';
|
||||||
|
if (!fileName || !/\.apk$/i.test(fileName)) {
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
return `${prefix}/${fileName}`;
|
||||||
|
}
|
||||||
|
|
||||||
export function getDefaultApiUrl() {
|
export function getDefaultApiUrl() {
|
||||||
const prod = config.devApiUrlOptions.find(item => item.label === '正式环境');
|
const prod = config.devApiUrlOptions.find(item => item.label === '正式环境');
|
||||||
return (prod && prod.value) || config.productionApiUrl || 'https://zszc.yushangfangzhi.com/server/hcscm_weave/pda/v1';
|
return (prod && prod.value) || config.productionApiUrl || 'https://zszc.yushangfangzhi.com/server/hcscm_weave/pda/v1';
|
||||||
|
|||||||
@@ -118,7 +118,7 @@
|
|||||||
/**
|
/**
|
||||||
* Copyright (c) 2013-Now http://aidex.vip All rights reserved.
|
* Copyright (c) 2013-Now http://aidex.vip All rights reserved.
|
||||||
*/
|
*/
|
||||||
import config, { getDefaultApiUrl } from '@/common/config.js';
|
import config, { getDefaultApiUrl, resolveUpgradeDownloadUrl } from '@/common/config.js';
|
||||||
import base64 from '@/common/base64.js';
|
import base64 from '@/common/base64.js';
|
||||||
import util from '@/common/util.js';
|
import util from '@/common/util.js';
|
||||||
import md5 from '@/common/md5.js';
|
import md5 from '@/common/md5.js';
|
||||||
@@ -459,7 +459,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
changelog: res.message + ',最新版本:' + res.latest_version,
|
changelog: res.message + ',最新版本:' + res.latest_version,
|
||||||
status: res.need_update ? 1 : 0, // 0 无新版本 | 1 有新版本
|
status: res.need_update ? 1 : 0, // 0 无新版本 | 1 有新版本
|
||||||
path: res.download_url, // 新apk地址
|
path: resolveUpgradeDownloadUrl(res.download_url), // 新apk地址
|
||||||
latest_version: res.latest_version
|
latest_version: res.latest_version
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -61,7 +61,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import CommonNavbar from "@/components/common-navbar/index";
|
import CommonNavbar from "@/components/common-navbar/index";
|
||||||
import app_upgrade from '@/uni_modules/app-upgrade/js_sdk/index.js';
|
import app_upgrade from '@/uni_modules/app-upgrade/js_sdk/index.js';
|
||||||
import config from '@/common/config.js';
|
import config, { resolveUpgradeDownloadUrl } from '@/common/config.js';
|
||||||
import manifest from '@/manifest.json';
|
import manifest from '@/manifest.json';
|
||||||
/**
|
/**
|
||||||
* Copyright (c) 2013-Now http://aidex.vip All rights reserved.
|
* Copyright (c) 2013-Now http://aidex.vip All rights reserved.
|
||||||
@@ -133,7 +133,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
changelog: res.message + ',最新版本:' + res.latest_version,
|
changelog: res.message + ',最新版本:' + res.latest_version,
|
||||||
status: res.need_update ? 1 : 0,
|
status: res.need_update ? 1 : 0,
|
||||||
path: res.download_url,
|
path: resolveUpgradeDownloadUrl(res.download_url),
|
||||||
latest_version: res.latest_version
|
latest_version: res.latest_version
|
||||||
};
|
};
|
||||||
}, 1);
|
}, 1);
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ module.exports = {
|
|||||||
'process.env': {
|
'process.env': {
|
||||||
...definitions[0]['process.env'],
|
...definitions[0]['process.env'],
|
||||||
VUE_APP_UPGRADE_NAME: JSON.stringify(process.env.VUE_APP_UPGRADE_NAME),
|
VUE_APP_UPGRADE_NAME: JSON.stringify(process.env.VUE_APP_UPGRADE_NAME),
|
||||||
|
VUE_APP_UPGRADE_CDN_PREFIX: JSON.stringify(process.env.VUE_APP_UPGRADE_CDN_PREFIX),
|
||||||
VUE_APP_PRODUCTION_API_URL: JSON.stringify(process.env.VUE_APP_PRODUCTION_API_URL),
|
VUE_APP_PRODUCTION_API_URL: JSON.stringify(process.env.VUE_APP_PRODUCTION_API_URL),
|
||||||
VUE_APP_DEV_API_URL: JSON.stringify(process.env.VUE_APP_DEV_API_URL),
|
VUE_APP_DEV_API_URL: JSON.stringify(process.env.VUE_APP_DEV_API_URL),
|
||||||
VUE_APP_ENV_NAME: JSON.stringify(process.env.VUE_APP_ENV_NAME),
|
VUE_APP_ENV_NAME: JSON.stringify(process.env.VUE_APP_ENV_NAME),
|
||||||
|
|||||||
Reference in New Issue
Block a user