From d23ce79f3ee2226543acb674d86fea3853a8e969 Mon Sep 17 00:00:00 2001 From: niexiaorong Date: Mon, 14 Jul 2025 17:25:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(nginx=E4=BB=A3=E7=90=86minio):=20?= =?UTF-8?q?=E9=BB=98=E8=AE=A49000=E8=A2=AB=E5=8D=A0=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E6=88=90=E7=BA=A6=E5=AE=9A=E7=9A=848000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maintain/compose.yml | 2 +- video-nginx/compose.yml | 2 ++ video-nginx/conf/conf.d/443.conf.template | 2 +- video/compose.storage.yaml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/maintain/compose.yml b/maintain/compose.yml index 0028020..021bf00 100644 --- a/maintain/compose.yml +++ b/maintain/compose.yml @@ -35,7 +35,7 @@ services: - spring.rabbitmq.virtual-host=/track # MINIO数据端口 - - spring_my_minio_url=http://${MINIO_HOST:-minio}:${MINIO_PORT:-9000} + - spring_my_minio_url=http://${MINIO_HOST:-minio}:${MINIO_PORT:-8000} - spring_my_minio_bucket=maintain - spring_my_minio_accessKey=${MINIO_ACCESSKEY:?required} - spring_my_minio_secretKey=${MINIO_SECRETKEY:?required} diff --git a/video-nginx/compose.yml b/video-nginx/compose.yml index b35e4a9..e32c7af 100644 --- a/video-nginx/compose.yml +++ b/video-nginx/compose.yml @@ -32,6 +32,8 @@ services: - source: mdvr-live-https.conf.template target: /etc/nginx/templates/mdvr-live.conf.template environment: + - MINIO_HOST=${MINIO_HOST} + - MINIO_PORT=${MINIO_PORT} - VIDEO_PORT_HTTPS_0=${VIDEO_PORT_HTTPS_0} - VIDEO_PORT_HTTPS_1=${VIDEO_PORT_HTTPS_1} - VIDEO_PORT_HTTPS_2=${VIDEO_PORT_HTTPS_2} diff --git a/video-nginx/conf/conf.d/443.conf.template b/video-nginx/conf/conf.d/443.conf.template index afe74c0..e5d5da8 100644 --- a/video-nginx/conf/conf.d/443.conf.template +++ b/video-nginx/conf/conf.d/443.conf.template @@ -15,7 +15,7 @@ server { # minio录像云存储 location /minio/ { - proxy_pass http://minio:9000/; + proxy_pass http://${MINIO_HOST}:${MINIO_PORT}/; } #access_log /var/log/nginx/host.access.log main; diff --git a/video/compose.storage.yaml b/video/compose.storage.yaml index 300d6e6..269e6c6 100644 --- a/video/compose.storage.yaml +++ b/video/compose.storage.yaml @@ -15,7 +15,7 @@ services: # 启用mini 录像将存放minio中do - spring_minio_enabled=true - spring_minio_domain=https://${VIDEO_HOSTNAME:?required}:${VIDEO_PORT_HTTPS_0}/minio - - spring_minio_endpoint=http://minio:9000 + - spring_minio_endpoint=http://minio:8000 - spring_minio_accessKey=${MINIO_ACCESSKEY:?required} - spring_minio_secretKey=${MINIO_SECRETKEY:?required} - spring_minio_bucketName=storage From 9ac0356974e783c4c4a5566545214cdc8eed7412 Mon Sep 17 00:00:00 2001 From: niexiaorong Date: Mon, 14 Jul 2025 17:28:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(rtp):=20minio=E9=93=BE=E6=8E=A5url?= =?UTF-8?q?=E6=94=B9=E6=88=90=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- video/compose.storage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/video/compose.storage.yaml b/video/compose.storage.yaml index 269e6c6..3ce1d8a 100644 --- a/video/compose.storage.yaml +++ b/video/compose.storage.yaml @@ -15,7 +15,7 @@ services: # 启用mini 录像将存放minio中do - spring_minio_enabled=true - spring_minio_domain=https://${VIDEO_HOSTNAME:?required}:${VIDEO_PORT_HTTPS_0}/minio - - spring_minio_endpoint=http://minio:8000 + - spring_minio_endpoint=http://${MINIO_HOST:-minio}:${MINIO_PORT:-8000} - spring_minio_accessKey=${MINIO_ACCESSKEY:?required} - spring_minio_secretKey=${MINIO_SECRETKEY:?required} - spring_minio_bucketName=storage