From 7bb4ae3ec11e7c7301b4f646daabfc681b1ee829 Mon Sep 17 00:00:00 2001 From: xiaorongnie Date: Sat, 28 Jun 2025 10:54:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E5=B8=A6=E5=90=8E=E7=BC=80):=20?= =?UTF-8?q?=E5=87=86=E5=A4=87=E5=8C=BA=E5=88=86https=E5=92=8Chttp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/track.https/.env | 11 +++++++++++ examples/track.https/compose.yaml | 25 +++++++++++++++++++++++++ examples/track/compose.yaml | 16 ---------------- 3 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 examples/track.https/.env create mode 100644 examples/track.https/compose.yaml delete mode 100644 examples/track/compose.yaml diff --git a/examples/track.https/.env b/examples/track.https/.env new file mode 100644 index 0000000..f898cee --- /dev/null +++ b/examples/track.https/.env @@ -0,0 +1,11 @@ +# 必填, 当前服务器内网IP +SERVER_IP_INTERNAL='' # 111.111.111.111 + +# 必填，当前服务器外网IP +SERVER_IP_PUBLIC='' # 192.168.0.10 + +# 必填，服务器域名 +SERVER_HOSTNAME='' # tripsdd.com + +# 必填，证书文件 +SSL_CERTIFICATE='' # /home/docker-compose/ssl/ltripsdd_com \ No newline at end of file diff --git a/examples/track.https/compose.yaml b/examples/track.https/compose.yaml new file mode 100644 index 0000000..cb2b715 --- /dev/null +++ b/examples/track.https/compose.yaml @@ -0,0 +1,25 @@ +#--------------------------------- +# V2单机部署方案 +# ------------------------------- +# 1. 准备服务器内网IP, 外网IP, SSL +# 2. 修改.env文件 +# 3. docker compose config 检查配置 +# 4. docker compose up -d 启动服务 +#================================ + +include: + - ../docker/mysql8/compose.yml + - ../docker/redis/compose.yml + - ../docker/mongodb/compose.yml + - ../docker/rabbitmq/compose.yml + - ../docker/minio/compose.yml + - ../docker/maintain/compose.yml + - ../docker/jtt808/compose.yml + # 反向代理(http-80和https-443) + - path: + - ../docker/nginx/compose.yml + - ../docker/nginx/compose.track.yml + # 视频服务(rtp, rtmp, http-flv) + - ../docker/video/compose.yml + # 视频服务https(http-flv多端口支持, 对讲) + - ../docker/video-nginx/compose.yml \ No newline at end of file diff --git a/examples/track/compose.yaml b/examples/track/compose.yaml deleted file mode 100644 index 2b96feb..0000000 --- a/examples/track/compose.yaml +++ /dev/null @@ -1,16 +0,0 @@ -## V2单机部署方案 -# 1. 修改.env文件. 初始化各种密码 -# 2. docker compose up -d启动服务 -# 3. 配置/home/token秘钥 -# 4. 初始化数据库脚本和默认数据 user_info|organize_role|system_config|system_alarm_platform|system_dictionary -include: - - ../docker/mysql8/compose.yml - - ../docker/redis/compose.yml - - ../docker/mongodb/compose.yml - - ../docker/rabbitmq/compose.yml - - ../docker/minio/compose.yml - - ../docker/maintain/compose.yml - - ../docker/jtt808/compose.yml - - path: - - ../docker/nginx/compose.yml - - ../docker/nginx/compose.track.yml From 8604713b485bf138cab7a1163be8fc7812bde309 Mon Sep 17 00:00:00 2001 From: xiaorongnie Date: Sat, 28 Jun 2025 11:04:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E7=BD=91=E5=85=B3=E6=B3=A8=E5=86=8C):?= =?UTF-8?q?=20=E9=BB=98=E8=AE=A4=E5=86=85=E7=BD=91=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jtt808/compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jtt808/compose.yml b/jtt808/compose.yml index 5c3c358..54bb289 100644 --- a/jtt808/compose.yml +++ b/jtt808/compose.yml @@ -28,7 +28,7 @@ services: - gateway_ftp_passive_ports=${JTT808_PORT_FTP_PASSIVE} # 终端注册服务 - - gateway_device-register-url=${WEB_BASE_URL} + - gateway_device-register-url=http://${MAINTAIN_HOST:-maintain}:${MAINTAIN_PORT:-8080} # 网关Http服务, 需要代理？ - gateway_http_url=${WEB_BASE_URL}/jtt808 @@ -50,7 +50,7 @@ services: - logging.level.io.netty.handler.logging.LoggingHandler=INFO # 网关日志写法2 # - SPRING_APPLICATION_JSON={"logging.level.io.netty.handler.logging.LoggingHandler":"DEBUG"} - logging: + logging: driver: "json-file" options: max-size: "100m" @@ -58,4 +58,4 @@ services: nproc: 65535 nofile: soft: 20000 - hard: 40000 \ No newline at end of file + hard: 40000