wip: minio的key默认使用帐号密码

Author: th-ci

.env.default

@@ -97,7 +97,7 @@ MONGODB_PASSWORD='' # MONGODB
 ## Rabbitmq, Rtp存储模式必填
 RABBITMQ_HOST='rabbitmq' # rabbitmq | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC}
 RABBITMQ_PORT=5672
-RABBITMQ_USERNAME='' # admin
+RABBITMQ_USERNAME='admin' # admin
 RABBITMQ_PASSWORD='' # 123
 
 ## Minio, Rtp存储模式必填, 规避RTP-9000端口冲突
@@ -106,9 +106,9 @@ MINIO_PORT=8000
 MINIO_PORT_HTTP=8001
 MINIO_USER=minioadmin
 MINIO_PASSWORD='' # xxxxxxxxxxxxxxxx
-# MINIO_ACCESSKEY/SECRETKEY需要从minio的管理后台创建
-MINIO_ACCESSKEY='' # xxxxxxxxxxxxxxxx
-MINIO_SECRETKEY='' # xxxxxxxxxxxxxxxxx
+# MINIO_ACCESSKEY/SECRETKEY, 默认使用帐号&密码, 也可以在minio的管理后台创建一组新的KEY
+MINIO_ACCESSKEY=${MINIO_USER} # xxxxxxxxxxxxxxxx
+MINIO_SECRETKEY=${MINIO_PASSWORD} # xxxxxxxxxxxxxxxxx
 
 #---------------------------------------------
 

environments/.env.video.storage

@@ -10,10 +10,7 @@ JTT808_HOST=103.20.204.149
 # RABBITMQ
 RABBITMQ_HOST=1111 # 58.82.168.181
 RABBITMQ_PORT=5672
-RABBITMQ_USERNAME=1111 # admin
 RABBITMQ_PASSWORD=111 # 123
 
 # MINIO
-MINIO_PASSWORD=11 # xxxxxxxxxxxxxxxx
-MINIO_ACCESSKEY=22 # xxxxxxxxxxxxxxxx
-MINIO_SECRETKEY=22 # xxxxxxxxxxxxxxxxx
+MINIO_PASSWORD=11 # xxxxxxxxxxxxxxxx

jtt808/compose.yml

@@ -41,7 +41,7 @@ services:
       # RabbitMq
       - spring_rabbitmq_host=${RABBITMQ_HOST:-rabbitmq}
       - spring_rabbitmq_port=${RABBITMQ_PORT:-5672}
-      - spring_rabbitmq_username=${RABBITMQ_USERNAME:?required}
+      - spring_rabbitmq_username=${RABBITMQ_USERNAME:-admin}
       - spring_rabbitmq_password=${RABBITMQ_PASSWORD:?required}
       - spring_rabbitmq_virtual-host=/track
 

maintain/compose.yml

@@ -30,8 +30,8 @@ services:
       # RABBITMQ
       - spring.rabbitmq.host=${RABBITMQ_HOST:-rabbitmq}
       - spring.rabbitmq.port=${RABBITMQ_PORT:-5672}
-      - spring.rabbitmq.username=${RABBITMQ_USERNAME:-track}
-      - spring.rabbitmq.password=${RABBITMQ_PASSWORD:-track@123}
+      - spring.rabbitmq.username=${RABBITMQ_USERNAME:-admin}
+      - spring.rabbitmq.password=${RABBITMQ_PASSWORD:?required}
       - spring.rabbitmq.virtual-host=/track
 
       # MINIO数据端口

minio/compose.yml

@@ -8,7 +8,7 @@ services:
       - ${MINIO_PORT:-8000}:${MINIO_PORT:-8000}
       - ${MINIO_PORT_HTTP:-8001}:${MINIO_PORT_HTTP:-8001}
     environment:
-      - MINIO_ROOT_USER=minioadmin
+      - MINIO_ROOT_USER=${MINIO_USER:-minioadmin}
       - MINIO_ROOT_PASSWORD=${MINIO_PASSWORD:?required}
       - MINIO_BROWSER_REDIRECT_URL=https://${VIDEO_HOSTNAME:?required}
     volumes:

rabbitmq/compose.yml

@@ -16,7 +16,7 @@ services:
       #- 61613:61613
     privileged: true
     environment:
-      - RABBITMQ_DEFAULT_USER=${RABBITMQ_USERNAME:?required}
+      - RABBITMQ_DEFAULT_USER=${RABBITMQ_USERNAME:-admin}
       - RABBITMQ_DEFAULT_PASS=${RABBITMQ_PASSWORD:?required}
       - RABBITMQ_DEFAULT_VHOST=/track
     volumes:

video/compose.storage.yaml

@@ -23,6 +23,6 @@ services:
       - spring_rabbitmq_enabled=true
       - spring_rabbitmq_host=${RABBITMQ_HOST:-rabbitmq}
       - spring_rabbitmq_port=${RABBITMQ_PORT:-5672}
-      - spring_rabbitmq_username=${RABBITMQ_USERNAME:?required}
+      - spring_rabbitmq_username=${RABBITMQ_USERNAME:-admin}
       - spring_rabbitmq_password=${RABBITMQ_PASSWORD:?required}
       - spring_rabbitmq_virtual-host=/track