From 479a07f879076a2a2a83963b924f71d406427f7c Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Sun, 20 Feb 2022 16:22:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=B5=B7=E5=BA=B7=E4=B8=8D?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E7=9A=84xml=EF=BC=8C=E5=A4=A7=E5=B9=85?= =?UTF-8?q?=E5=BA=A6=E6=8F=90=E9=AB=98=E9=80=9A=E9=81=93=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=9F=E5=BA=A6=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=9A=84=E4=BF=9D=E6=B4=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql.sql | 1 + sql/update.sql | 8 ++- .../genersoft/iot/vmp/conf/MediaConfig.java | 3 +- .../request/SIPRequestProcessorParent.java | 33 ++++++++- .../iot/vmp/media/zlm/ZLMRESTfulUtils.java | 3 + .../iot/vmp/media/zlm/ZLMRunner.java | 4 +- .../zlm/event/ZLMKeepliveTimeoutListener.java | 2 +- .../iot/vmp/service/IMediaServerService.java | 2 +- .../service/impl/MediaServerServiceImpl.java | 69 ++++++++++++++----- .../vmp/storager/IVideoManagerStorager.java | 6 -- .../vmp/storager/dao/DeviceChannelMapper.java | 43 +++++------- .../vmp/storager/dao/MediaServerMapper.java | 11 ++- .../impl/VideoManagerStoragerImpl.java | 31 +++++---- .../vmp/vmanager/server/ServerController.java | 2 - src/main/resources/all-application.yml | 2 +- src/main/resources/application-dev.yml | 2 + src/main/resources/application-docker.yml | 2 + web_src/src/components/channelList.vue | 2 +- 18 files changed, 145 insertions(+), 81 deletions(-) diff --git a/sql/mysql.sql b/sql/mysql.sql index 26ea595b..4bab2948 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -107,6 +107,7 @@ CREATE TABLE `device_channel` ( `certNum` varchar(50) DEFAULT NULL, `certifiable` int(11) DEFAULT NULL, `errCode` int(11) DEFAULT NULL, + `subCount` int(11) DEFAULT 0, `endTime` varchar(50) DEFAULT NULL, `secrecy` varchar(50) DEFAULT NULL, `ipAddress` varchar(50) DEFAULT NULL, diff --git a/sql/update.sql b/sql/update.sql index d6386ea0..2a16265e 100644 --- a/sql/update.sql +++ b/sql/update.sql @@ -1 +1,7 @@ -ALTER TABLE stream_proxy ADD status bit(1) not null; \ No newline at end of file +ALTER TABLE stream_proxy ADD status bit(1) not null; + +# 去除子查询优化查询速度 +alter table device_channel + add subCount int default 0 null; + +update device_channel dc set dc.subCount = (select te.count from (SELECT count(0) as count FROM device_channel WHERE parentId = dc.channelId) te) \ No newline at end of file diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java index 2b52bcd3..3f549e5e 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java @@ -11,7 +11,8 @@ import java.util.Date; @Configuration("mediaConfig") public class MediaConfig{ - @Value("${media.id:}") + // 修改必须配置，不再支持自动获取 + @Value("${media.id}") private String id; @Value("${media.ip}") diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java index d4de725d..390565c7 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java @@ -4,6 +4,7 @@ import gov.nist.javax.sip.SipProviderImpl; import gov.nist.javax.sip.SipStackImpl; import gov.nist.javax.sip.message.SIPRequest; import gov.nist.javax.sip.stack.SIPServerTransaction; +import org.apache.commons.lang3.ArrayUtils; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; @@ -25,7 +26,12 @@ import javax.sip.message.MessageFactory; import javax.sip.message.Request; import javax.sip.message.Response; import java.io.ByteArrayInputStream; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; import java.text.ParseException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * @description:处理接收IPCamera发来的SIP协议请求消息 @@ -202,7 +208,32 @@ public abstract class SIPRequestProcessorParent { Request request = evt.getRequest(); SAXReader reader = new SAXReader(); reader.setEncoding(charset); - Document xml = reader.read(new ByteArrayInputStream(request.getRawContent())); + // 对海康出现的未转义字符做处理。 + String[] destStrArray = new String[]{"<",">","&","'","""}; + char despChar = '&'; // 或许可扩展兼容其他字符 + byte destBye = (byte) despChar; + List result = new ArrayList<>(); + byte[] rawContent = request.getRawContent(); + for (int i = 0; i < rawContent.length; i++) { + if (rawContent[i] == destBye) { + boolean resul = false; + for (String destStr : destStrArray) { + if (i + destStr.length() <= rawContent.length) { + byte[] bytes = Arrays.copyOfRange(rawContent, i, i + destStr.length()); + resul = resul || (Arrays.equals(bytes,destStr.getBytes())); + } + } + if (resul) { + result.add(rawContent[i]); + } + }else { + result.add(rawContent[i]); + } + } + Byte[] bytes = new Byte[0]; + byte[] bytesResult = ArrayUtils.toPrimitive(result.toArray(bytes)); + + Document xml = reader.read(new ByteArrayInputStream(bytesResult)); return xml.getRootElement(); } diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java index c5e01d89..8238a838 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java @@ -27,6 +27,9 @@ public class ZLMRESTfulUtils { public JSONObject sendPost(MediaServerItem mediaServerItem, String api, Map param, RequestCallback callback) { OkHttpClient client = new OkHttpClient(); + if (mediaServerItem == null) { + return null; + } String url = String.format("http://%s:%s/index/api/%s", mediaServerItem.getIp(), mediaServerItem.getHttpPort(), api); JSONObject responseJSON = null; diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java index b56287bb..de5d4832 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java @@ -63,10 +63,9 @@ public class ZLMRunner implements CommandLineRunner { mediaServerService.addToDatabase(mediaConfig.getMediaSerItem()); }else { MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem(); - mediaSerItem.setId(defaultMediaServer.getId()); mediaServerService.updateToDatabase(mediaSerItem); } - + mediaServerService.syncCatchFromDatabase(); // 订阅 zlm启动事件, 新的zlm也会从这里进入系统 hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,null, (MediaServerItem mediaServerItem, JSONObject response)->{ @@ -145,7 +144,6 @@ public class ZLMRunner implements CommandLineRunner { JSONArray data = responseJSON.getJSONArray("data"); if (data != null && data.size() > 0) { ZLMServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class); - ZLMServerConfig.setIp(mediaServerItem.getIp()); } } else { logger.error("[ {} ]-[ {}:{} ]第{}次主动连接失败, 2s后重试", diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMKeepliveTimeoutListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMKeepliveTimeoutListener.java index 16d8da73..042b2d12 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMKeepliveTimeoutListener.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMKeepliveTimeoutListener.java @@ -65,7 +65,7 @@ public class ZLMKeepliveTimeoutListener extends RedisKeyExpirationEventMessageLi if (mediaServerConfig == null) { publisher.zlmOfflineEventPublish(mediaServerId); }else { - logger.info("[zlm心跳到期]：{}验证后zlm仍在线，回复心跳信息", mediaServerId); + logger.info("[zlm心跳到期]：{}验证后zlm仍在线，恢复心跳信息", mediaServerId); // 添加zlm信息 mediaServerService.updateMediaServerKeepalive(mediaServerId, mediaServerConfig); } diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java index 41c59aa9..ec2714fd 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java @@ -22,7 +22,7 @@ public interface IMediaServerService { MediaServerItem getOne(String generalMediaServerId); - MediaServerItem getOneByHostAndPort(String host, int port); + void syncCatchFromDatabase(); /** * 新的节点加入 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 ccb2520a..507d4e66 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 @@ -30,7 +30,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; +import org.springframework.transaction.TransactionDefinition; +import org.springframework.transaction.TransactionStatus; import org.springframework.util.StringUtils; import java.text.ParseException; @@ -64,6 +68,12 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR @Autowired private MediaServerMapper mediaServerMapper; + @Autowired + DataSourceTransactionManager dataSourceTransactionManager; + + @Autowired + TransactionDefinition transactionDefinition; + @Autowired private VideoStreamSessionManager streamSession; @@ -266,11 +276,6 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR return (MediaServerItem)redisUtil.get(key); } - @Override - public MediaServerItem getOneByHostAndPort(String host, int port) { - return mediaServerMapper.queryOneByHostAndPort(host, port); - } - @Override public MediaServerItem getDefaultMediaServer() { return mediaServerMapper.queryDefault(); @@ -323,7 +328,22 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR @Override public int updateToDatabase(MediaServerItem mediaSerItem) { - return mediaServerMapper.update(mediaSerItem); + int result = 0; + if (mediaSerItem.isDefaultServer()) { + TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition); + int delResult = mediaServerMapper.delDefault(); + if (delResult == 0) { + logger.error("移除数据库默认zlm节点失败"); + //事务回滚 + dataSourceTransactionManager.rollback(transactionStatus); + return 0; + } + result = mediaServerMapper.add(mediaSerItem); + dataSourceTransactionManager.commit(transactionStatus); //手动提交 + }else { + result = mediaServerMapper.update(mediaSerItem); + } + return result; } /** @@ -332,15 +352,13 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR */ @Override public void zlmServerOnline(ZLMServerConfig zlmServerConfig) { - logger.info("[ ZLM：{} ]-[ {}:{} ]已连接", + logger.info("[ ZLM：{} ]-[ {}:{} ]正在连接", zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort()); MediaServerItem serverItem = mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId()); if (serverItem == null) { - serverItem = mediaServerMapper.queryOneByHostAndPort(zlmServerConfig.getIp(), zlmServerConfig.getHttpPort()); - } - if (serverItem == null) { - logger.warn("[未注册的zlm] 拒接接入：来自{}：{}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() ); + logger.warn("[未注册的zlm] 拒接接入：{}来自{}：{}", zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() ); + logger.warn("请检查ZLM的配置是否与WVP的一致"); return; } serverItem.setHookAliveInterval(zlmServerConfig.getHookAliveInterval()); @@ -368,11 +386,10 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR serverItem.setStatus(true); if (StringUtils.isEmpty(serverItem.getId())) { - serverItem.setId(zlmServerConfig.getGeneralMediaServerId()); - mediaServerMapper.updateByHostAndPort(serverItem); - }else { - mediaServerMapper.update(serverItem); + logger.warn("[未注册的zlm] serverItem缺少ID， 无法接入：{}：{}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() ); + return; } + mediaServerMapper.update(serverItem); String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + zlmServerConfig.getGeneralMediaServerId(); if (redisUtil.get(key) == null) { SsrcConfig ssrcConfig = new SsrcConfig(zlmServerConfig.getGeneralMediaServerId(), null, sipConfig.getDomain()); @@ -387,7 +404,8 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR setZLMConfig(serverItem, "0".equals(zlmServerConfig.getHookEnable())); publisher.zlmOnlineEventPublish(serverItem.getId()); - + logger.info("[ ZLM：{} ]-[ {}:{} ]连接成功", + zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort()); } @@ -464,7 +482,7 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR */ @Override public void setZLMConfig(MediaServerItem mediaServerItem, boolean restart) { - logger.info("[ ZLM：{} ]-[ {}:{} ]设置zlm", + logger.info("[ ZLM：{} ]-[ {}:{} ]正在设置zlm", mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort()); String protocol = sslEnabled ? "https" : "http"; String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort); @@ -601,4 +619,21 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR int hookAliveInterval = mediaServerItem.getHookAliveInterval() + 2; redisUtil.set(key, data, hookAliveInterval); } + + @Override + public void syncCatchFromDatabase() { + List allInCatch = getAll(); + List allInDatabase = mediaServerMapper.queryAll(); + Map mediaServerItemMap = new HashMap<>(); + + for (MediaServerItem mediaServerItem : allInDatabase) { + mediaServerItemMap.put(mediaServerItem.getId(), mediaServerItem); + } + for (MediaServerItem mediaServerItem : allInCatch) { + if (mediaServerItemMap.get(mediaServerItem) == null) { + delete(mediaServerItem.getId()); + } + } + } + } diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java index abcb1f4e..723e9f13 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java @@ -397,12 +397,6 @@ public interface IVideoManagerStorager { */ void updateParentPlatformStatus(String platformGbID, boolean online); - /** - * 更新媒体节点 - * @param mediaServerItem - */ - void updateMediaServer(MediaServerItem mediaServerItem); - /** * 根据媒体ID获取启用/不启用的代理列表 * @param id 媒体ID diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java index 32dd7df5..9de19df6 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java @@ -56,27 +56,21 @@ public interface DeviceChannelMapper { @Select(value = {" "}) List queryChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online); - @Select("SELECT * FROM device_channel WHERE deviceId=#{deviceId}") - List queryChannelsByDeviceId(String deviceId); - @Select("SELECT * FROM device_channel WHERE deviceId=#{deviceId} AND channelId=#{channelId}") DeviceChannel queryChannel(String deviceId, String channelId); @@ -100,7 +94,7 @@ public interface DeviceChannelMapper { "dc.name, " + "de.manufacturer, " + "de.hostAddress, " + - "(SELECT count(0) FROM device_channel WHERE parentId = dc.channelId) as subCount, " + + "dc.subCount, " + "pgc.platformId as platformId, " + "pgc.catalogId as catalogId " + "FROM device_channel dc " + @@ -130,13 +124,13 @@ public interface DeviceChannelMapper { @Insert(""}) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java index 4e09e797..0e37bbfa 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java @@ -1,10 +1,7 @@ package com.genersoft.iot.vmp.storager.dao; import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; -import org.apache.ibatis.annotations.Insert; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.*; import org.springframework.stereotype.Repository; import java.util.List; @@ -122,14 +119,14 @@ public interface MediaServerMapper { @Select("SELECT * FROM media_server") List queryAll(); - @Select("DELETE FROM media_server WHERE id='${id}'") + @Delete("DELETE FROM media_server WHERE id='${id}'") void delOne(String id); @Select("DELETE FROM media_server WHERE ip='${host}' and httpPort=${port}") void delOneByIPAndPort(String host, int port); - @Select("DELETE FROM media_server WHERE defaultServer=1;") - void delDefault(); + @Delete("DELETE FROM media_server WHERE defaultServer=1") + int delDefault(); @Select("SELECT * FROM media_server WHERE ip='${host}' and httpPort=${port}") MediaServerItem queryOneByHostAndPort(String host, int port); diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java index 54a3c571..f7454195 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java @@ -174,7 +174,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { List updateChannels = new ArrayList<>(); HashMap channelsInStore = new HashMap<>(); if (channels != null && channels.size() > 0) { - List channelList = deviceChannelMapper.queryChannelsByDeviceId(deviceId); + List channelList = deviceChannelMapper.queryChannels(deviceId, null, null, null, null); if (channelList.size() == 0) { for (DeviceChannel channel : channels) { channel.setDeviceId(deviceId); @@ -239,6 +239,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { // 数据去重 List channels = new ArrayList<>(); StringBuilder stringBuilder = new StringBuilder(); + Map subContMap = new HashMap<>(); if (deviceChannelList.size() > 1) { // 数据去重 Set gbIdSet = new HashSet<>(); @@ -246,10 +247,26 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { if (!gbIdSet.contains(deviceChannel.getChannelId())) { gbIdSet.add(deviceChannel.getChannelId()); channels.add(deviceChannel); + if (!StringUtils.isEmpty(deviceChannel.getParentId())) { + if (subContMap.get(deviceChannel.getParentId()) == null) { + subContMap.put(deviceChannel.getParentId(), 1); + }else { + Integer count = subContMap.get(deviceChannel.getParentId()); + subContMap.put(deviceChannel.getParentId(), count++); + } + } }else { stringBuilder.append(deviceChannel.getChannelId() + ","); } } + if (channels.size() > 0) { + for (DeviceChannel channel : channels) { + if (subContMap.get(channel.getChannelId()) != null){ + channel.setSubCount(subContMap.get(channel.getChannelId())); + } + } + } + }else { channels = deviceChannelList; } @@ -854,18 +871,6 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { platformMapper.updateParentPlatformStatus(platformGbID, online); } - @Override - public void updateMediaServer(MediaServerItem mediaServerItem) { - String now = this.format.format(System.currentTimeMillis()); - mediaServerItem.setUpdateTime(now); - if (mediaServerMapper.queryOne(mediaServerItem.getId()) != null) { - mediaServerMapper.update(mediaServerItem); - }else { - mediaServerItem.setCreateTime(now); - mediaServerMapper.add(mediaServerItem); - } - } - @Override public List getStreamProxyListForEnableInMediaServer(String id, boolean enable, boolean status) { return streamProxyMapper.selectForEnableInMediaServer(id, enable, status); diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java index 4e223e98..c27fb0e1 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java @@ -58,8 +58,6 @@ public class ServerController { @GetMapping(value = "/media_server/list") @ResponseBody public WVPResult> getMediaServerList(boolean detail){ - List all = mediaServerService.getAll(); - WVPResult> result = new WVPResult<>(); result.setCode(0); result.setMsg("success"); diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index 4d49661a..e3b1ad18 100644 --- a/src/main/resources/all-application.yml +++ b/src/main/resources/all-application.yml @@ -93,7 +93,7 @@ sip: #zlm 默认服务器配置 media: - # [可选] zlm服务器唯一id，用于触发hook时区别是哪台服务器,general.mediaServerId + # [必须修改] zlm服务器唯一id，用于触发hook时区别是哪台服务器,general.mediaServerId id: # [必须修改] zlm服务器的内网IP ip: 192.168.0.100 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b104be9a..55738fbf 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -48,6 +48,8 @@ sip: #zlm 默认服务器配置 media: + # [必须修改] zlm服务器唯一id，用于触发hook时区别是哪台服务器,general.mediaServerId + id: # [必须修改] zlm服务器的内网IP ip: # [必须修改] zlm服务器的http.port diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml index 98c13358..96a9ad0c 100644 --- a/src/main/resources/application-docker.yml +++ b/src/main/resources/application-docker.yml @@ -48,6 +48,8 @@ sip: #zlm 默认服务器配置 media: + # [必须修改] zlm服务器唯一id，用于触发hook时区别是哪台服务器,general.mediaServerId + id: # [必须修改] zlm服务器的内网IP ip: ${ZLM_HOST:127.0.0.1} # [必须修改] zlm服务器的http.port diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index 7dda69ad..3cd4bc9e 100644 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -84,7 +84,7 @@ 播放 停止 - 查看 + 查看 设备录象