From 2a1f979651340fbf9b530ab2d2f9e5857cbeeb1a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 十二月 2021 17:37:29 +0800
Subject: [PATCH] 简化zlm节点接入逻辑
---
src/main/java/com/genersoft/iot/vmp/conf/MediaStatusTimerTask.java | 16 ++
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 1
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 45 ++----
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java | 3
src/main/java/com/genersoft/iot/vmp/conf/runner/SipDeviceRunner.java | 2
web_src/src/components/MediaServerManger.vue | 11 +
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 36 +++++-
src/main/java/com/genersoft/iot/vmp/conf/ThreadPoolTaskConfig.java | 2
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 148 ++++++++++++++----------
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 2
web_src/src/components/dialog/MediaServerEdit.vue | 57 ++++----
11 files changed, 194 insertions(+), 129 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaStatusTimerTask.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaStatusTimerTask.java
new file mode 100644
index 0000000..cb9de7d
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaStatusTimerTask.java
@@ -0,0 +1,16 @@
+package com.genersoft.iot.vmp.conf;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.scheduling.annotation.Scheduled;
+
+/**
+ * 瀹氭椂鍚憐lm鍚屾濯掍綋娴佺姸鎬�
+ */
+public class MediaStatusTimerTask {
+
+
+ @Scheduled(fixedRate = 2 * 1000) //姣�3绉掓墽琛屼竴娆�
+ public void execute(){
+
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
index dd99d02..93b975e 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -18,6 +18,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.ConnectException;
@@ -126,7 +127,11 @@
MediaServerItem getMediaInfoByUri(String uri){
String[] split = uri.split("/");
String mediaServerId = split[2];
- return mediaServerService.getOne(mediaServerId);
+ if ("default".equals(mediaServerId)) {
+ return mediaServerService.getDefaultMediaServer();
+ }else {
+ return mediaServerService.getOne(mediaServerId);
+ }
}
/**
@@ -140,13 +145,13 @@
if (mediaInfo == null) {
return url;
}
- return url.replace(mediaInfo.getId() + "/", "");
+ return url.replace(mediaInfo.getId() + "/", "").replace("default/", "");
}
}
@Bean
public ServletRegistrationBean recordServletRegistrationBean(){
- ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new RecordProxySerlet(),"/record_proxy/*");
+ ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new RecordProxyServlet(),"/record_proxy/*");
servletRegistrationBean.setName("record_proxy");
servletRegistrationBean.addInitParameter("targetUri", "http://127.0.0.1:18081");
servletRegistrationBean.addUrlMappings();
@@ -156,8 +161,22 @@
return servletRegistrationBean;
}
- class RecordProxySerlet extends ProxyServlet{
+ class RecordProxyServlet extends ProxyServlet{
+ @Override
+ protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest, String queryString) {
+ String queryStr = super.rewriteQueryStringFromRequest(servletRequest, queryString);
+ MediaServerItem mediaInfo = getMediaInfoByUri(servletRequest.getRequestURI());
+ String remoteHost = String.format("http://%s:%s", mediaInfo.getIp(), mediaInfo.getHttpPort());
+ if (mediaInfo != null) {
+ if (!StringUtils.isEmpty(queryStr)) {
+ queryStr += "&remoteHost=" + remoteHost;
+ }else {
+ queryStr = "remoteHost=" + remoteHost;
+ }
+ }
+ return queryStr;
+ }
/**
* 寮傚父澶勭悊
@@ -222,7 +241,12 @@
MediaServerItem getMediaInfoByUri(String uri){
String[] split = uri.split("/");
String mediaServerId = split[2];
- return mediaServerService.getOne(mediaServerId);
+ if ("default".equals(mediaServerId)) {
+ return mediaServerService.getDefaultMediaServer();
+ }else {
+ return mediaServerService.getOne(mediaServerId);
+ }
+
}
/**
@@ -236,7 +260,7 @@
if (mediaInfo == null) {
return url;
}
- return url.replace(mediaInfo.getId() + "/", "");
+ return url.replace(mediaInfo.getId() + "/", "").replace("default/", "");
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ThreadPoolTaskConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/ThreadPoolTaskConfig.java
index 2ef3323..bde6b3f 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ThreadPoolTaskConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ThreadPoolTaskConfig.java
@@ -38,7 +38,7 @@
/**
* 绾跨▼姹犲悕鍓嶇紑
*/
- private static final String threadNamePrefix = "wvp-sip-handle-";
+ private static final String threadNamePrefix = "wvp-sip-";
@Bean("taskExecutor") // bean鐨勫悕绉帮紝榛樿涓洪瀛楁瘝灏忓啓鐨勬柟娉曞悕
public ThreadPoolTaskExecutor taskExecutor() {
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipDeviceRunner.java b/src/main/java/com/genersoft/iot/vmp/conf/runner/SipDeviceRunner.java
similarity index 96%
rename from src/main/java/com/genersoft/iot/vmp/conf/SipDeviceRunner.java
rename to src/main/java/com/genersoft/iot/vmp/conf/runner/SipDeviceRunner.java
index da1664b..f944b11 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipDeviceRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/runner/SipDeviceRunner.java
@@ -1,4 +1,4 @@
-package com.genersoft.iot.vmp.conf;
+package com.genersoft.iot.vmp.conf.runner;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
index 420a30a..f3d542c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -70,6 +70,7 @@
try {
tcpListeningPoint = sipStack.createListeningPoint(sipConfig.getMonitorIp(), sipConfig.getPort(), "TCP");
tcpSipProvider = (SipProviderImpl)sipStack.createSipProvider(tcpListeningPoint);
+ tcpSipProvider.setDialogErrorsAutomaticallyHandled();
tcpSipProvider.addSipListener(sipProcessorObserver);
logger.info("Sip Server TCP 鍚姩鎴愬姛 port {" + sipConfig.getMonitorIp() + ":" + sipConfig.getPort() + "}");
} catch (TransportNotSupportedException e) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
index 3724a3b..116236f 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
@@ -4,12 +4,11 @@
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.response.ISIPResponseProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.timeout.ITimeoutProcessor;
+import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import javax.sip.*;
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 f20f74d..c77bd80 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
@@ -12,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import java.util.*;
@@ -41,22 +43,9 @@
@Override
public void run(String... strings) throws Exception {
- // 娓呮redis缂撳瓨鐨勫湪绾縵lm淇℃伅
- mediaServerService.clearMediaServerForOnline();
-
- // 灏嗛厤缃枃浠剁殑meida閰嶇疆鍐欏叆鏁版嵁搴�
-// MediaServerItem presetMediaServer = mediaServerService.getOneByHostAndPort(
-// mediaConfig.getIp(), mediaConfig.getHttpPort());
-// if (presetMediaServer != null) {
-// MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
-// mediaSerItem.setId(presetMediaServer.getId());
-// mediaServerService.update(mediaSerItem);
-// }else {
-// if (mediaConfig.getId() != null) {
-// MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
-// mediaServerService.add(mediaSerItem);
-// }
-// }
+ if (mediaServerService.getDefaultMediaServer() == null) {
+ mediaServerService.addToDatabase(mediaConfig.getMediaSerItem());
+ }
// 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,null,
@@ -65,7 +54,6 @@
if (zlmServerConfig !=null ) {
startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId());
mediaServerService.handLeZLMServerConfig(zlmServerConfig);
-// zLmRunning(zlmServerConfig);
}
});
@@ -80,17 +68,7 @@
for (MediaServerItem mediaServerItem : all) {
if (startGetMedia == null) startGetMedia = new HashMap<>();
startGetMedia.put(mediaServerItem.getId(), true);
- new Thread(() -> {
-
- ZLMServerConfig zlmServerConfig = getMediaServerConfig(mediaServerItem);
- if (zlmServerConfig != null) {
- zlmServerConfig.setIp(mediaServerItem.getIp());
- zlmServerConfig.setHttpPort(mediaServerItem.getHttpPort());
- startGetMedia.remove(mediaServerItem.getId());
- mediaServerService.handLeZLMServerConfig(zlmServerConfig);
- }
-
- }).start();
+ connectZlmServer(mediaServerItem);
}
Timer timer = new Timer();
// 2鍒嗛挓鍚庢湭杩炴帴鍒板垯涓嶅啀鍘讳富鍔ㄨ繛鎺�, TODO 骞跺閲嶅惎鍓嶄娇鐢ㄦ鍦▃lm鐨勯�氶亾鍙戦�乥ye
@@ -109,6 +87,17 @@
}, 60 * 1000 * 2);
}
+ @Async
+ public void connectZlmServer(MediaServerItem mediaServerItem){
+ ZLMServerConfig zlmServerConfig = getMediaServerConfig(mediaServerItem);
+ if (zlmServerConfig != null) {
+ zlmServerConfig.setIp(mediaServerItem.getIp());
+ zlmServerConfig.setHttpPort(mediaServerItem.getHttpPort());
+ startGetMedia.remove(mediaServerItem.getId());
+ mediaServerService.handLeZLMServerConfig(zlmServerConfig);
+ }
+ }
+
public ZLMServerConfig getMediaServerConfig(MediaServerItem mediaServerItem) {
if (startGetMedia == null) { return null;}
if (!mediaServerItem.isDefaultServer() && mediaServerService.getOne(mediaServerItem.getId()) == null) {
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 657d280..43d36d9 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -54,6 +54,8 @@
WVPResult<String> add(MediaServerItem mediaSerItem);
+ int addToDatabase(MediaServerItem mediaSerItem);
+
void resetOnlineServerItem(MediaServerItem serverItem);
WVPResult<MediaServerItem> checkMediaServer(String ip, int port, String secret);
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 51f99d9..e457a33 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
@@ -27,6 +27,7 @@
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -80,6 +81,9 @@
logger.info("Media Server 缂撳瓨鍒濆鍖�");
List<MediaServerItem> mediaServerItemList = mediaServerMapper.queryAll();
for (MediaServerItem mediaServerItem : mediaServerItemList) {
+ if (StringUtils.isEmpty(mediaServerItem.getId())) {
+ continue;
+ }
// 鏇存柊
if (mediaServerItem.getSsrcConfig() == null) {
SsrcConfig ssrcConfig = new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain());
@@ -283,6 +287,11 @@
return result;
}
+ @Override
+ public int addToDatabase(MediaServerItem mediaSerItem) {
+ return mediaServerMapper.add(mediaSerItem);
+ }
+
/**
* 澶勭悊zlm涓婄嚎
* @param zlmServerConfig zlm涓婄嚎鎼哄甫鐨勫弬鏁�
@@ -296,69 +305,84 @@
if (serverItem == null) {
serverItem = mediaServerMapper.queryOneByHostAndPort(zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
}
- if (zlmServerConfig.getGeneralMediaServerId().equals(mediaConfig.getId())
- || (zlmServerConfig.getIp().equals(mediaConfig.getIp()) && zlmServerConfig.getHttpPort() == mediaConfig.getHttpPort())) {
- // 閰嶇疆鏂囦欢鐨剒lm
- // 濡傛灉鏄厤缃枃浠朵腑鐨剒lm銆� 涔熷氨鏄粯璁lm銆� 涓�鍒囦互閰嶇疆鏂囦欢鍐呭涓哄噯
- // docker閮ㄧ讲涓嶄細浣跨敤zlm閰嶇疆鐨勭鍙ｅ彿涓嶆槸榛樿鐨勫垯涓嶅仛鏇存柊锛� 閰嶇疆淇敼闇�瑕佽嚜琛屼慨鏀箂erver閰嶇疆;
- MediaServerItem serverItemFromConfig = mediaConfig.getMediaSerItem();
- serverItemFromConfig.setId(zlmServerConfig.getGeneralMediaServerId());
- if (mediaConfig.getHttpPort() == 0) {
- serverItemFromConfig.setHttpPort(zlmServerConfig.getHttpPort());
- }
- if (mediaConfig.getHttpSSlPort() == 0) {
- serverItemFromConfig.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
- }
- if (mediaConfig.getRtmpPort() == 0) {
- serverItemFromConfig.setRtmpPort(zlmServerConfig.getRtmpPort());
- }
- if (mediaConfig.getRtmpSSlPort() == 0) {
- serverItemFromConfig.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
- }
- if (mediaConfig.getRtspPort() == 0) {
- serverItemFromConfig.setRtspPort(zlmServerConfig.getRtspPort());
- }
- if (mediaConfig.getRtspSSLPort() == 0) {
- serverItemFromConfig.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
- }
- if (mediaConfig.getRtpProxyPort() == 0) {
- serverItemFromConfig.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
- }
- if (serverItem != null){
- mediaServerMapper.delDefault();
- mediaServerMapper.add(serverItemFromConfig);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
- MediaServerItem serverItemInRedis = (MediaServerItem)redisUtil.get(key);
- if (serverItemInRedis != null) {
- serverItemFromConfig.setSsrcConfig(serverItemInRedis.getSsrcConfig());
- }else {
- serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
- }
- redisUtil.set(key, serverItemFromConfig);
- }else {
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
- serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
- redisUtil.set(key, serverItemFromConfig);
- mediaServerMapper.add(serverItemFromConfig);
- }
- resetOnlineServerItem(serverItemFromConfig);
- setZLMConfig(serverItemFromConfig);
- }else {
- String now = this.format.format(System.currentTimeMillis());
- if (serverItem == null){
- // 涓�涓柊鐨剒lm鎺ュ叆wvp
- serverItem = new MediaServerItem(zlmServerConfig, sipConfig.getIp());
- serverItem.setCreateTime(now);
- serverItem.setUpdateTime(now);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId();
- serverItem.setSsrcConfig(new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain()));
- redisUtil.set(key, serverItem);
- // 瀛樺叆鏁版嵁搴�
- mediaServerMapper.add(serverItem);
- setZLMConfig(serverItem);
- }
- resetOnlineServerItem(serverItem);
+ if (serverItem == null) {
+ logger.warn("[鏈敞鍐岀殑zlm] 鎷掓帴鎺ュ叆锛氭潵鑷獅}锛歿}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
+ return;
}
+ if (StringUtils.isEmpty(serverItem.getId())) {
+ serverItem.setId(zlmServerConfig.getGeneralMediaServerId());
+ redisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId(), serverItem);
+ }
+ serverItem.setStatus(true);
+ mediaServerMapper.update(serverItem);
+ resetOnlineServerItem(serverItem);
+ setZLMConfig(serverItem);
+
+// if (zlmServerConfig.getGeneralMediaServerId().equals(mediaConfig.getId())
+// || (zlmServerConfig.getIp().equals(mediaConfig.getIp()) && zlmServerConfig.getHttpPort() == mediaConfig.getHttpPort())) {
+// // 閰嶇疆鏂囦欢鐨剒lm
+// // 濡傛灉鏄厤缃枃浠朵腑鐨剒lm銆� 涔熷氨鏄粯璁lm銆� 涓�鍒囦互閰嶇疆鏂囦欢鍐呭涓哄噯
+// // wvp浜掓儬淇敼zlm鐨勭鍙ｏ紝闇�瑕佽嚜琛岄厤缃��
+// MediaServerItem serverItemFromConfig = mediaConfig.getMediaSerItem();
+// serverItemFromConfig.setId(zlmServerConfig.getGeneralMediaServerId());
+// if (mediaConfig.getHttpPort() == 0) {
+// serverItemFromConfig.setHttpPort(zlmServerConfig.getHttpPort());
+// }
+// if (mediaConfig.getHttpSSlPort() == 0) {
+// serverItemFromConfig.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
+// }
+// if (mediaConfig.getRtmpPort() == 0) {
+// serverItemFromConfig.setRtmpPort(zlmServerConfig.getRtmpPort());
+// }
+// if (mediaConfig.getRtmpSSlPort() == 0) {
+// serverItemFromConfig.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
+// }
+// if (mediaConfig.getRtspPort() == 0) {
+// serverItemFromConfig.setRtspPort(zlmServerConfig.getRtspPort());
+// }
+// if (mediaConfig.getRtspSSLPort() == 0) {
+// serverItemFromConfig.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
+// }
+// if (mediaConfig.getRtpProxyPort() == 0) {
+// serverItemFromConfig.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
+// }
+// if (serverItem != null){
+// mediaServerMapper.delDefault();
+// mediaServerMapper.add(serverItemFromConfig);
+// String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
+// MediaServerItem serverItemInRedis = (MediaServerItem)redisUtil.get(key);
+// if (serverItemInRedis != null) {
+// serverItemFromConfig.setSsrcConfig(serverItemInRedis.getSsrcConfig());
+// }else {
+// serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
+// }
+// redisUtil.set(key, serverItemFromConfig);
+// }else {
+// String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
+// serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
+// redisUtil.set(key, serverItemFromConfig);
+// mediaServerMapper.add(serverItemFromConfig);
+// }
+// resetOnlineServerItem(serverItemFromConfig);
+// setZLMConfig(serverItemFromConfig);
+// }
+ // 绉婚櫎鏈坊鍔犵殑zlm鐨勬帴鍏ワ紝鎵�鏈夌殑zlm蹇呴』鍏堟坊鍔犲悗鎵嶅彲浠ュ姞鍏ヤ娇鐢�
+// else {
+// String now = this.format.format(System.currentTimeMillis());
+// if (serverItem == null){
+// // 涓�涓柊鐨剒lm鎺ュ叆wvp
+// serverItem = new MediaServerItem(zlmServerConfig, sipConfig.getIp());
+// serverItem.setCreateTime(now);
+// serverItem.setUpdateTime(now);
+// String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId();
+// serverItem.setSsrcConfig(new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain()));
+// redisUtil.set(key, serverItem);
+// // 瀛樺叆鏁版嵁搴�
+// mediaServerMapper.add(serverItem);
+// setZLMConfig(serverItem);
+// }
+// resetOnlineServerItem(serverItem);
+// }
}
@Override
diff --git a/web_src/src/components/MediaServerManger.vue b/web_src/src/components/MediaServerManger.vue
index 07b0523..c412bcb 100644
--- a/web_src/src/components/MediaServerManger.vue
+++ b/web_src/src/components/MediaServerManger.vue
@@ -18,7 +18,8 @@
<div class="card-img-zlm"></div>
<div style="padding: 14px;text-align: left">
<span style="font-size: 16px">{{item.id}}</span>
- <el-button icon="el-icon-edit" style="padding: 0;float: right;" type="text" @click="edit(item)">缂栬緫</el-button>
+ <el-button v-if="!item.defaultServer" icon="el-icon-edit" style="padding: 0;float: right;" type="text" @click="edit(item)">缂栬緫</el-button>
+ <el-button v-if="item.defaultServer" icon="el-icon-edit" style="padding: 0;float: right;" type="text" @click="edit(item)">鏌ョ湅</el-button>
<el-button icon="el-icon-delete" style="margin-right: 10px;padding: 0;float: right;" type="text" @click="del(item)">绉婚櫎</el-button>
<div style="margin-top: 13px; line-height: 12px; ">
<span style="font-size: 14px; color: #999; margin-top: 5px; ">{{item.ip}}</span>
@@ -27,6 +28,7 @@
</div>
<i v-if="item.status" class="iconfont icon-online server-card-status-online" title="鍦ㄧ嚎"></i>
<i v-if="!item.status" class="iconfont icon-online server-card-status-offline" title="绂荤嚎"></i>
+ <i v-if="item.defaultServer" class="server-card-default" >榛樿</i>
</el-card>
</el-col>
</el-row>
@@ -173,6 +175,13 @@
color: #808080;
font-size: 18px;
}
+ .server-card-default{
+ position: absolute;
+ left: 20px;
+ top: 20px;
+ color: #808080;
+ font-size: 18px;
+ }
.server-card:hover {
border: 1px solid #adadad;
}
diff --git a/web_src/src/components/dialog/MediaServerEdit.vue b/web_src/src/components/dialog/MediaServerEdit.vue
index 8dab76b..7206bac 100644
--- a/web_src/src/components/dialog/MediaServerEdit.vue
+++ b/web_src/src/components/dialog/MediaServerEdit.vue
@@ -12,13 +12,13 @@
<div id="formStep" style="margin-top: 1rem; margin-right: 20px;">
<el-form v-if="currentStep == 1" ref="mediaServerForm" :rules="rules" :model="mediaServerForm" label-width="140px" >
<el-form-item label="IP" prop="ip">
- <el-input v-model="mediaServerForm.ip" placeholder="濯掍綋鏈嶅姟IP" clearable></el-input>
+ <el-input v-model="mediaServerForm.ip" placeholder="濯掍綋鏈嶅姟IP" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="HTTP绔彛" prop="httpPort">
- <el-input v-model="mediaServerForm.httpPort" placeholder="濯掍綋鏈嶅姟HTTP绔彛" clearable></el-input>
+ <el-input v-model="mediaServerForm.httpPort" placeholder="濯掍綋鏈嶅姟HTTP绔彛" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="SECRET" prop="secret">
- <el-input v-model="mediaServerForm.secret" placeholder="濯掍綋鏈嶅姟SECRET" clearable></el-input>
+ <el-input v-model="mediaServerForm.secret" placeholder="濯掍綋鏈嶅姟SECRET" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item>
<div style="float: right;">
@@ -34,34 +34,34 @@
<el-col :span="12">
<el-form v-if="currentStep === 2 || currentStep === 3" ref="mediaServerForm1" :rules="rules" :model="mediaServerForm" label-width="140px" >
<el-form-item label="IP" prop="ip">
- <el-input v-if="currentStep === 2" v-model="mediaServerForm.ip" disabled></el-input>
- <el-input v-if="currentStep === 3" v-model="mediaServerForm.ip"></el-input>
+ <el-input v-if="currentStep === 2" v-model="mediaServerForm.ip" disabled :disabled="mediaServerForm.defaultServer"></el-input>
+ <el-input v-if="currentStep === 3" v-model="mediaServerForm.ip" :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="HTTP绔彛" prop="httpPort">
- <el-input v-if="currentStep === 2" v-model="mediaServerForm.httpPort" disabled></el-input>
- <el-input v-if="currentStep === 3" v-model="mediaServerForm.httpPort"></el-input>
+ <el-input v-if="currentStep === 2" v-model="mediaServerForm.httpPort" disabled :disabled="mediaServerForm.defaultServer"></el-input>
+ <el-input v-if="currentStep === 3" v-model="mediaServerForm.httpPort" :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="SECRET" prop="secret">
- <el-input v-if="currentStep === 2" v-model="mediaServerForm.secret" disabled></el-input>
- <el-input v-if="currentStep === 3" v-model="mediaServerForm.secret"></el-input>
+ <el-input v-if="currentStep === 2" v-model="mediaServerForm.secret" disabled :disabled="mediaServerForm.defaultServer"></el-input>
+ <el-input v-if="currentStep === 3" v-model="mediaServerForm.secret" :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="HOOK IP" prop="ip">
- <el-input v-model="mediaServerForm.hookIp" placeholder="濯掍綋鏈嶅姟HOOK_IP" clearable></el-input>
+ <el-input v-model="mediaServerForm.hookIp" placeholder="濯掍綋鏈嶅姟HOOK_IP" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="SDP IP" prop="ip">
- <el-input v-model="mediaServerForm.sdpIp" placeholder="濯掍綋鏈嶅姟SDP_IP" clearable></el-input>
+ <el-input v-model="mediaServerForm.sdpIp" placeholder="濯掍綋鏈嶅姟SDP_IP" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="娴両P" prop="ip">
- <el-input v-model="mediaServerForm.streamIp" placeholder="濯掍綋鏈嶅姟娴両P" clearable></el-input>
+ <el-input v-model="mediaServerForm.streamIp" placeholder="濯掍綋鏈嶅姟娴両P" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="HTTPS PORT" prop="httpSSlPort">
- <el-input v-model="mediaServerForm.httpSSlPort" placeholder="濯掍綋鏈嶅姟HTTPS_PORT" clearable></el-input>
+ <el-input v-model="mediaServerForm.httpSSlPort" placeholder="濯掍綋鏈嶅姟HTTPS_PORT" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="RTSP PORT" prop="rtspPort">
- <el-input v-model="mediaServerForm.rtspPort" placeholder="濯掍綋鏈嶅姟RTSP_PORT" clearable></el-input>
+ <el-input v-model="mediaServerForm.rtspPort" placeholder="濯掍綋鏈嶅姟RTSP_PORT" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="RTSPS PORT" prop="rtspSSLPort">
- <el-input v-model="mediaServerForm.rtspSSLPort" placeholder="濯掍綋鏈嶅姟RTSPS_PORT" clearable></el-input>
+ <el-input v-model="mediaServerForm.rtspSSLPort" placeholder="濯掍綋鏈嶅姟RTSPS_PORT" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
</el-form>
@@ -69,36 +69,36 @@
<el-col :span="12">
<el-form v-if="currentStep === 2 || currentStep === 3" ref="mediaServerForm2" :rules="rules" :model="mediaServerForm" label-width="180px" >
<el-form-item label="RTMP PORT" prop="rtmpPort">
- <el-input v-model="mediaServerForm.rtmpPort" placeholder="濯掍綋鏈嶅姟RTMP_PORT" clearable></el-input>
+ <el-input v-model="mediaServerForm.rtmpPort" placeholder="濯掍綋鏈嶅姟RTMP_PORT" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="RTMPS PORT" prop="rtmpSSlPort">
- <el-input v-model="mediaServerForm.rtmpSSlPort" placeholder="濯掍綋鏈嶅姟RTMPS_PORT" clearable></el-input>
+ <el-input v-model="mediaServerForm.rtmpSSlPort" placeholder="濯掍綋鏈嶅姟RTMPS_PORT" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="鑷姩閰嶇疆濯掍綋鏈嶅姟" >
- <el-switch v-model="mediaServerForm.autoConfig"></el-switch>
+ <el-switch v-model="mediaServerForm.autoConfig" :disabled="mediaServerForm.defaultServer"></el-switch>
</el-form-item>
<el-form-item label="鏀舵祦绔彛妯″紡" >
- <el-switch active-text="澶氱鍙�" inactive-text="鍗曠鍙�" v-model="mediaServerForm.rtpEnable"></el-switch>
+ <el-switch active-text="澶氱鍙�" inactive-text="鍗曠鍙�" v-model="mediaServerForm.rtpEnable" :disabled="mediaServerForm.defaultServer"></el-switch>
</el-form-item>
<el-form-item v-if="!mediaServerForm.rtpEnable" label="鏀舵祦绔彛" prop="rtpProxyPort">
- <el-input v-model.number="mediaServerForm.rtpProxyPort" clearable></el-input>
+ <el-input v-model.number="mediaServerForm.rtpProxyPort" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item v-if="mediaServerForm.rtpEnable" label="鏀舵祦绔彛" >
- <el-input v-model="rtpPortRange1" placeholder="璧峰" @change="portRangeChange" clearable style="width: 100px" prop="rtpPortRange1"></el-input>
+ <el-input v-model="rtpPortRange1" placeholder="璧峰" @change="portRangeChange" clearable style="width: 100px" prop="rtpPortRange1" :disabled="mediaServerForm.defaultServer"></el-input>
-
- <el-input v-model="rtpPortRange2" placeholder="缁堟" @change="portRangeChange" clearable style="width: 100px" prop="rtpPortRange2"></el-input>
+ <el-input v-model="rtpPortRange2" placeholder="缁堟" @change="portRangeChange" clearable style="width: 100px" prop="rtpPortRange2" :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="鎺ㄦ祦绔彛" prop="sendRtpPortRange1">
- <el-input v-model="sendRtpPortRange1" placeholder="璧峰" @change="portRangeChange" clearable style="width: 100px" prop="sendRtpPortRange1"></el-input>
+ <el-input v-model="sendRtpPortRange1" placeholder="璧峰" @change="portRangeChange" clearable style="width: 100px" prop="sendRtpPortRange1" :disabled="mediaServerForm.defaultServer"></el-input>
-
- <el-input v-model="sendRtpPortRange2" placeholder="缁堟" @change="portRangeChange" clearable style="width: 100px" prop="sendRtpPortRange2"></el-input>
+ <el-input v-model="sendRtpPortRange2" placeholder="缁堟" @change="portRangeChange" clearable style="width: 100px" prop="sendRtpPortRange2" :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="鏃犱汉瑙傜湅澶氫箙鍚庡仠姝㈡媺娴�" >
- <el-input v-model.number="mediaServerForm.streamNoneReaderDelayMS" clearable></el-input>
+ <el-input v-model.number="mediaServerForm.streamNoneReaderDelayMS" clearable :disabled="mediaServerForm.defaultServer"></el-input>
</el-form-item>
<el-form-item label="褰曞儚绠＄悊鏈嶅姟绔彛" prop="recordAssistPort">
- <el-input v-model.number="mediaServerForm.recordAssistPort">
+ <el-input v-model.number="mediaServerForm.recordAssistPort" :disabled="mediaServerForm.defaultServer">
<!-- <el-button v-if="mediaServerForm.recordAssistPort > 0" slot="append" type="primary" @click="checkRecordServer">娴嬭瘯</el-button>-->
<el-button v-if="mediaServerForm.recordAssistPort > 0" class="el-icon-check" slot="append" type="primary" @click="checkRecordServer"></el-button>
</el-input>
@@ -108,8 +108,9 @@
</el-form-item>
<el-form-item>
<div style="float: right;">
- <el-button type="primary" @click="onSubmit" >鎻愪氦</el-button>
- <el-button @click="close">鍙栨秷</el-button>
+ <el-button v-if="!mediaServerForm.defaultServer" type="primary" @click="onSubmit" >鎻愪氦</el-button>
+ <el-button v-if="!mediaServerForm.defaultServer" @click="close">鍙栨秷</el-button>
+ <el-button v-if="mediaServerForm.defaultServer" @click="close">鍏抽棴</el-button>
</div>
</el-form-item>
</el-form>
--
Gitblit v1.8.0