diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java index 1c054401..47a4e008 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java @@ -94,7 +94,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen String deviceId = uri.getUser(); AuthorizationHeader authHead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME); - if (authHead == null) { + if (authHead == null && !StringUtils.isEmpty(sipConfig.getPassword())) { logger.info("[注册请求] 未携带授权头 回复401: {}", requestAddress); response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request); new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain()); diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index 9c7ab8ef..2d62e29d 100644 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -220,6 +220,7 @@ export default { method: 'get', url: '/api/play/start/' + deviceId + '/' + channelId }).then(function (res) { + console.log(res) that.isLoging = false; if (res.data.code === 0) { @@ -237,10 +238,13 @@ export default { that.initData(); }, 1000) + }else{ + that.$message.error(res.data.msg); } }).catch(function (e) { + console.error(e) that.isLoging = false; - that.$message.error("请求超时"); + // that.$message.error("请求超时"); }); }, queryRecords: function (itemData) { diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue index 921e4136..aba35ddb 100644 --- a/web_src/src/components/dialog/devicePlayer.vue +++ b/web_src/src/components/dialog/devicePlayer.vue @@ -4,10 +4,22 @@
- + + + + + + + + h265web敬请期待 + wsPlayer 敬请期待 + + + +
- +
@@ -33,10 +45,100 @@
资源地址: - + + + + 更多地址 + + + + FLV: + {{ streamInfo.flv }} + + + FLV(https): + {{ streamInfo.https_flv }} + + + FLV(ws): + {{ streamInfo.ws_flv }} + + + FLV(wss): + {{ streamInfo.wss_flv }} + + + FMP4: + {{ streamInfo.fmp4 }} + + + FMP4(https): + {{ streamInfo.https_fmp4 }} + + + FMP4(ws): + {{ streamInfo.ws_fmp4 }} + + + FMP4(wss): + {{ streamInfo.wss_fmp4 }} + + + HLS: + {{ streamInfo.hls }} + + + HLS(https): + {{ streamInfo.https_hls }} + + + HLS(ws): + {{ streamInfo.ws_hls }} + + + HLS(wss): + {{ streamInfo.wss_hls }} + + + TS: + {{ streamInfo.ts }} + + + TS(https): + {{ streamInfo.https_ts }} + + + TS(ws): + {{ streamInfo.ws_ts }} + + + TS(wss): + {{ streamInfo.wss_ts }} + + + RTC: + {{ streamInfo.rtc }} + + + RTMP: + {{ streamInfo.rtmp }} + + + RTMPS: + {{ streamInfo.rtmps }} + + + RTSP: + {{ streamInfo.rtsp }} + + + RTSPS: + {{ streamInfo.rtsps }} + + + +
@@ -117,27 +219,27 @@
- 预置位编号 + 预置位编号 设置 调用 删除 - 巡航速度 + 巡航速度 设置 - 停留时间 + 停留时间 设置 - 巡航组编号 + 巡航组编号 添加点 删除点 删除组 巡航 - 扫描速度 + 扫描速度 设置 - 扫描组编号 + 扫描组编号 左边界 右边界 @@ -174,6 +276,7 @@
+
@@ -182,16 +285,16 @@