From a2f08541387806c9299a43b38fbfeaa5da5904a9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 07 十二月 2021 17:43:55 +0800
Subject: [PATCH] 优化通道录入性能,优化启动后读取配置写入数据库的过程

---
 src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 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 e608361..0c7ef88 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -60,7 +60,7 @@
     private String secret;
 
     @Value("${media.stream-none-reader-delay-ms:18000}")
-    private String streamNoneReaderDelayMS = "18000";
+    private int streamNoneReaderDelayMS = 18000;
 
     @Value("${media.rtp.enable}")
     private boolean rtpEnable;
@@ -93,7 +93,11 @@
     }
 
     public String getSipIp() {
-        return sipIp;
+        if (sipIp == null) {
+            return this.ip;
+        }else {
+            return sipIp;
+        }
     }
 
     public int getHttpPort() {
@@ -137,7 +141,7 @@
         return secret;
     }
 
-    public String getStreamNoneReaderDelayMS() {
+    public int getStreamNoneReaderDelayMS() {
         return streamNoneReaderDelayMS;
     }
 
@@ -183,13 +187,13 @@
         mediaServerItem.setIp(ip);
         mediaServerItem.setDefaultServer(true);
         mediaServerItem.setHookIp(getHookIp());
-        mediaServerItem.setSdpIp(sdpIp);
-        mediaServerItem.setStreamIp(streamIp);
+        mediaServerItem.setSdpIp(getSdpIp());
+        mediaServerItem.setStreamIp(getStreamIp());
         mediaServerItem.setHttpPort(httpPort);
         mediaServerItem.setHttpSSlPort(httpSSlPort);
         mediaServerItem.setRtmpPort(rtmpPort);
         mediaServerItem.setRtmpSSlPort(rtmpSSlPort);
-        mediaServerItem.setRtpProxyPort(rtpProxyPort);
+        mediaServerItem.setRtpProxyPort(getRtpProxyPort());
         mediaServerItem.setRtspPort(rtspPort);
         mediaServerItem.setRtspSSLPort(rtspSSLPort);
         mediaServerItem.setAutoConfig(autoConfig);

--
Gitblit v1.8.0