From 3469271ec25c69e4528b085ba3be7d9d85ec519e Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 26 七月 2021 11:40:32 +0800
Subject: [PATCH] 优化集群方案, 每个zlm一套ssrc; 优化集群下的docker接入逻辑; 更正sql脚本; 支持重启不设置设备离线。重启SIP事务不丢失

---
 src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java |  190 ++++-------------------------------------------
 1 files changed, 16 insertions(+), 174 deletions(-)

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 f2a0bcd..744e56f 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -1,13 +1,16 @@
 package com.genersoft.iot.vmp.conf;
 
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
+import com.genersoft.iot.vmp.gb28181.session.SsrcConfig;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.StringUtils;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 @Configuration("mediaConfig")
-public class MediaConfig implements IMediaServerItem {
+public class MediaConfig{
 
     @Value("${media.id:}")
     private String id;
@@ -20,6 +23,9 @@
 
     @Value("${sip.ip}")
     private String sipIp;
+
+    @Value("${sip.domain}")
+    private String sipDomain;
 
     @Value("${media.sdp-ip:${media.ip}}")
     private String sdpIp;
@@ -66,29 +72,12 @@
     @Value("${media.record-assist-port:0}")
     private Integer recordAssistPort = 0;
 
-    private String updateTime;
-
-    private String createTime;
-
-    private boolean docker = false;
-
-    private int count;
-
-
     public String getId() {
         return id;
     }
 
-    public void setId(String id) {
-        this.id = id;
-    }
-    
     public String getIp() {
         return ip;
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
     }
 
     public String getHookIp() {
@@ -100,76 +89,24 @@
 
     }
 
-    public void setHookIp(String hookIp) {
-        this.hookIp = hookIp;
-    }
-
     public String getSipIp() {
         return sipIp;
-    }
-
-    public void setSipIp(String sipIp) {
-        this.sipIp = sipIp;
-    }
-
-    public void setSdpIp(String sdpIp) {
-        this.sdpIp = sdpIp;
-    }
-
-    public void setStreamIp(String streamIp) {
-        this.streamIp = streamIp;
     }
 
     public int getHttpPort() {
         return httpPort;
     }
 
-    @Override
-    public void setHttpPort(int httpPort) {
-
-    }
-
-    public void setHttpPort(Integer httpPort) {
-        this.httpPort = httpPort;
-    }
-
     public int getHttpSSlPort() {
         return httpSSlPort;
-    }
-
-    @Override
-    public void setHttpSSlPort(int httpSSlPort) {
-
-    }
-
-    public void setHttpSSlPort(Integer httpSSlPort) {
-        this.httpSSlPort = httpSSlPort;
     }
 
     public int getRtmpPort() {
         return rtmpPort;
     }
-
-    @Override
-    public void setRtmpPort(int rtmpPort) {
-
-    }
-
-    public void setRtmpPort(Integer rtmpPort) {
-        this.rtmpPort = rtmpPort;
-    }
-
+    
     public int getRtmpSSlPort() {
         return rtmpSSlPort;
-    }
-
-    @Override
-    public void setRtmpSSlPort(int rtmpSSlPort) {
-
-    }
-
-    public void setRtmpSSlPort(Integer rtmpSSlPort) {
-        this.rtmpSSlPort = rtmpSSlPort;
     }
 
     public int getRtpProxyPort() {
@@ -181,102 +118,36 @@
 
     }
 
-    @Override
-    public void setRtpProxyPort(int rtpProxyPort) {
-
-    }
-
-    public void setRtpProxyPort(Integer rtpProxyPort) {
-        this.rtpProxyPort = rtpProxyPort;
-    }
-
     public int getRtspPort() {
         return rtspPort;
-    }
-
-    @Override
-    public void setRtspPort(int rtspPort) {
-
-    }
-
-    public void setRtspPort(Integer rtspPort) {
-        this.rtspPort = rtspPort;
     }
 
     public int getRtspSSLPort() {
         return rtspSSLPort;
     }
 
-    @Override
-    public void setRtspSSLPort(int rtspSSLPort) {
-
-    }
-
-    public void setRtspSSLPort(Integer rtspSSLPort) {
-        this.rtspSSLPort = rtspSSLPort;
-    }
-
     public boolean isAutoConfig() {
         return autoConfig;
-    }
-
-    public void setAutoConfig(boolean autoConfig) {
-        this.autoConfig = autoConfig;
     }
 
     public String getSecret() {
         return secret;
     }
 
-    public void setSecret(String secret) {
-        this.secret = secret;
-    }
-
     public String getStreamNoneReaderDelayMS() {
         return streamNoneReaderDelayMS;
-    }
-
-    public void setStreamNoneReaderDelayMS(String streamNoneReaderDelayMS) {
-        this.streamNoneReaderDelayMS = streamNoneReaderDelayMS;
     }
 
     public boolean isRtpEnable() {
         return rtpEnable;
     }
 
-    public void setRtpEnable(boolean rtpEnable) {
-        this.rtpEnable = rtpEnable;
-    }
-
     public String getRtpPortRange() {
         return rtpPortRange;
     }
-
-    public void setRtpPortRange(String rtpPortRange) {
-        this.rtpPortRange = rtpPortRange;
-    }
-
+    
     public int getRecordAssistPort() {
         return recordAssistPort;
-    }
-
-    @Override
-    public void setRecordAssistPort(int recordAssistPort) {
-
-    }
-
-    public void setRecordAssistPort(Integer recordAssistPort) {
-        this.recordAssistPort = recordAssistPort;
-    }
-
-    @Override
-    public boolean isDocker() {
-        return docker;
-    }
-
-    @Override
-    public void setDocker(boolean docker) {
-        this.docker = docker;
     }
 
     public String getSdpIp() {
@@ -295,13 +166,11 @@
         }
     }
 
-
-
     public MediaServerItem getMediaSerItem(){
         MediaServerItem mediaServerItem = new MediaServerItem();
         mediaServerItem.setId(id);
         mediaServerItem.setIp(ip);
-        mediaServerItem.setDocker(true);
+        mediaServerItem.setDefaultServer(true);
         mediaServerItem.setHookIp(hookIp);
         mediaServerItem.setSdpIp(sdpIp);
         mediaServerItem.setStreamIp(streamIp);
@@ -318,39 +187,12 @@
         mediaServerItem.setRtpEnable(rtpEnable);
         mediaServerItem.setRtpPortRange(rtpPortRange);
         mediaServerItem.setRecordAssistPort(recordAssistPort);
-        mediaServerItem.setCreateTime(createTime);
-        mediaServerItem.setUpdateTime(updateTime);
-        mediaServerItem.setCount(count);
+
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        mediaServerItem.setCreateTime(format.format(new Date(System.currentTimeMillis())));
+        mediaServerItem.setUpdateTime(format.format(new Date(System.currentTimeMillis())));
+
         return mediaServerItem;
     }
 
-    @Override
-    public String getUpdateTime() {
-        return updateTime;
-    }
-
-    @Override
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    @Override
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    @Override
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    @Override
-    public int getCount() {
-        return count;
-    }
-
-    @Override
-    public void setCount(int count) {
-        this.count = count;
-    }
 }

--
Gitblit v1.8.0