From f05fa03947593a5f2cce58c46cff60bfdb1425fc Mon Sep 17 00:00:00 2001 From: terrfly Date: Tue, 22 Jun 2021 14:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20reconnectingwebsocket=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=20=E6=B7=BB=E5=8A=A0getWebSocketPre?= =?UTF-8?q?fix()=20=E8=8E=B7=E5=8F=96webSocket=E5=89=8D=E7=BC=80=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E5=87=BD=E6=95=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeepay-ui-merchant/package-lock.json | 5 +++++ jeepay-ui-merchant/package.json | 3 ++- jeepay-ui-merchant/src/api/manage.js | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/jeepay-ui-merchant/package-lock.json b/jeepay-ui-merchant/package-lock.json index 990fabb..0b6b9bf 100644 --- a/jeepay-ui-merchant/package-lock.json +++ b/jeepay-ui-merchant/package-lock.json @@ -16603,6 +16603,11 @@ "util.promisify": "^1.0.0" } }, + "reconnectingwebsocket": { + "version": "1.0.0", + "resolved": "https://registry.npm.taobao.org/reconnectingwebsocket/download/reconnectingwebsocket-1.0.0.tgz", + "integrity": "sha1-C4Jbq7N7ZwRFxlqn0+2XgwAgVEQ=" + }, "redent": { "version": "1.0.0", "resolved": "https://registry.nlark.com/redent/download/redent-1.0.0.tgz?cache=0&sync_timestamp=1620069780522&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fredent%2Fdownload%2Fredent-1.0.0.tgz", diff --git a/jeepay-ui-merchant/package.json b/jeepay-ui-merchant/package.json index 86611fe..f2d421d 100644 --- a/jeepay-ui-merchant/package.json +++ b/jeepay-ui-merchant/package.json @@ -37,7 +37,8 @@ "vue-svg-component-runtime": "^1.0.1", "vuex": "^3.1.1", "wangeditor": "^3.1.1", - "js-base64": "^2.5.2" + "js-base64": "^2.5.2", + "reconnectingwebsocket": "^1.0.0" }, "devDependencies": { "@ant-design/colors": "^3.2.1", diff --git a/jeepay-ui-merchant/src/api/manage.js b/jeepay-ui-merchant/src/api/manage.js index 3bc0572..4598f8a 100644 --- a/jeepay-ui-merchant/src/api/manage.js +++ b/jeepay-ui-merchant/src/api/manage.js @@ -201,3 +201,20 @@ export function getUserInfo () { method: 'get' }) } + +/** 获取到webSocket的前缀 (ws://localhost) **/ +export function getWebSocketPrefix () { + // 获取网站域名 + 端口号 + let domain = document.location.protocol + '//' + document.location.host + + // 判断api_base_url 是否设置 + if (process.env.VUE_APP_API_BASE_URL && process.env.VUE_APP_API_BASE_URL !== '/') { + domain = process.env.VUE_APP_API_BASE_URL + } + + if (domain.startsWith('https:')) { + return 'wss://' + domain.replace('https://', '') + } else { + return 'ws://' + domain.replace('http://', '') + } +} -- GitLab