From 2292d1826e69e21c8a411c217faef635fe57d458 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 一月 2021 10:48:49 +0800
Subject: [PATCH] Merge branch 'bms' of ssh://39.106.218.81:29418/~jinfei/pc-plat into bms
---
src/utils/utils.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index ca41324..f97d965 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -48,6 +48,7 @@
for (let i = 0; i < 6; i++) {
name.push(_options.substr(Math.floor(Math.random() * 26), 1))
}
+ name.splice(3, 0, new Date().getTime())
return name.join('')
}
@@ -168,7 +169,7 @@
value = value.replace(/%/ig, ' mpercent ')
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
- value = value.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
+ value = value.replace(/@db@/ig, window.GLOB.externalDatabase)
}
// encode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛�
value = window.btoa(window.encodeURIComponent(value))
@@ -239,7 +240,7 @@
value = value.replace(/%/ig, ' mpercent ')
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
- value = value.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
+ value = value.replace(/@db@/ig, window.GLOB.externalDatabase)
}
let encodesql = (val) => {
@@ -698,7 +699,7 @@
if (process.env.NODE_ENV === 'production') {
baseurl = document.location.origin + '/' + window.GLOB.service
} else {
- baseurl = window.GLOB.location + window.GLOB.service
+ baseurl = window.GLOB.location + '/' + window.GLOB.service
}
let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
--
Gitblit v1.8.0