From dd2ae6578673651712134fd1867dca514cfec61f Mon Sep 17 00:00:00 2001
From: chenzhangyue <chenzhangyue01@weidian.com>
Date: 星期四, 10 八月 2023 20:00:43 +0800
Subject: [PATCH] 修复代理访问跨域问题，和ScheduledFuture取消任务时指令重排异常，不结束正在运行的任务。防止 Command interrupted
---
web_src/src/components/live.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/web_src/src/components/live.vue b/web_src/src/components/live.vue
index 1f2d6ca..4a7af49 100644
--- a/web_src/src/components/live.vue
+++ b/web_src/src/components/live.vue
@@ -137,12 +137,15 @@
method: 'get',
url: '/api/play/start/' + deviceId + '/' + channelId
}).then(function (res) {
- // that.isLoging = false;
- console.log('=====----=====')
- console.log(res)
- if (res.data.code == 0 && res.data.data) {
- itemData.playUrl = res.data.data.httpsFlv
- that.setPlayUrl(res.data.data.ws_flv, idxTmp)
+ if (res.data.code === 0 && res.data.data) {
+ let videoUrl;
+ if (location.protocol === "https:") {
+ videoUrl = res.data.data.wss_flv;
+ } else {
+ videoUrl = res.data.data.ws_flv;
+ }
+ itemData.playUrl = videoUrl;
+ that.setPlayUrl(videoUrl, idxTmp);
} else {
that.$message.error(res.data.msg);
}
--
Gitblit v1.8.0