guzijian / wvp-GB28181-pro · Commits

Commit 715c7d27243f2f583f6958b39b278a7b0a2642c8

Authored by 648540858
1 parent 27663736

docker镜像使用自动生成的配置文件，修复#166

Inline Side-by-side
Showing 2 changed files with 10 additions and 5 deletions
DOCKERFILE
  View file @715c7d2
@@ -68,6 +68,7 @@ RUN mkdir -p /opt/media && \ @@ -68,6 +68,7 @@ RUN mkdir -p /opt/media && \
68 cd build && \ 68 cd build && \
69 cmake -DCMAKE_BUILD_TYPE=Release .. && \ 69 cmake -DCMAKE_BUILD_TYPE=Release .. && \
70 make -j4 && \ 70 make -j4 && \
  71 + rm -rf ../release/linux/Release/config.ini && \
71 cp -r ../release/linux/Release/* /opt/media && \ 72 cp -r ../release/linux/Release/* /opt/media && \
72 mkdir -p /opt/media/www/record 73 mkdir -p /opt/media/www/record
73 74
@@ -89,7 +90,7 @@ RUN echo '#!/bin/bash' > run.sh && \ @@ -89,7 +90,7 @@ RUN echo '#!/bin/bash' > run.sh && \
89 echo 'nohup /opt/media/MediaServer -d -m 3 &' >> run.sh && \ 90 echo 'nohup /opt/media/MediaServer -d -m 3 &' >> run.sh && \
90 echo 'cd /opt/wvp' >> run.sh && \ 91 echo 'cd /opt/wvp' >> run.sh && \
91 echo 'if [${WVP_CONFIG}]; then' >> run.sh && \ 92 echo 'if [${WVP_CONFIG}]; then' >> run.sh && \
92 - echo ' java -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> run.sh && \ 93 + echo ' java -jar *.jar --spring.confi g.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> run.sh && \
93 echo 'else' >> run.sh && \ 94 echo 'else' >> run.sh && \
94 echo ' java -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 --media.ip=127.0.0.1 --media.sdp-ip=${WVP_IP} --sip.ip=${WVP_IP} --media.stream-ip=${WVP_IP}' >> run.sh && \ 95 echo ' java -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 --media.ip=127.0.0.1 --media.sdp-ip=${WVP_IP} --sip.ip=${WVP_IP} --media.stream-ip=${WVP_IP}' >> run.sh && \
95 echo 'fi' >> run.sh 96 echo 'fi' >> run.sh
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
  View file @715c7d2
@@ -93,7 +93,11 @@ public class MediaConfig{ @@ -93,7 +93,11 @@ public class MediaConfig{
93 } 93 }
94 94
95 public String getSipIp() { 95 public String getSipIp() {
96 - return sipIp; 96 + if (sipIp == null) {
  97 + return this.ip;
  98 + }else {
  99 + return sipIp;
  100 + }
97 } 101 }
98 102
99 public int getHttpPort() { 103 public int getHttpPort() {
@@ -183,13 +187,13 @@ public class MediaConfig{ @@ -183,13 +187,13 @@ public class MediaConfig{
183 mediaServerItem.setIp(ip); 187 mediaServerItem.setIp(ip);
184 mediaServerItem.setDefaultServer(true); 188 mediaServerItem.setDefaultServer(true);
185 mediaServerItem.setHookIp(getHookIp()); 189 mediaServerItem.setHookIp(getHookIp());
186 - mediaServerItem.setSdpIp(sdpIp);  
187 - mediaServerItem.setStreamIp(streamIp); 190 + mediaServerItem.setSdpIp(getSdpIp());
  191 + mediaServerItem.setStreamIp(getStreamIp());
188 mediaServerItem.setHttpPort(httpPort); 192 mediaServerItem.setHttpPort(httpPort);
189 mediaServerItem.setHttpSSlPort(httpSSlPort); 193 mediaServerItem.setHttpSSlPort(httpSSlPort);
190 mediaServerItem.setRtmpPort(rtmpPort); 194 mediaServerItem.setRtmpPort(rtmpPort);
191 mediaServerItem.setRtmpSSlPort(rtmpSSlPort); 195 mediaServerItem.setRtmpSSlPort(rtmpSSlPort);
192 - mediaServerItem.setRtpProxyPort(rtpProxyPort); 196 + mediaServerItem.setRtpProxyPort(getRtpProxyPort());
193 mediaServerItem.setRtspPort(rtspPort); 197 mediaServerItem.setRtspPort(rtspPort);
194 mediaServerItem.setRtspSSLPort(rtspSSLPort); 198 mediaServerItem.setRtspSSLPort(rtspSSLPort);
195 mediaServerItem.setAutoConfig(autoConfig); 199 mediaServerItem.setAutoConfig(autoConfig);