From d23ce79f3ee2226543acb674d86fea3853a8e969 Mon Sep 17 00:00:00 2001
From: niexiaorong <fukua365@gmail.com>
Date: Mon, 14 Jul 2025 17:25:53 +0800
Subject: [PATCH 1/7] =?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 <fukua365@gmail.com>
Date: Mon, 14 Jul 2025 17:28:40 +0800
Subject: [PATCH 2/7] =?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

From f10216eeb4ac0ce11250a14bfdbea37f9137744e Mon Sep 17 00:00:00 2001
From: niexiaorong <fukua365@gmail.com>
Date: Thu, 17 Jul 2025 15:23:08 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=92=8C=E6=98=B5=E7=A7=B0=E5=8F=8D=E4=BA=86=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mysql8/initdb/01-create-db-maintain.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql8/initdb/01-create-db-maintain.sql b/mysql8/initdb/01-create-db-maintain.sql
index 06857c1..845650f 100644
--- a/mysql8/initdb/01-create-db-maintain.sql
+++ b/mysql8/initdb/01-create-db-maintain.sql
@@ -3894,8 +3894,8 @@ CREATE TABLE `user_info`  (
 -- ----------------------------
 -- Records of user_info
 -- ----------------------------
-INSERT INTO `user_info` VALUES (15865, 'dca0f9e348384d23958e151bb4adb98f', '系统管理员', 'sysadmin', '{bcrypt-md5}$2a$10$dsfVEzh5NlfrgkcLFbrPLOuSsm5zJMJJwYqlQfTSWs3qKzwhQx5Ku', '/minio/maintain/avatar/202504/3e9b5f914ff105ea2d32c4a4c53b10121a16aac4.png', NULL, NULL, '+08:00', NULL, 0, 0, 100, 0, '', '系统账号', '2025-04-29 09:27:50', NULL, NULL, '2025-04-29 03:46:24', 0, NULL, '', 0, '2025-04-29 03:46:24', '2025-04-29 09:28:57');
-INSERT INTO `user_info` VALUES (15866, '25d19d8c917747ea', 'tgadmin', '组织管理员', '{bcrypt-md5}$2a$10$x7PPR5QH/2yooQmv4szk5O4.l1AujbzMbosaO4SaYL9UxXTsOKKey', '/minio/maintain/avatar/202504/db1c192ad620acdff541de0125ae887bf2366a2b.png', NULL, NULL, '+08:00', NULL, 0, 0, 1, 0, '', NULL, '2025-04-30 08:04:22', NULL, NULL, '2025-04-30 07:35:32', 0, 110, '', 0, '2025-04-30 07:35:32', '2025-04-30 08:22:00');
+INSERT INTO `user_info` VALUES (1, 'dca0f9e348384d23958e151bb4adb98f', '系统管理员', 'sysadmin', '{bcrypt-md5}$2a$10$dsfVEzh5NlfrgkcLFbrPLOuSsm5zJMJJwYqlQfTSWs3qKzwhQx5Ku', '', NULL, NULL, '+08:00', NULL, 0, 0, 100, 0, '', '系统账号', '2025-04-29 09:27:50', NULL, NULL, '2025-04-29 03:46:24', 0, NULL, '', 0, '2025-04-29 03:46:24', '2025-04-29 09:28:57');
+INSERT INTO `user_info` VALUES (2, '25d19d8c917747ea', '组织管理员', 'tgadmin', '{bcrypt-md5}$2a$10$x7PPR5QH/2yooQmv4szk5O4.l1AujbzMbosaO4SaYL9UxXTsOKKey', '', NULL, NULL, '+08:00', NULL, 0, 0, 1, 0, '', NULL, '2025-04-30 08:04:22', NULL, NULL, '2025-04-30 07:35:32', 0, 110, '', 0, '2025-04-30 07:35:32', '2025-04-30 08:22:00');
 -- ----------------------------
 -- Table structure for user_issue
 -- ----------------------------

From d162997cbe71664dccf4bb613d822383d0f51576 Mon Sep 17 00:00:00 2001
From: niexiaorong <fukua365@gmail.com>
Date: Fri, 18 Jul 2025 16:53:38 +0800
Subject: [PATCH 4/7] =?UTF-8?q?perf(=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93):=20=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=AD=97=E4=BD=93=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 maintain/compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintain/compose.yml b/maintain/compose.yml
index 021bf00..e250631 100644
--- a/maintain/compose.yml
+++ b/maintain/compose.yml
@@ -7,6 +7,7 @@ services:
       - /etc/localtime:/etc/localtime
       - ${MAINTAIN_TOKEN_DIR:?required}:/home/token
       - /data/logs/maintain:/logs
+      - /data/fonts:/data/fonts
     ports:
       - ${MAINTAIN_PORT:-8080}:8080
     environment:

From 50893225708931a7f35841c148108d0e0736eb11 Mon Sep 17 00:00:00 2001
From: niexiaorong <fukua365@gmail.com>
Date: Tue, 29 Jul 2025 10:07:10 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat(bus=E5=90=8E=E7=AB=AF):=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0token=E7=9B=AE=E5=BD=95=E6=98=A0=E5=B0=84,=20=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BF=E5=85=8D=E5=AF=86=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bus/compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bus/compose.yml b/bus/compose.yml
index 54697d6..3040106 100644
--- a/bus/compose.yml
+++ b/bus/compose.yml
@@ -59,6 +59,7 @@ services:
     volumes:
       - /data/files:/data/files
       - /usr/share/fonts:/usr/share/fonts
+      - /home/token:/home/token
     # ports:
       # 内部端口, 不暴露
       # - 8899:8899

From 002efc1cfb453fbb3d50a6277388fd3d66b6aa79 Mon Sep 17 00:00:00 2001
From: "ipcjs.mac4" <gipcjs@gmail.com>
Date: Tue, 29 Jul 2025 15:57:59 +0800
Subject: [PATCH 6/7] =?UTF-8?q?Revert=20"feat(bus=E5=90=8E=E7=AB=AF):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0token=E7=9B=AE=E5=BD=95=E6=98=A0=E5=B0=84,=20?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E5=85=8D=E5=AF=86=E7=99=BB=E5=BD=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 50893225708931a7f35841c148108d0e0736eb11.
---
 bus/compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bus/compose.yml b/bus/compose.yml
index 3040106..54697d6 100644
--- a/bus/compose.yml
+++ b/bus/compose.yml
@@ -59,7 +59,6 @@ services:
     volumes:
       - /data/files:/data/files
       - /usr/share/fonts:/usr/share/fonts
-      - /home/token:/home/token
     # ports:
       # 内部端口, 不暴露
       # - 8899:8899

From 6e54f3d93a67d84bdd89482806ac71b4931c3dd8 Mon Sep 17 00:00:00 2001
From: "ipcjs.mac4" <gipcjs@gmail.com>
Date: Tue, 29 Jul 2025 16:00:46 +0800
Subject: [PATCH 7/7] =?UTF-8?q?wip:=20MAINTAIN=5FTOKEN=5FDIR=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E9=9D=9E=E5=BF=85=E9=80=89,=20=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE,=20=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E9=83=BD=E4=BC=9A=E8=87=AA=E5=8A=A8=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.default         | 10 +++++-----
 maintain/compose.yml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.env.default b/.env.default
index 79db81e..8d9d2a6 100644
--- a/.env.default
+++ b/.env.default
@@ -70,11 +70,11 @@ JTT808_PORT_FTP_PASSIVE=9041-9049
 ## maintain
 MAINTAIN_HOST='maintain' # maintain | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC}
 MAINTAIN_PORT='8080'
-# 必填, TOKEN目录的绝对路径
-# - access/ras_key|ras_key.pub: 访问密钥的公私钥对
-# - refresh/ras_key|ras_key.pub: 刷新密钥的公私钥对
-# - ip2region.xdb: ip到区域的映射数据, 下载连接: https://raw.githubusercontent.com/lionsoul2014/ip2region/master/data/ip2region.xdb
-MAINTAIN_TOKEN_DIR=''
+# TOKEN目录的绝对路径
+# - access/ras_key|ras_key.pub: 访问密钥的公私钥对, 不存在会自动下载
+# - refresh/ras_key|ras_key.pub: 刷新密钥的公私钥对, 不存在会自动下载
+# - ip2region.xdb: ip到区域的映射数据, 不存在会自动下载, 手动下载连接: https://raw.githubusercontent.com/lionsoul2014/ip2region/master/data/ip2region.xdb
+MAINTAIN_TOKEN_DIR='/home/token'
 
 ## MYSQL, 必填
 MYSQL_HOST='mysql8' # mysql8 | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC}
diff --git a/maintain/compose.yml b/maintain/compose.yml
index e250631..724d18c 100644
--- a/maintain/compose.yml
+++ b/maintain/compose.yml
@@ -5,7 +5,7 @@ services:
     restart: always
     volumes:
       - /etc/localtime:/etc/localtime
-      - ${MAINTAIN_TOKEN_DIR:?required}:/home/token
+      - ${MAINTAIN_TOKEN_DIR:-/home/token}:/home/token
       - /data/logs/maintain:/logs
       - /data/fonts:/data/fonts
     ports: