Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化登录体验。修复因为流地址导致的录像服务无法识别

Browse Source
This commit is contained in:
648540858 2021-08-31 09:44:19 +08:00
parent 792c93694d
commit 3578c1c040
9 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java
View File

@ -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());

4
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
View File

@ -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) -> {

2
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
View File

@ -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));
}

4
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
View File

@ -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);

4
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
View File

@ -101,7 +101,7 @@ public class PlayController {
@GetMapping("/stop/{deviceId}/{channelId}")
public DeferredResult<ResponseEntity<String>> 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<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
@ -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");

2
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
View File

@ -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) {

BIN
web_src/src/assets/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 66 KiB

3
web_src/src/components/Login.vue
View File

@ -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 @@ export default {
return {
isLoging: false,
showPassword: false,
loginLoading: false,
username: '',
password: ''
}

25
web_src/static/css/login.css
View File

@ -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;