diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java b/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java index 800c4cb2..ebfac955 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java @@ -30,6 +30,9 @@ public class AnonymousAuthenticationEntryPoint implements AuthenticationEntryPoi JSONObject jsonObject = new JSONObject(); jsonObject.put("code", "-1"); jsonObject.put("msg", "请登录后重新请求"); + if (request.getRequestURI().contains("api/user/login")){ + jsonObject.put("msg", e.getMessage()); + } response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); try { response.getWriter().print(jsonObject.toJSONString()); 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 a6d05151..ad37cd82 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 @@ -376,7 +376,7 @@ public class ZLMHttpHookListener { String app = json.getString("app"); String streamId = json.getString("stream"); if ("rtp".equals(app)) { - String[] s = streamId.split("/"); + String[] s = streamId.split("_"); if (s.length == 2) { String deviceId = s[0]; String channelId = s[1]; @@ -386,7 +386,7 @@ public class ZLMHttpHookListener { SSRCInfo ssrcInfo; String streamId2 = null; if (mediaInfo.isRtpEnable()) { - streamId2 = String.format("%s/%s", device.getDeviceId(), channelId); + streamId2 = String.format("%s_%s", device.getDeviceId(), channelId); } ssrcInfo = mediaServerService.openRTPServer(mediaInfo, streamId2); cmder.playStreamCmd(mediaInfo, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> { diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java index 3af007d9..33c00515 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java @@ -122,7 +122,7 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR String mediaServerId = streamSession.getMediaServerId(device.getDeviceId(), channelId); MediaServerItem mediaServerItem = this.getOne(mediaServerId); if (mediaServerItem != null) { - String streamId = String.format("%s/%s", device.getDeviceId(), channelId); + String streamId = String.format("%s_%s", device.getDeviceId(), channelId); zlmrtpServerFactory.closeRTPServer(mediaServerItem, streamId); releaseSsrc(mediaServerItem, streamSession.getSSRC(device.getDeviceId(), channelId)); } diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java index 93103201..3e34646c 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java @@ -155,7 +155,7 @@ public class PlayServiceImpl implements IPlayService { SSRCInfo ssrcInfo; String streamId = null; if (mediaServerItem.isRtpEnable()) { - streamId = String.format("%s/%s", device.getDeviceId(), channelId); + streamId = String.format("%s_%s", device.getDeviceId(), channelId); } ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId); @@ -220,7 +220,7 @@ public class PlayServiceImpl implements IPlayService { SSRCInfo ssrcInfo; String streamId2 = null; if (mediaServerItem.isRtpEnable()) { - streamId2 = String.format("%s/%s", device.getDeviceId(), channelId); + streamId2 = String.format("%s_%s", device.getDeviceId(), channelId); } ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId2); diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java index 8ea84dcd..911f2133 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java @@ -101,7 +101,7 @@ public class PlayController { @GetMapping("/stop/{deviceId}/{channelId}") public DeferredResult> playStop(@PathVariable String deviceId, @PathVariable String channelId) { - logger.debug(String.format("设备预览/回放停止API调用,streamId:%s/%s", deviceId, channelId )); + logger.debug(String.format("设备预览/回放停止API调用,streamId:%s_%s", deviceId, channelId )); UUID uuid = UUID.randomUUID(); DeferredResult> result = new DeferredResult>(); @@ -147,7 +147,7 @@ public class PlayController { // 超时处理 result.onTimeout(()->{ - logger.warn(String.format("设备预览/回放停止超时,deviceId/channelId:%s/%s ", deviceId, channelId)); + logger.warn(String.format("设备预览/回放停止超时,deviceId/channelId:%s_%s ", deviceId, channelId)); RequestMessage msg = new RequestMessage(); msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid); msg.setData("Timeout"); diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java index 2ca4abaa..167b7ee1 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java @@ -130,7 +130,7 @@ public class DownloadController { cmder.streamByeCmd(deviceId, channelId); if (logger.isDebugEnabled()) { - logger.debug(String.format("设备历史媒体下载停止 API调用,deviceId/channelId:%s/%s", deviceId, channelId)); + logger.debug(String.format("设备历史媒体下载停止 API调用,deviceId/channelId:%s_%s", deviceId, channelId)); } if (deviceId != null && channelId != null) { diff --git a/web_src/src/assets/logo.png b/web_src/src/assets/logo.png index f3d2503f..c5da2d4b 100644 Binary files a/web_src/src/assets/logo.png and b/web_src/src/assets/logo.png differ diff --git a/web_src/src/components/Login.vue b/web_src/src/components/Login.vue index 2b544bcc..d823659b 100644 --- a/web_src/src/components/Login.vue +++ b/web_src/src/components/Login.vue @@ -22,7 +22,7 @@
-
+
@@ -41,6 +41,7 @@ export default { return { isLoging: false, showPassword: false, + loginLoading: false, username: '', password: '' } diff --git a/web_src/static/css/login.css b/web_src/static/css/login.css index a515431a..e0f04940 100755 --- a/web_src/static/css/login.css +++ b/web_src/static/css/login.css @@ -376,6 +376,31 @@ .p-b-48 {padding-bottom: 48px;} .p-t-115 {padding-top: 115px;} +@keyframes login { + from {width: 100%} + to {width: 50px} +} + +.login-loading{ + width: 50px; + animation-name: login; + animation-duration: 0.5s; +} +.login-loading > .login100-form-btn { + visibility: hidden !important; +} +.login-loading-class{ + stroke: rgb(255, 255, 255) !important; + background-color: transparent !important; +} + +.login-loading-class > .el-loading-spinner .path { + stroke: rgb(255, 255, 255) !important; +} + + + + /**font**/ /* .zmdi { display: inline-block;