From f0f62fa675cf0c9afda77afed206d40602d0abaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=B5=E5=B8=86?= <595835443@qq.com> Date: Mon, 8 Sep 2025 13:36:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=9C=A8Docker=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E8=B7=91=E5=AE=8C=E5=A4=A7=E8=87=B4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/.env | 19 +++ docker/docker-compose.yml | 55 +++++---- docker/media/config.ini | 32 ++--- docker/nginx/conf/nginx.conf | 23 ++++ docker/wvp/wvp/application-docker.yml | 166 ++++++++++++++++---------- 5 files changed, 192 insertions(+), 103 deletions(-) create mode 100644 docker/.env diff --git a/docker/.env b/docker/.env new file mode 100644 index 000000000..0de472237 --- /dev/null +++ b/docker/.env @@ -0,0 +1,19 @@ +MediaRtmp=10001 +MediaRtsp=10002 +MediaRtp=10003 + +WebHttp=8080 +WebHttps=8081 + +Stream_IP=127.0.0.1 +SDP_IP=127.0.0.1 + +SIP_ShowIP=127.0.0.1 +SIP_Port=8160 +SIP_Domain=3502000000 +SIP_Id=35020000002000000001 +SIP_Password=wvp_sip_password + + +RecordSip=true +RecordPushLive= \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 97b7a8c55..0e433b840 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -59,9 +59,14 @@ services: networks: - media-net ports: - - "10935:10935" - - "5540:5540" - - "6080:6080" + #- "6080:80/tcp" # [播流]HTTP 安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址 + #- "4443:443/tcp" # [播流]HTTPS 安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址 + - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/tcp" # [收流]RTMP + #- "41935:41935/tcp" # [收流]RTMPS 无效 + - "${MediaRtsp:-5540}:${MediaRtsp:-5540}/tcp" # [收流]RTSP + #- "45540:45540/tcp" # [收流]RTSPS 无效 + - "${MediaRtp:-10000}:${MediaRtp:-10000}/tcp" # [收流]RTP + - "${MediaRtp:-10000}:${MediaRtp:-10000}/udp" # [收流]RTP volumes: - ./volumes/video:/opt/media/www/record/ - ./logs/media:/opt/media/log/ @@ -82,35 +87,48 @@ services: - media-net ports: - "18978:18978" - - "8116:8116/udp" - - "8116:8116/tcp" + - "${SIP_Port:-8116}:${SIP_Port:-8116}/udp" + - "${SIP_Port:-8116}:${SIP_Port:-8116}/tcp" depends_on: - polaris-redis - polaris-mysql - polaris-media - links: - - polaris-redis - - polaris-mysql - - polaris-media volumes: - ./wvp/wvp/:/opt/ylcx/wvp/ - ./logs/wvp:/opt/wvp/logs/ environment: TZ: "Asia/Shanghai" - # 本机的IP - SIP_HOST: 127.0.0.1 - STREAM_HOST: 127.0.0.1 + # 流链接的IP + Stream_IP: ${Stream_IP} + # SDP里的IP + SDP_IP: ${SDP_IP} + # [可选] zlm服务器访问WVP所使用的IP, 默认使用127.0.0.1，zlm和wvp没有部署在同一台服务器时必须配置 + ZLM_HOOK_HOST: polaris-wvp ZLM_HOST: polaris-media - ZLM_PORT: 6080 ZLM_SERCERT: su6TiedN2rVAmBbIDX0aa0QTiBJLBdcf + + MediaHttp: ${WebHttp:-8080} + #MediaHttps: ${WebHttps:-8081} + MediaRtmp: ${MediaRtmp:-10935} + MediaRtsp: ${MediaRtsp:-5540} + MediaRtp: ${MediaRtp:-10000} + REDIS_HOST: polaris-redis REDIS_PORT: 6379 + DATABASE_HOST: polaris-mysql DATABASE_PORT: 3306 DATABASE_USER: wvp_user DATABASE_PASSWORD: wvp_password - # 前端跨域配置，nginx容器所在物理机IP - NGINX_HOST: http://127.0.0.1:8080 + + SIP_ShowIP: ${SIP_ShowIP} + SIP_Port: ${SIP_Port:-8116} + SIP_Domain: ${SIP_Domain} + SIP_Id: ${SIP_Id} + SIP_Password: ${SIP_Password} + + RecordSip: ${RecordSip} + RecordPushLive: ${RecordPushLive} polaris-nginx: # 显式指定构建上下文和Dockerfile路径 @@ -118,14 +136,9 @@ services: context: .. # 构建上下文的根路径 dockerfile: ./docker/nginx/Dockerfile # 相对于上下文路径的Dockerfile位置 ports: - - "8080:8080" + - "${WebHttp:-8080}:8080" depends_on: - polaris-wvp - links: - - polaris-wvp - environment: - WVP_HOST: polaris-wvp - WVP_PORT: 18978 volumes: - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf - ./logs/nginx:/var/log/nginx diff --git a/docker/media/config.ini b/docker/media/config.ini index 9ab184437..fd1be353f 100644 --- a/docker/media/config.ini +++ b/docker/media/config.ini @@ -52,21 +52,21 @@ alive_interval=10.0 enable=1 on_flow_report= on_http_access= -on_play=http://127.0.0.1:18978/index/hook/on_play -on_publish=http://127.0.0.1:18978/index/hook/on_publish -on_record_mp4=http://127.0.0.1:18978/index/hook/on_record_mp4 +on_play=http://polaris-wvp:18978/index/hook/on_play +on_publish=http://polaris-wvp:18978/index/hook/on_publish +on_record_mp4=http://polaris-wvp:18978/index/hook/on_record_mp4 on_record_ts= -on_rtp_server_timeout=http://127.0.0.1:18978/index/hook/on_rtp_server_timeout +on_rtp_server_timeout=http://polaris-wvp:18978/index/hook/on_rtp_server_timeout on_rtsp_auth= on_rtsp_realm= -on_send_rtp_stopped=http://127.0.0.1:18978/index/hook/on_send_rtp_stopped +on_send_rtp_stopped=http://polaris-wvp:18978/index/hook/on_send_rtp_stopped on_server_exited= -on_server_keepalive=http://127.0.0.1:18978/index/hook/on_server_keepalive -on_server_started=http://127.0.0.1:18978/index/hook/on_server_started +on_server_keepalive=http://polaris-wvp:18978/index/hook/on_server_keepalive +on_server_started=http://polaris-wvp:18978/index/hook/on_server_started on_shell_login= -on_stream_changed=http://127.0.0.1:18978/index/hook/on_stream_changed -on_stream_none_reader=http://127.0.0.1:18978/index/hook/on_stream_none_reader -on_stream_not_found=http://127.0.0.1:18978/index/hook/on_stream_not_found +on_stream_changed=http://polaris-wvp:18978/index/hook/on_stream_changed +on_stream_none_reader=http://polaris-wvp:18978/index/hook/on_stream_none_reader +on_stream_not_found=http://polaris-wvp:18978/index/hook/on_stream_not_found retry=1 retry_delay=3.0 stream_changed_schemas=rtsp/rtmp/fmp4/ts/hls/hls.fmp4 @@ -82,10 +82,10 @@ forwarded_ip_header= keepAliveSecond=30 maxReqSize=40960 notFound=404 Not Found

您访问的资源不存在！

ZLMediaKit(git hash:8ccb4e9/%aI,branch:master,build time:2024-11-07T10:34:19)
-port=6080 +port=80 rootPath=./www sendBufSize=65536 -sslport=4443 +sslport=443 virtualPath= [multicast] @@ -99,7 +99,7 @@ auto_close=0 continue_push_ms=3000 enable_audio=1 enable_fmp4=1 -enable_hls=1 +enable_hls=0 enable_hls_fmp4=0 enable_mp4=0 enable_rtmp=1 @@ -111,7 +111,7 @@ hls_save_path=./www modify_stamp=2 mp4_as_player=0 mp4_max_second=3600 -mp4_save_path=/opt/media +mp4_save_path=/opt/media/www paced_sender_ms=0 rtmp_demand=0 rtsp_demand=0 @@ -119,7 +119,7 @@ ts_demand=0 [record] appName=record -enableFmp4=0 +enableFmp4=1 fastStart=0 fileBufSize=65536 fileRepeat=0 @@ -168,7 +168,7 @@ h264_pt=98 h265_pt=99 merge_frame=1 opus_pt=100 -port=10000 +port=10003 port_range=30000-30500 ps_pt=96 rtp_g711_dur_ms=100 diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index ede96ec67..8b4ab021b 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -47,6 +47,29 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://polaris-wvp:18978; } + + # /rtp/ͷ· + location ^~ /rtp/ { + # ZLMediakit + proxy_pass http://polaris-media:80; + + # HTTP + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + # WebSocket֧ + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + + # ʱãʵ + proxy_connect_timeout 60s; + proxy_read_timeout 3600s; + proxy_send_timeout 60s; + } + error_page 500 502 503 504 /50x.html; location = /50x.html { root html; diff --git a/docker/wvp/wvp/application-docker.yml b/docker/wvp/wvp/application-docker.yml index 68c411e7b..3e1e38785 100644 --- a/docker/wvp/wvp/application-docker.yml +++ b/docker/wvp/wvp/application-docker.yml @@ -1,73 +1,107 @@ spring: - # 设置接口超时时间 - mvc: - async: - request-timeout: 20000 - thymeleaf: - cache: false - # [可选]上传文件大小限制 - servlet: - multipart: - max-file-size: 10MB - max-request-size: 100MB - # REDIS数据库配置 - redis: - # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1 - host: ${REDIS_HOST:127.0.0.1} - # [必须修改] 端口号 - port: ${REDIS_PORT:6379} - # [可选] 数据库 DB - database: 1 - # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接 - password: - # [可选] 超时时间 - timeout: 30000 - # mysql数据源 - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://${DATABASE_HOST:127.0.0.1}:${DATABASE_PORT:3306}/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true - username: ${DATABASE_USER:root} - password: ${DATABASE_PASSWORD:root} + cache: + type: redis + thymeleaf: + cache: false + # 设置接口超时时间 + mvc: + async: + request-timeout: 20000 + # [可选]上传文件大小限制 + servlet: + multipart: + max-file-size: 10MB + max-request-size: 100MB + # REDIS数据库配置 + redis: + # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1 + host: ${REDIS_HOST:127.0.0.1} + # [必须修改] 端口号 + port: ${REDIS_PORT:6379} + # [可选] 数据库 DB + database: 1 + # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接 + password: + # [可选] 超时时间 + timeout: 10000 + ## [可选] 一个pool最多可分配多少个jedis实例 + #poolMaxTotal: 1000 + ## [可选] 一个pool最多有多少个状态为idle(空闲)的jedis实例 + #poolMaxIdle: 500 + ## [可选] 最大的等待时间(秒) + #poolMaxWait: 5 + # [必选] jdbc数据库配置 + datasource: + # mysql数据源 + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://${DATABASE_HOST:127.0.0.1}:${DATABASE_PORT:3306}/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true + username: ${DATABASE_USER:root} + password: ${DATABASE_PASSWORD:root} #[可选] 监听的HTTP端口, 网页和接口调用都是这个端口 server: - port: 18978 - ssl: - # [可选] 是否开启HTTPS访问 - enabled: false + port: 18978 + ssl: + # [可选] 是否开启HTTPS访问 + # docker里运行，内部不需要HTTPS + enabled: false # 作为28181服务器的配置 sip: - # [必须修改] 本机的IP - ip: ${SIP_HOST:127.0.0.1} - # [可选] - port: 8116 - # [可选] - domain: 3402000000 - # [可选] - id: 34020000002000000001 - password: - alarm: true + # [必须修改] 本机的IP，对应你的网卡，监听什么ip就是使用什么网卡， + # 如果要监听多张网卡，可以使用逗号分隔多个IP， 例如： 192.168.1.4,10.0.0.4 + # 如果不明白，就使用0.0.0.0，大部分情况都是可以的 + # 请不要使用127.0.0.1，任何包括localhost在内的域名都是不可以的。 + ip: 0.0.0.0 + # [可选] 没有任何业务需求，仅仅是在前端展示的时候用 + show-ip: ${SIP_ShowIP} + # [可选] + port: ${SIP_Port:8116} + # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007） + # 后两位为行业编码，定义参照附录D.3 + # 3701020049标识山东济南历下区 信息行业接入 + # [可选] + domain: ${SIP_Domain:3402000000} + # [可选] + id: ${SIP_Id:34020000002000000001} + # [可选] 默认设备认证密码，后续扩展使用设备单独密码, 移除密码将不进行校验 + password: ${SIP_Password} + # [可选] 国标级联注册失败，再次发起注册的时间间隔。 默认60秒 + register-time-interval: 60 + # [可选] 云台控制速度 + ptz-speed: 50 + # TODO [可选] 收到心跳后自动上线， 重启服务后会将所有设备置为离线，默认false，等待注册后上线。设置为true则收到心跳设置为上线。 + # keepalliveToOnline: false + # 是否存储alarm信息 + alarm: true + # 命令发送等待回复的超时时间, 单位:毫秒 + timeout: 1000 # 默认服务器配置 media: id: polaris # [必须修改] ZLM 内网IP与端口 ip: ${ZLM_HOST:127.0.0.1} - http-port: ${ZLM_PORT:6080} + http-port: 80 # [可选] 返回流地址时的ip，置空使用 media.ip - stream-ip: ${STREAM_HOST:127.0.0.1} + stream-ip: ${Stream_IP} # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip - sdp-ip: ${SIP_HOST:127.0.0.1} - # [可选] Hook IP, 默认使用sip.ip - hook-ip: ${SIP_HOST:127.0.0.1} + sdp-ip: ${SDP_IP} + # [可选] zlm服务器访问WVP所使用的IP, 默认使用127.0.0.1，zlm和wvp没有部署在同一台服务器时必须配置 + hook-ip: ${ZLM_HOOK_HOST} # [可选] sslport - http-ssl-port: 4443 - rtp-proxy-port: 10000 - rtmp-port: 10935 - rtmp-ssl-port: 41935 - rtsp-port: 5540 - rtsp-ssl-port: 45540 + http-ssl-port: 0 + flv-port: ${MediaHttp:} + flv-ssl-port: ${MediaHttps:} + ws-flv-port: ${MediaHttp:} + ws-flv-ssl-port: ${MediaHttps:} + rtp-proxy-port: ${MediaRtp:} + rtmp-port: ${MediaRtmp:} + rtmp-ssl-port: 0 + rtsp-port: ${MediaRtsp:} + rtsp-ssl-port: 0 + # [可选] 是否自动配置ZLM, 如果希望手动配置ZLM, 可以设为false, 不建议新接触的用户修改 + auto-config: true # [可选] secret: ${ZLM_SERCERT} # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试 @@ -79,28 +113,28 @@ media: # [可选] send-port-range: 50502,50506 - record-path: /opt/media/record + record-path: /opt/media/www/record/ record-day: 7 record-assist-port: 0 user-settings: auto-apply-play: true play-timeout: 30000 wait-track: false - record-push-live: false - record-sip: false + record-push-live: ${RecordPushLive:false} + record-sip: ${RecordSip:false} stream-on-demand: true - interface-authentication: false + interface-authentication: true broadcast-for-platform: TCP-PASSIVE push-stream-after-ack: true send-to-platforms-when-id-lost: true interface-authentication-excludes: - - /api/** - push-authority: false - allowed-origins: - - http://localhost:8080 - - http://127.0.0.1:8080 - - http://0.0.0.0:8080 - - ${NGINX_HOST} + # - /api/** + push-authority: true + # allowed-origins: + # - http://localhost:8080 + # - http://127.0.0.1:8080 + # - http://0.0.0.0:8080 + # - ${NGINX_HOST} logging: config: classpath:logback-spring.xml