Commit bd963e17ea7b418067173f8433280520cccd393d

Authored by 王鑫
1 parent 7d8a0fc3

fix():

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
@@ -136,7 +136,7 @@ public class GBRecordController { @@ -136,7 +136,7 @@ public class GBRecordController {
136 String startTime, String endTime, String downloadSpeed) { 136 String startTime, String endTime, String downloadSpeed) {
137 137
138 if (logger.isDebugEnabled()) { 138 if (logger.isDebugEnabled()) {
139 - logger.debug(String.format("历史媒体下载 API调用,deviceId:%s,channelId:%s,downloadSpeed:%s", deviceId, channelId, downloadSpeed)); 139 + logger.debug("历史媒体下载 API调用,deviceId:{},channelId:{},downloadSpeed:{}", deviceId, channelId, downloadSpeed);
140 } 140 }
141 141
142 String uuid = UUID.randomUUID().toString(); 142 String uuid = UUID.randomUUID().toString();
@@ -146,11 +146,8 @@ public class GBRecordController { @@ -146,11 +146,8 @@ public class GBRecordController {
146 RequestMessage requestMessage = new RequestMessage(); 146 RequestMessage requestMessage = new RequestMessage();
147 requestMessage.setId(uuid); 147 requestMessage.setId(uuid);
148 requestMessage.setKey(key); 148 requestMessage.setKey(key);
149 -  
150 -  
151 playService.download(deviceId, channelId, startTime, endTime, Integer.parseInt(downloadSpeed), 149 playService.download(deviceId, channelId, startTime, endTime, Integer.parseInt(downloadSpeed),
152 (code, msg, data)->{ 150 (code, msg, data)->{
153 -  
154 WVPResult<StreamContent> wvpResult = new WVPResult<>(); 151 WVPResult<StreamContent> wvpResult = new WVPResult<>();
155 if (code == InviteErrorCode.SUCCESS.getCode()) { 152 if (code == InviteErrorCode.SUCCESS.getCode()) {
156 wvpResult.setCode(ErrorCode.SUCCESS.getCode()); 153 wvpResult.setCode(ErrorCode.SUCCESS.getCode());
web_src/src/layout/UiHeader.vue
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <el-menu-item index="/cloudRecord">云端录像</el-menu-item> 13 <el-menu-item index="/cloudRecord">云端录像</el-menu-item>
14 <el-menu-item index="/mediaServerManger">节点管理</el-menu-item> 14 <el-menu-item index="/mediaServerManger">节点管理</el-menu-item>
15 <el-menu-item index="/parentPlatformList/15/1">国标级联</el-menu-item> 15 <el-menu-item index="/parentPlatformList/15/1">国标级联</el-menu-item>
16 - 16 +
17 <el-menu-item v-if="editUser" index="/userManager">用户管理</el-menu-item> 17 <el-menu-item v-if="editUser" index="/userManager">用户管理</el-menu-item>
18 18
19 <!-- <el-submenu index="/setting">--> 19 <!-- <el-submenu index="/setting">-->
web_src/static/js/config.js
1 -window.baseUrl = "http://192.168.20.215:18089"; 1 +window.baseUrl = (window.location.origin === 'http://223.87.29.113:18089'?'http://223.87.29.113:18089':'http://192.168.0.62:18089')
2 2
3 // map组件全局参数, 注释此内容可以关闭地图功能 3 // map组件全局参数, 注释此内容可以关闭地图功能
4 window.mapParam = { 4 window.mapParam = {