Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
648540858 2021-09-26 14:32:42 +08:00
parent 2766373632
commit 715c7d2724
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DOCKERFILE
View File

@ -68,6 +68,7 @@ RUN mkdir -p /opt/media && \
cd build && \ cd build && \
cmake -DCMAKE_BUILD_TYPE=Release .. && \ cmake -DCMAKE_BUILD_TYPE=Release .. && \
make -j4 && \ make -j4 && \
rm -rf ../release/linux/Release/config.ini && \
cp -r ../release/linux/Release/* /opt/media && \ cp -r ../release/linux/Release/* /opt/media && \
mkdir -p /opt/media/www/record mkdir -p /opt/media/www/record

10
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
View File

@ -93,8 +93,12 @@ public class MediaConfig{
} }
public String getSipIp() { public String getSipIp() {
if (sipIp == null) {
return this.ip;
}else {
return sipIp; return sipIp;
} }
}
public int getHttpPort() { public int getHttpPort() {
return httpPort; return httpPort;
@ -183,13 +187,13 @@ public class MediaConfig{
mediaServerItem.setIp(ip); mediaServerItem.setIp(ip);
mediaServerItem.setDefaultServer(true); mediaServerItem.setDefaultServer(true);
mediaServerItem.setHookIp(getHookIp()); mediaServerItem.setHookIp(getHookIp());
mediaServerItem.setSdpIp(sdpIp); mediaServerItem.setSdpIp(getSdpIp());
mediaServerItem.setStreamIp(streamIp); mediaServerItem.setStreamIp(getStreamIp());
mediaServerItem.setHttpPort(httpPort); mediaServerItem.setHttpPort(httpPort);
mediaServerItem.setHttpSSlPort(httpSSlPort); mediaServerItem.setHttpSSlPort(httpSSlPort);
mediaServerItem.setRtmpPort(rtmpPort); mediaServerItem.setRtmpPort(rtmpPort);
mediaServerItem.setRtmpSSlPort(rtmpSSlPort); mediaServerItem.setRtmpSSlPort(rtmpSSlPort);
mediaServerItem.setRtpProxyPort(rtpProxyPort); mediaServerItem.setRtpProxyPort(getRtpProxyPort());
mediaServerItem.setRtspPort(rtspPort); mediaServerItem.setRtspPort(rtspPort);
mediaServerItem.setRtspSSLPort(rtspSSLPort); mediaServerItem.setRtspSSLPort(rtspSSLPort);
mediaServerItem.setAutoConfig(autoConfig); mediaServerItem.setAutoConfig(autoConfig);