From d727f72245aafa1e6eb57318de1fa341ee796915 Mon Sep 17 00:00:00 2001 From: xiaoxie Date: Mon, 15 Nov 2021 15:07:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.Dockerfile=E4=BD=BF=E7=94=A8linux?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E7=AC=A6=E5=8F=B7=E6=9B=BF=E6=8D=A2=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E7=9A=84win=E6=8D=A2=E8=A1=8C=E7=AC=A6=202.docker-com?= =?UTF-8?q?pose=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=ADgit=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E4=BB=8E=E8=87=AA=E5=B7=B1=E7=9A=84=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BAwvp-pro=E7=9A=84=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 9dc61413e..3e271bbd1 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -13,7 +13,7 @@ services: build: context: ./wvp args: - gitUrl: "https://gitee.com/xieyu1989" + gitUrl: "https://gitee.com/18010473990" zlmGitUrl: "https://gitee.com/xia-chu/ZLMediaKit" restart: always ports: From 2faea1ee359f069e8c1beca77ca6d1c94f4aaee8 Mon Sep 17 00:00:00 2001 From: xiaoxie Date: Tue, 30 Nov 2021 17:20:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BF=9D=E8=AF=81=E5=88=9A=E6=8B=89?= =?UTF-8?q?=E4=B8=8B=E6=9D=A5=E7=9A=84=E9=A1=B9=E7=9B=AE=E4=B9=9F=E8=83=BD?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=90=AF=E5=8A=A8=EF=BC=8C=E8=80=8C=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E5=9B=A0=E4=B8=BA=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=8A=A5=E9=94=99=201.WVP=5FHOST=E7=BB=99=E5=87=BA127.0.0.1?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=80=BC=202.REIDS=5FPWD?= =?UTF-8?q?=E7=BB=99=E5=87=BA=E9=BB=98=E8=AE=A4=E7=A9=BA=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E5=BC=BA=E5=88=B6=E8=A6=81=E6=B1=82=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 98866b838..0a1d6245b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: # [可选] 数据库 DB database: ${REDIS_DB:6} # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接 - password: ${REDIS_PWD} + password: ${REDIS_PWD:} # [可选] 超时时间 timeout: 10000 # [可选] jdbc数据库配置, 项目使用sqlite作为数据库，一般不需要配置 @@ -36,7 +36,7 @@ server: # 作为28181服务器的配置 sip: # [必须修改] 本机的IP - ip: ${WVP_HOST} + ip: ${WVP_HOST:127.0.0.1} # [可选] 28181服务监听的端口 port: 5060 # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007） @@ -67,8 +67,8 @@ media: send-port-range: 30000,30500 # 端口范围 # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用 record-assist-port: 18081 - sdp-ip: ${WVP_HOST} - stream-ip: ${WVP_HOST} + sdp-ip: ${sip.ip} + stream-ip: ${sip.ip} # [可选] 日志配置, 一般不需要改 logging: file: From 8e080cb98d75f2bd277a2b69606e37836de09af3 Mon Sep 17 00:00:00 2001 From: xiaoxie Date: Tue, 30 Nov 2021 17:23:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0WVP=5FPORT=20ZLM=5FHOST?= =?UTF-8?q?=20ZLM=5FPORT=E4=B8=89=E4=B8=AA=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E4=BE=BF=E4=BA=8E=E5=9C=A8docker=E4=B8=AD=E9=85=8D?= =?UTF-8?q?=E7=BD=AEWVP=E5=85=B3=E9=94=AE=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 0a1d6245b..ff60f5af7 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -38,7 +38,7 @@ sip: # [必须修改] 本机的IP ip: ${WVP_HOST:127.0.0.1} # [可选] 28181服务监听的端口 - port: 5060 + port: ${WVP_PORT:5060} # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007） # 后两位为行业编码，定义参照附录D.3 # 3701020049标识山东济南历下区 信息行业接入 @@ -52,9 +52,9 @@ sip: #zlm 默认服务器配置 media: # [必须修改] zlm服务器的内网IP - ip: 127.0.0.1 + ip: ${ZLM_HOST:127.0.0.1} # [必须修改] zlm服务器的http.port - http-port: 80 + http-port: ${ZLM_PORT:80} # [可选] zlm服务器的hook.admin_params=secret secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试