diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java index f74dcfa7..da6b4753 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java @@ -297,9 +297,22 @@ public class ZLMHttpHookListener { if (!"rtp".equals(app) ){ MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId); if (regist) { - zlmMediaListManager.addMedia(mediaServerItem, app, streamId); +// if("qupinwei".equals(app) && streamId.contains("/")){ +// String[] split = streamId.split("/"); + +// if(split.length >2){ +// logger.error("流地址不符合固定的要求"); +// }else{ + zlmMediaListManager.addMedia(mediaServerItem, app,streamId ); +//// } +// +// +// }else{ +// logger.error("流地址不符合固定的要求"); +// } + }else { - zlmMediaListManager.removeMedia( app, streamId); + zlmMediaListManager.removeMedia(app, streamId); } } } diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java index ea1123cb..24c7cccd 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java @@ -107,7 +107,19 @@ public class ZLMMediaListManager { } if (streamPushItems != null && streamPushItems.size() == 1) { - storager.updateMedia(streamPushItems.get(0)); + StreamPushItem streamPushItem = streamPushItems.get(0); + if("qupinwei".equals(streamPushItem.getApp()) && streamPushItem.getStream().contains("/") && streamPushItem.getStream().split("/").length == 2){ + + String[] split = streamPushItem.getStream().split("/"); + streamPushItem.setBasketballId(Integer.parseInt(split[1])); + + storager.updateMedia(streamPushItem); + }else { + logger.error("流地址格式不符合"); + removeMedia(app,streamId); + } + + } }); } diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java index 73e162af..19e86b53 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java @@ -18,6 +18,11 @@ public class StreamPushItem extends GbStream implements Comparable { console.log("浏览器唯一标识码:" + fingerPrint); }); + + + Vue.config.productionTip = false // mount axios to `Vue.$http` and `this.$http` @@ -62,3 +65,6 @@ new Vue({ created: bootstrap, render: h => h(App) }).$mount('#app') + + + diff --git a/web_src/src/utils/request.js b/web_src/src/utils/request.js index bcf420ac..d2f1ced7 100644 --- a/web_src/src/utils/request.js +++ b/web_src/src/utils/request.js @@ -3,7 +3,7 @@ import store from '@/store' import storage from 'store' import notification from 'ant-design-vue/es/notification' import { VueAxios } from './axios' - +import router from '@/router' // 创建 axios 实例 const request = axios.create({ // API 请求的默认前缀 @@ -13,6 +13,7 @@ const request = axios.create({ // 异常拦截处理器 const errorHandler = (error) => { + debugger; if (error.response) { const data = error.response.data if (error.response.status === 403) { @@ -22,10 +23,7 @@ const errorHandler = (error) => { }) } if (error.response.status === 401 && !(data.result && data.result.isLogin)) { - notification.error({ - message: 'Unauthorized', - description: 'Authorization verification failed' - }) + router.push('/login'); } } return Promise.reject(error)