From 3578c1c0403a0455fca0fd46101b2cedd42a5a5a Mon Sep 17 00:00:00 2001 From: 648540858 <18010473990@163.com> Date: 星期二, 31 八月 2021 09:44:19 +0800 Subject: [PATCH] 优化登录体验。修复因为流地址导致的录像服务无法识别 --- web_src/src/components/Login.vue | 3 ++- src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java | 3 +++ src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java | 2 +- src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 4 ++-- src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 4 ++-- src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 4 ++-- web_src/src/assets/logo.png | 0 src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 2 +- web_src/static/css/login.css | 25 +++++++++++++++++++++++++ 9 files changed, 38 insertions(+), 9 deletions(-) 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 800c4cb..ebfac95 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 @@ 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 a6d0515..ad37cd8 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 @@ 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 @@ 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 3af007d..33c0051 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 @@ 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 9310320..3e34646 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 @@ 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 @@ 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 8ea84dc..911f213 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 @@ @GetMapping("/stop/{deviceId}/{channelId}") public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String deviceId, @PathVariable String channelId) { - logger.debug(String.format("璁惧棰勮/鍥炴斁鍋滄API璋冪敤锛宻treamId锛�%s/%s", deviceId, channelId )); + logger.debug(String.format("璁惧棰勮/鍥炴斁鍋滄API璋冪敤锛宻treamId锛�%s_%s", deviceId, channelId )); UUID uuid = UUID.randomUUID(); DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(); @@ -147,7 +147,7 @@ // 瓒呮椂澶勭悊 result.onTimeout(()->{ - logger.warn(String.format("璁惧棰勮/鍥炴斁鍋滄瓒呮椂锛宒eviceId/channelId锛�%s/%s ", deviceId, channelId)); + logger.warn(String.format("璁惧棰勮/鍥炴斁鍋滄瓒呮椂锛宒eviceId/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 2ca4aba..167b7ee 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 @@ cmder.streamByeCmd(deviceId, channelId); if (logger.isDebugEnabled()) { - logger.debug(String.format("璁惧鍘嗗彶濯掍綋涓嬭浇鍋滄 API璋冪敤锛宒eviceId/channelId锛�%s/%s", deviceId, channelId)); + logger.debug(String.format("璁惧鍘嗗彶濯掍綋涓嬭浇鍋滄 API璋冪敤锛宒eviceId/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 f3d2503..c5da2d4 100644 --- a/web_src/src/assets/logo.png +++ b/web_src/src/assets/logo.png Binary files differ diff --git a/web_src/src/components/Login.vue b/web_src/src/components/Login.vue index 2b544bc..d823659 100644 --- a/web_src/src/components/Login.vue +++ b/web_src/src/components/Login.vue @@ -22,7 +22,7 @@ </div> <div class="container-login100-form-btn"> - <div class="wrap-login100-form-btn"> + <div class="wrap-login100-form-btn" :class="{'login-loading': isLoging}" v-loading="isLoging" element-loading-background="rgb(0 0 0 / 0%);" element-loading-custom-class="login-loading-class"> <div class="login100-form-bgbtn"></div> <button class="login100-form-btn" @click="login">鐧诲綍</button> </div> @@ -41,6 +41,7 @@ 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 a515431..e0f0494 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; -- Gitblit v1.8.0