From c92b99b448b34faefc88333c16c6aba1c7db144d Mon Sep 17 00:00:00 2001 From: cli Date: Thu, 23 Oct 2025 05:34:20 -0400 Subject: [PATCH 1/3] =?UTF-8?q?wip:=20=E5=8D=95=E4=B8=AA=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9A=84compose=E6=96=87=E4=BB=B6=E7=BB=9F=E4=B8=80=E5=90=8E?= =?UTF-8?q?=E7=BC=80=E4=B8=BAyml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- examples/video-storage/compose.yaml | 2 +- video/{compose.storage.yaml => compose.storage.yml} | 0 web-downloader/{compose.bus.yaml => compose.bus.yml} | 0 web-downloader/{compose.track.yaml => compose.track.yml} | 0 web-downloader/{compose.yaml => compose.yml} | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename video/{compose.storage.yaml => compose.storage.yml} (100%) rename web-downloader/{compose.bus.yaml => compose.bus.yml} (100%) rename web-downloader/{compose.track.yaml => compose.track.yml} (100%) rename web-downloader/{compose.yaml => compose.yml} (100%) diff --git a/README.md b/README.md index 3489468..26b1774 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,9 @@ docker compose config > compose-stack.yaml 在`/home/docker-compose/compose.yaml`文件中, `include`如下服务, 即可自动下载前端: -- [compose.yaml](./web-downloader/compose.yaml): 自动下载的基础配置 -- [compose.track.yaml](./web-downloader/compose.track.yaml): 自动下载track的配置, 可选; -- [compose.bus.yaml](./web-downloader/compose.bus.yaml): 自动下载bus的配置, 可选; +- [compose.yaml](./web-downloader/compose.yml): 自动下载的基础配置 +- [compose.track.yaml](./web-downloader/compose.track.yml): 自动下载track的配置, 可选; +- [compose.bus.yaml](./web-downloader/compose.bus.yml): 自动下载bus的配置, 可选; #### 手动下载 diff --git a/examples/video-storage/compose.yaml b/examples/video-storage/compose.yaml index a779c1b..5287d07 100644 --- a/examples/video-storage/compose.yaml +++ b/examples/video-storage/compose.yaml @@ -7,7 +7,7 @@ include: - ../docker/minio/compose.yml - path: - ../docker/video/compose.yml - - ../docker/video/compose.storage.yaml + - ../docker/video/compose.storage.yml - path: - ../docker/video-nginx/compose.yml - ../docker/video-nginx/compose.minio.yml diff --git a/video/compose.storage.yaml b/video/compose.storage.yml similarity index 100% rename from video/compose.storage.yaml rename to video/compose.storage.yml diff --git a/web-downloader/compose.bus.yaml b/web-downloader/compose.bus.yml similarity index 100% rename from web-downloader/compose.bus.yaml rename to web-downloader/compose.bus.yml diff --git a/web-downloader/compose.track.yaml b/web-downloader/compose.track.yml similarity index 100% rename from web-downloader/compose.track.yaml rename to web-downloader/compose.track.yml diff --git a/web-downloader/compose.yaml b/web-downloader/compose.yml similarity index 100% rename from web-downloader/compose.yaml rename to web-downloader/compose.yml From 0ede7b7bbd6c9899cd2d7f17f14b7e4207aa4d14 Mon Sep 17 00:00:00 2001 From: cli Date: Thu, 23 Oct 2025 07:29:40 -0400 Subject: [PATCH 2/3] =?UTF-8?q?wip:=20=E5=AE=8C=E5=96=84track=E7=9A=84exam?= =?UTF-8?q?ple?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 - bus/compose.yml | 2 +- examples/track/.env | 10 +++++ examples/track/compose.yaml | 6 ++- examples/track/ssl/certificate.crt | 66 ++++++++++++++++++++++++++++++ examples/track/ssl/certificate.key | 27 ++++++++++++ jtt808/compose.yml | 6 +-- 7 files changed, 111 insertions(+), 8 deletions(-) create mode 100644 examples/track/.env create mode 100644 examples/track/ssl/certificate.crt create mode 100644 examples/track/ssl/certificate.key diff --git a/.gitignore b/.gitignore index 22450e2..400a26e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ -*.crt -*.key ip2region.xdb /compose.yaml /.env diff --git a/bus/compose.yml b/bus/compose.yml index 554dc37..29d4657 100644 --- a/bus/compose.yml +++ b/bus/compose.yml @@ -7,7 +7,7 @@ services: - ${DATA_DIR:-/data}/files:/data/files - ${DATA_DIR:-/data}/logs/gateway_808_2019:/logs environment: - - gateway_ip=${JTT808_IP} + - gateway_ip=${JTT808_IP:?required} - gateway_port=${JTT808_PORT} - gateway_type=bus-gps # 主动安全文件服务器 diff --git a/examples/track/.env b/examples/track/.env new file mode 100644 index 0000000..5a19006 --- /dev/null +++ b/examples/track/.env @@ -0,0 +1,10 @@ +SERVER_HOSTNAME='vpn.transbustransportes.com.br' +SERVER_IP_PUBLIC='200.155.137.26' +SSL_CERTIFICATE=/home/docker-compose/ssl/certificate + +MYSQL_PASSWORD='123456' +REDIS_PASSWORD='123456' +MONGODB_PASSWORD='123456' +RABBITMQ_PASSWORD='123456' +MINIO_PASSWORD='123456' +MAIL_PASSWORD='123456' diff --git a/examples/track/compose.yaml b/examples/track/compose.yaml index 2b96feb..7ce6a25 100644 --- a/examples/track/compose.yaml +++ b/examples/track/compose.yaml @@ -1,8 +1,6 @@ ## 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 @@ -14,3 +12,7 @@ include: - path: - ../docker/nginx/compose.yml - ../docker/nginx/compose.track.yml + - path: + - ../docker/web-downloader/compose.yml + - ../docker/web-downloader/compose.track.yml + diff --git a/examples/track/ssl/certificate.crt b/examples/track/ssl/certificate.crt new file mode 100644 index 0000000..bee34be --- /dev/null +++ b/examples/track/ssl/certificate.crt @@ -0,0 +1,66 @@ +-----BEGIN CERTIFICATE----- +MIIGcjCCBNqgAwIBAgIQVdh/VzIRn7qxxlnzQq2qFDANBgkqhkiG9w0BAQwFADBZ +MQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywg +SW5jLjEjMCEGA1UEAxMaVHJ1c3RBc2lhIFJTQSBEViBUTFMgQ0EgRzIwHhcNMjQw +MjI2MDAwMDAwWhcNMjUwMzAxMjM1OTU5WjAfMR0wGwYDVQQDExR4bi50cmFuc2Nv +ZGVncm91cC5jbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNSqy3f +dCHiZVEBqgEibsOPw6ZFCUSwYiSC4PIVHJ8RgT8LZ5KmXusFWy8PDzKCk9FrkCru +Pw9HV38k7X9QD4APPi0hr6hBQFfPaEaecILLEcGZbKblIt0SK2+tLVpl/V5459tz +UW9YAk1e/VNHrzjeF3LjHp10iSNdFGvwFEeDjZIzApuwlzbTJc+xeEVMxbD7yTns +OSgHoINcXudMK0HX29azhpJiLyjRU7XhNH3CPuYFRqN4M+Q8JrzKhMNGy/kwM2XU +9CWF+IIPabFA5m3YCIFMxgyxnye2zUXFhu4mjKogIpWQCzXdZJ0aVj6R7SxHFnwu +4t7BVsd79BvWnOECAwEAAaOCAu4wggLqMB8GA1UdIwQYMBaAFF86fBEQfgxncWHc +i6O1AANn9VccMB0GA1UdDgQWBBSDQZuIoSaNLiUCnFGQyXa7Q5z4HzAOBgNVHQ8B +Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB +BQUHAwIwSQYDVR0gBEIwQDA0BgsrBgEEAbIxAQICMTAlMCMGCCsGAQUFBwIBFhdo +dHRwczovL3NlY3RpZ28uY29tL0NQUzAIBgZngQwBAgEwfQYIKwYBBQUHAQEEcTBv +MEIGCCsGAQUFBzAChjZodHRwOi8vY3J0LnRydXN0LXByb3ZpZGVyLmNuL1RydXN0 +QXNpYVJTQURWVExTQ0FHMi5jcnQwKQYIKwYBBQUHMAGGHWh0dHA6Ly9vY3NwLnRy +dXN0LXByb3ZpZGVyLmNuMB8GA1UdEQQYMBaCFHhuLnRyYW5zY29kZWdyb3VwLmNu +MIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdwDPEVbu1S58r/OHW9lpLpvpGnFn +SrAX7KwB0lt3zsw7CAAAAY3i2w+SAAAEAwBIMEYCIQDWM0DCO/LzWU9nMTVDlwE4 +ZpLu+1Uc40dM6/CpcR4QwQIhAJtEV4GG++30LQ0/efFX2GGALaARf3HQkWjw/1xa +Etl7AHYAouMK5EXvva2bfjjtR2d3U9eCW4SU1yteGyzEuVCkR+cAAAGN4tsQeQAA +BAMARzBFAiAR5vWePpYic6f24jnBSkmTjr+Wpg+4iNunIT3HNcwZSgIhAPA4roLY +ulEfglCgZuy2DoefkYhNV3KKUdi+jH6NX4EvAHUATnWjJ1yaEMM4W2zU3z9S6x3w +4I4bjWnAsfpksWKaOd8AAAGN4tsQEQAABAMARjBEAiBUVmgZcWww/zgn/NdS/q0X +pA8M0b3o4cZhslkmCJSEqgIgAKb/FY2ZwCkyt95NIVSsdegiDfItOk3kgwLkRVF8 +h3wwDQYJKoZIhvcNAQEMBQADggGBACkIUZkiZs4UZ1y82eSFJoLOyCJCxur6M4+x +Njb8obl0llagtfQ4HiT9RvSv9r/slp27wgRqcVlqr+1KYiv49408D1pCUICbZxpE +U0QoMEUOMqVMY+nTZAx6nVPYkdEpjruM4i8B/CCkYwdeDCX0UmS3y8Fj/qhBAneu +gvS5iSa1WIuaUDSt8aADrs4oI1pigfyWMWyP02yBIdCRHBlfjoJ5kjbgJ36akN1j +Vb0e9BlRNAfdIlpWCjh/hpZFro+IajD6MMpBHFXzqEx3kMtjsvILbUjEGmK+Umyy +1ah8uIiwW4WOqrUc9+OK50LPe9d7RHpi2TImV9eBb9aSFIC5aDxiiIdGew2O4Zjg +AUTAESOJktsLToK3Cq8nLgEWFS8yrV7apBtqpU0TEz36wGH/3zolTOdwIZVuZ8Ho +JtClx5Z9bAt0kIzl692uSkLoGk9CCXAt17o1/5k9xqAujApLeEVJ6wlPcgcmrTJG +Vr3p97JMvgN9EA9N965/q1pkb6jZbw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFBzCCA++gAwIBAgIRALIM7VUuMaC/NDp1KHQ76aswDQYJKoZIhvcNAQELBQAw +ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV +BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yMjAxMTAwMDAwMDBaFw0y +ODEyMzEyMzU5NTlaMFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEg +VGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgUlNBIERWIFRM +UyBDQSBHMjCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKjGDe0GSaBs +Yl/VhMaTM6GhfR1TAt4mrhN8zfAMwEfLZth+N2ie5ULbW8YvSGzhqkDhGgSBlafm +qq05oeESrIJQyz24j7icGeGyIZ/jIChOOvjt4M8EVi3O0Se7E6RAgVYcX+QWVp5c +Sy+l7XrrtL/pDDL9Bngnq/DVfjCzm5ZYUb1PpyvYTP7trsV+yYOCNmmwQvB4yVjf +IIpHC1OcsPBntMUGeH1Eja4D+qJYhGOxX9kpa+2wTCW06L8T6OhkpJWYn5JYiht5 +8exjAR7b8Zi3DeG9oZO5o6Qvhl3f8uGU8lK1j9jCUN/18mI/5vZJ76i+hsgdlfZB +Rh5lmAQjD80M9TY+oD4MYUqB5XrigPfFAUwXFGehhlwCVw7y6+5kpbq/NpvM5Ba8 +SeQYUUuMA8RXpTtGlrrTPqJryfa55hTuX/ThhX4gcCVkbyujo0CYr+Uuc14IOyNY +1fD0/qORbllbgV41wiy/2ZUWZQUodqHWkjT1CwIMbQOY5jmrSYGBwwIDAQABo4IB +JjCCASIwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQwHQYDVR0OBBYE +FF86fBEQfgxncWHci6O1AANn9VccMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8E +CDAGAQH/AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAE +GzAZMA0GCysGAQQBsjEBAgIxMAgGBmeBDAECATBDBgNVHR8EPDA6MDigNqA0hjJo +dHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNy +bDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k +b2NhLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAHMUom5cxIje2IiFU7mOCsBr2F6CY +eU5cyfQ/Aep9kAXYUDuWsaT85721JxeXFYkf4D/cgNd9+hxT8ZeDOJrn+ysqR7NO +2K9AdqTdIY2uZPKmvgHOkvH2gQD6jc05eSPOwdY/10IPvmpgUKaGOa/tyygL8Og4 +3tYyoHipMMnS4OiYKakDJny0XVuchIP7ZMKiP07Q3FIuSS4omzR77kmc75/6Q9dP +v4wa90UCOn1j6r7WhMmX3eT3Gsdj3WMe9bYD0AFuqa6MDyjIeXq08mVGraXiw73s +Zale8OMckn/BU3O/3aFNLHLfET2H2hT6Wb3nwxjpLIfXmSVcVd8A58XH0g== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/examples/track/ssl/certificate.key b/examples/track/ssl/certificate.key new file mode 100644 index 0000000..543f91b --- /dev/null +++ b/examples/track/ssl/certificate.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAs1KrLd90IeJlUQGqASJuw4/DpkUJRLBiJILg8hUcnxGBPwtn +kqZe6wVbLw8PMoKT0WuQKu4/D0dXfyTtf1APgA8+LSGvqEFAV89oRp5wgssRwZls +puUi3RIrb60tWmX9Xnjn23NRb1gCTV79U0evON4XcuMenXSJI10Ua/AUR4ONkjMC +m7CXNtMlz7F4RUzFsPvJOew5KAegg1xe50wrQdfb1rOGkmIvKNFTteE0fcI+5gVG +o3gz5DwmvMqEw0bL+TAzZdT0JYX4gg9psUDmbdgIgUzGDLGfJ7bNRcWG7iaMqiAi +lZALNd1knRpWPpHtLEcWfC7i3sFWx3v0G9ac4QIDAQABAoIBAATcjyT/e53GjkIf +tizxMskM/vwlP37T/FkqjjAp99xtJFCh/cUZSxX6j3ILablQFnNVQ/OSAXYn1Dyv +ctvifwUVBLXDBcjdOgIXbqeJeJnnKPxTbUFqEWOmcDSHIKVkgfW7d+e4bOMEow1X +b61AEoVLah3Uf/o7VFN33MufVuFoaUJMPSPGfhAAnOa/NDBS/raBfDfdWARRWHbv +3Izfd/2tsLXdiQfJB1TdlIV5gkFQTrXUlopCtAWEBrSsv0nTn9d48jrVedIHx2po +tv7BzHE6ly8N+fm40GB2Jy0JiGYccf6laSe50/0XXMXM3Dp2RJfpPLUZVhItFarb +ztyRAUUCgYEA1uxxfIkqd63thUf7H87LkmGBf+qlBfCnpUbNRPEswNZPHHW/ujCx +KdYYvxsJY4LHKSz1ixfIy2pOvXiXXuK/mDxk/sc9rO/c7RLgLyh/HqcNxa8gzAPJ +UYxWvyVmyw698oEo2klfidNzcIAWGxiGVpGW/4XkIMdPCwFNvZghng0CgYEA1Zhk +fa1uMVRs5i23lFyLEJYWAhUGBPpykEABipnMcX61CH4zraVLR/oWJJJ7WpHKfUNN +az2zeU1vTnAdr1JnDBnCECl+XZPgYWORJaVsWKX4apEqyJ8lBSEdwc6SnPIyqeyJ +YB+rjsKAvQOaSiis4a6PSy4LxO96GVpo5SlZmSUCgYEAzirkNnWR8lo61baV9A44 +g8PbKOzavpb7CnWfpTnBF369RuzBLYdV+27wMCpsWDP0ftAs/u+i41aoD+MlOZVD ++3I745cW19UEVbrcqQAs6SeQ84gqaupa7Uo1UIk9UR5kIcO6f6MQ7bKUM1/7VKSz +AUoJ0jYK/1KRxVnLzEqqPOUCgYEAvJP4HPFyuUDFiI9SZj0yVil8Mshm8RxA61Rn +R/wzgPySTnZFoAiwp1KIHC/rknHnKaKzBnyKKQ2RuNnJi5GgAxH2wRgxReMaFkG2 +01ryhm26HjQeZtQC9j1frU15KfG3g0ifnOs5JyhYSwiUPuccg3//aSu1HmEkFqA4 +viI8xbUCgYB1bloJKa7nDjS7+BVmJBe0WKOSIE2hf4yD37ux0Xgu4LFYcLCsMi1r +ETtAvt6u6M3rb4iq2PEywwEwsh4Pvcfc50rBjNtrz8UYzEdGfGzwj7b9Jg24675Z +4sfJtRmEZ1/BjMkFcvbhzispSdNIFDwKDwcQug6ijk1Kot//Ho2Sww== +-----END RSA PRIVATE KEY----- diff --git a/jtt808/compose.yml b/jtt808/compose.yml index 6ff627a..9bc272c 100644 --- a/jtt808/compose.yml +++ b/jtt808/compose.yml @@ -29,9 +29,9 @@ services: - gateway_ftp_passive_ports=${JTT808_PORT_FTP_PASSIVE} # 终端注册服务 - - gateway_device-register-url=${WEB_BASE_URL} - # 网关Http服务, 需要代理？ - - gateway_http_url=${WEB_BASE_URL}/jtt808 + - gateway_device-register-url=${WEB_BASE_URL:-http://${MAINTAIN_HOST}:${MAINTAIN_PORT}} + # 网关Http服务 + - gateway_http_url=${WEB_BASE_URL:-http://${MAINTAIN_HOST}:${MAINTAIN_PORT}}/jtt808 # MongoDB - spring_data_mongodb_host=${MONGODB_HOST:-mongodb} From 1a683433e8eebc229101253bc70f47e59f0616e9 Mon Sep 17 00:00:00 2001 From: cli Date: Thu, 23 Oct 2025 07:43:59 -0400 Subject: [PATCH 3/3] =?UTF-8?q?wip:=20=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.default | 76 +++++++++++++++++++++++++++++----------------------- README.md | 12 ++++++--- 2 files changed, 51 insertions(+), 37 deletions(-) diff --git a/.env.default b/.env.default index 40ac64a..6249058 100644 --- a/.env.default +++ b/.env.default @@ -1,10 +1,15 @@ -## 服务器IP, 网关等服务不设置IP的时候,默认会读取这个 -# 必填，当前服务器外网IP -SERVER_IP_PUBLIC='' # 127.0.0.1 -# 必填, 当前服务器内网IP -SERVER_IP_INTERNAL='' # 127.0.0.1 -# 服务器域名 +# 必填, 当前服务器公网IP, jtt808/video等服务不设置IP的时候,默认会读取这个 +SERVER_IP_PUBLIC='' # 58.82.168.181 + +# 当前服务器内网IP, 目前没有人使用, 可以不填 +# JTT808_HOST/MYSQL_HOST等变量, 单机部署可以直接使用别名(eg: jtt808)，内网多服务器部署推荐内网IP, 公网部署使用公网IP +SERVER_IP_INTERNAL='' + +# 必填, 服务器域名, 若没有域名, 则填写公网IP SERVER_HOSTNAME='' # livedvr.tripsdd.com + +# 必填, 证书文件的绝对路径, 排除.crt/.key后缀, nginx实际读取的是 ${SSL_CERTIFICATE}.crt 和 ${SSL_CERTIFICATE}.key 两个文件 +# 即使不使用https或者暂时没申请到证书, 也要配置该变量, 否则nginx会报错, 可以直接使用examples里面的假证书: /home/docker/examples/track/ssl/certificate SSL_CERTIFICATE='' # /home/docker-compose/ssl/livedvr_tripsdd_com # bus和track部署在同一台服务器上时, 需要通过域名区分两者 @@ -17,6 +22,8 @@ TRACK_SSL_CERTIFICATE=${SSL_CERTIFICATE} ## 前端配置 WEB_PORT_HTTP=80 WEB_PORT_HTTPS=443 +# 前端的公网URL +# jtt808和maintain分开部署时, 必须填写这个变量 WEB_BASE_URL='' # https://livedvr.tripsdd.com #--------------------------------------------- @@ -38,6 +45,7 @@ BUS_GATEWAY_VERSION=1.21.1 BUS_GATEWAY_808_2019_VERSION=25.8.25 BUS_GATEWAY_JSATL12_VERSION=23.1.21 BUS_GATEWAY_CALCULATION_VERSION=1.17.0 + # track前端版本 TRACK_WEB_VERSION=1.53.0 # track前端文件复写目录, 该目录中的文件会在compose被up时被复制到track前端目录, 通常可以复写如下文件: @@ -53,11 +61,11 @@ TRACK_JTT808_VERSION=1.18.0 # --------------------------------------------- ## 视频服务器 -# 必填, 视频外网IP, APP客户端和设备连接 +# 必填, 视频公网IP, APP客户端和设备连接 VIDEO_IP=${SERVER_IP_PUBLIC} # 必填 VIDEO_HOSTNAME=${SERVER_HOSTNAME} # livedvr.tripsdd.com -# 必填, 证书文件的绝对路径, 排除.crt/.key后缀, nginx使用的是 $VIDEO_SSL_CERTIFICATE.crt 和 $VIDEO_SSL_CERTIFICATE.key 两个文件 +# 必填 VIDEO_SSL_CERTIFICATE=${SSL_CERTIFICATE} # /home/docker/video-nginx/ssl/livedvr_tripsdd_com # 终端-实时直播端口 @@ -84,9 +92,8 @@ VIDEO_PORT_HTTPS_5=9089 ## 网关服务器 # 必填, 后端和流媒体服务往网关服务器注册或者下发指令 -# 单机部署推荐别名jtt808，内网多服务器部署推荐内网IP, 外网部署使用外网IP -JTT808_HOST='jtt808' # jtt808 | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC} -JTT808_IP=${SERVER_IP_PUBLIC} # 默认使用服务器外网IP,设备使用 +JTT808_HOST='jtt808' +JTT808_IP=${SERVER_IP_PUBLIC} # 默认使用服务器公网IP,设备使用 JTT808_PORT=9011 JTT808_PORT_HTTP=9012 JTT808_PORT_FILE=9013 @@ -97,7 +104,7 @@ JTT808_PORT_FTP_PASSIVE=9041-9049 #--------------------------------------------- ## maintain -MAINTAIN_HOST='maintain' # maintain | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC} +MAINTAIN_HOST='maintain' MAINTAIN_PORT='8080' # TOKEN目录的绝对路径, 包含以下文件, 最新版服务器已经支持自动生成/下载这些文件: # - access/ras_key|ras_key.pub: 访问密钥的公私钥对 @@ -105,46 +112,47 @@ MAINTAIN_PORT='8080' # - ip2region.xdb: ip到区域的映射数据, 手动下载连接: https://raw.githubusercontent.com/lionsoul2014/ip2region/master/data/ip2region.xdb MAINTAIN_TOKEN_DIR=${DOCKER_COMPOSE_DIR}/token -## MYSQL, 必填 -MYSQL_HOST='mysql8' # mysql8 | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC} +## MYSQL +MYSQL_HOST='mysql8' MYSQL_PORT=3306 -MYSQL_USERNAME='root' #xxxxxxxx -MYSQL_PASSWORD='' #xxxxxxxx +MYSQL_USERNAME='root' +MYSQL_PASSWORD='' # 必填 -## REDIS, 必填 -REDIS_HOST='redis' # redis | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC} +## REDIS +REDIS_HOST='redis' REDIS_PORT=6379 -REDIS_PASSWORD='' #xxxxxxxx +REDIS_PASSWORD='' # 必填 -## MongoDB, jtt808必填 -MONGODB_HOST='mongodb' # mongodb | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC} +## MongoDB +MONGODB_HOST='mongodb' MONGODB_PORT=27017 MONGODB_PORT_HTTP=15672 -MONGODB_USERNAME='root' # MONGODB -MONGODB_PASSWORD='' # MONGODB +MONGODB_USERNAME='root' +MONGODB_PASSWORD='' # 必填 -## Rabbitmq, Rtp存储模式必填 -RABBITMQ_HOST='rabbitmq' # rabbitmq | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC} +## Rabbitmq +RABBITMQ_HOST='rabbitmq' RABBITMQ_PORT=5672 -RABBITMQ_USERNAME='admin' # admin -RABBITMQ_PASSWORD='' # 123 +RABBITMQ_USERNAME='admin' +RABBITMQ_PASSWORD='' # 必填 -## Minio, Rtp存储模式必填, 规避RTP-9000端口冲突 -MINIO_HOST='minio' # minio | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC} +## Minio +MINIO_HOST='minio' MINIO_PORT=8000 MINIO_PORT_HTTP=8001 MINIO_USER=minioadmin -MINIO_PASSWORD='' # xxxxxxxxxxxxxxxx +MINIO_PASSWORD='' # 必填 # MINIO_ACCESSKEY/SECRETKEY, 默认使用帐号&密码, 也可以在minio的管理后台创建一组新的KEY -MINIO_ACCESSKEY=${MINIO_USER} # xxxxxxxxxxxxxxxx -MINIO_SECRETKEY=${MINIO_PASSWORD} # xxxxxxxxxxxxxxxxx +MINIO_ACCESSKEY=${MINIO_USER} +MINIO_SECRETKEY=${MINIO_PASSWORD} # MINIO ftp功能 MINIO_FTP_PORT=8021 MINIO_FTP_PASSIVE_PORT=8523-8529 #--------------------------------------------- ## 邮件 +# 默认使用transcodegroup的邮箱 MAIL_HOST=smtp.transcodegroup.com MAIL_USERNAME=bus@transcodegroup.com -# 需要去企业邮箱中创建密码 -MAIL_PASSWORD='' #xxxxxxxxxxxxxxxx +# 必填, 需要去企业邮箱中创建密码 +MAIL_PASSWORD='' diff --git a/README.md b/README.md index 26b1774..e4f0fd2 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ git clone https://github.com/TranscodeGroup/docker.git /home/docker - [video-storage](./examples/video-storage/compose.yaml): RTP存储 - [video-stream](./examples/video-stream/compose.yaml): RTP视频 - [track](./examples/track/compose.yaml): Tracker V2单机部署 +- [bus](./examples/bus/compose.yaml): Bus单机部署 - etc. ### 3. 配置`.env` @@ -43,9 +44,14 @@ docker compose config > compose-stack.yaml 在`/home/docker-compose/compose.yaml`文件中, `include`如下服务, 即可自动下载前端: -- [compose.yaml](./web-downloader/compose.yml): 自动下载的基础配置 -- [compose.track.yaml](./web-downloader/compose.track.yml): 自动下载track的配置, 可选; -- [compose.bus.yaml](./web-downloader/compose.bus.yml): 自动下载bus的配置, 可选; +```yaml +include: + # ... + - path: + - ../docker/web-downloader/compose.yml # 自动下载的基础配置 + - ../docker/web-downloader/compose.track.yml # 自动下载track, 可选 + - ../docker/web-downloader/compose.bus.yml # 自动下载bus, 可选 +``` #### 手动下载