xxx

builder/Dockerfile

@@ -1,6 +1,6 @@
 # 使用一个基础镜像
 #FROM openjdk:11-jre-slim
-FROM tuoheng/centos:base
+FROM registry.t-aaron.com/tuoheng/centos:base
 USER th
 # 定义构建参数
 ARG SW_APP_NAME

environment.sh

@@ -85,8 +85,8 @@ export MINIO_API_PORT=9000
 export MINIO_CONSOLE_PORT=9002
 export MINIO_ROOT_USER=miniopassword
 export MINIO_ROOT_PASSWORD=miniopassword   
-export MINIO_ACCESS_KEY=minioaccesskey
-export MINIO_SECRET_KEY=minioaccesskey
+export MINIO_ACCESS_KEY=shvngIfksXjTqlQHKSxt
+export MINIO_SECRET_KEY=Xed4RsGAF1iX7bzEsNEXydnEYsWMUHzU4cA4IPGl
 
 # Elasticsearch 配置
 export ES_NAME=ES_${DOMAIN}
@@ -171,7 +171,8 @@ export HHZ_ADMIN_MEMORY=512m
 export AIRPORT_NAME=AIRPORT${DOMAIN}
 export AIRPORT_IMAGE=${REGISTRY_HOST}airport:${DOMAIN}
 export AIRPORT_JAR=tuoheng_airport_admin.jar
-export AIRPORT_REMOTE_JAR=/home/th/workspace/jndsj/jar/airport/${AIRPORT_JAR}
+#export AIRPORT_REMOTE_JAR=/home/th/workspace/jndsj/jar/airport/${AIRPORT_JAR}
+export AIRPORT_REMOTE_JAR=/Users/sunpeng/workspace/remote/tuoheng_airport/tuoheng-admin/target/${AIRPORT_JAR}
 export AIRPORT_MEMORY=1g
 #export AIRPORT_WEB_DIST=/home/th/workspace/jndsj/web/tuoheng_airport_web/dist
 export AIRPORT_WEB_DIST=/Users/sunpeng/workspace/remote/docker/tuoheng_airport_web/dist

nginx/vhosts/minio.conf

@@ -1,9 +1,8 @@
-
 server {
     listen 80;
     listen 443 ssl;
     server_name ${MINIO_DOMAIN};
-
+    client_max_body_size 2g;
     ssl_certificate /etc/nginx/t-aaron.com.pem;
     ssl_certificate_key /etc/nginx/t-aaron.com.key;
     ssl_session_timeout 5m;
@@ -17,4 +16,15 @@ server {
         proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_pass http://${MINIO_NAME}:9000;
     }
+
+    location /ta-tech-image/DJIimage {
+        add_header Content-Disposition 'attachment; filename="$arg_filename"';
+        add_header x-oss-force-download 'true';
+        proxy_set_header Host $http_host;
+        proxy_set_header  X-Real-IP    $remote_addr;
+        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://${MINIO_NAME}:9000;
+    }
+
+
 }                                                                                                                                                                                                                                                 

nginx/vhosts/srs.conf

@@ -2,7 +2,7 @@ server {
     listen 80;
     listen 443 ssl;
     server_name ${SRS_DOMAIN};
-
+    client_max_body_size 2g;
     ssl_certificate /etc/nginx/t-aaron.com.pem;
     ssl_certificate_key /etc/nginx/t-aaron.com.key;
     ssl_session_timeout 5m;

start/airport.sh

@@ -30,10 +30,11 @@ docker run --pull always -d \
 --env VIDEO_SERVER_REQUEST_URL=http://${STREAM_NAME}:8080 \
 --env VIDEO_SERVER_VIDEO_PLAY_URL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/recording/ \
 --env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:9092 \
---env MINIO_OSS_ENDPOINT=https://${MINIO_DOMAIN}:${NGINX_HTTPS_PORT} \
+--env MINIO_OSS_ENDPOINT=http://${MINIO_NAME}:9000 \
+--env MINIO_OSS_OUTENDPOINT=https://${MINIO_DOMAIN}:${NGINX_HTTPS_PORT} \
 --env MINIO_DAJIOSS_ENDPOINT=https://${MINIO_DOMAIN}:${NGINX_HTTPS_PORT} \
---env MINIO_OSS_ACCESS_KEY=${MINIO_ACCESS_KEY} \
---env MINIO_OSS_SECRET_KEY=${MINIO_SECRET_KEY} \
+--env MINIO_OSS_ACCESSKEYID=${MINIO_ACCESS_KEY} \
+--env MINIO_OSS_ACCESSKEYSECRET=${MINIO_SECRET_KEY} \
 --env TZ=Asia/Shanghai \
 --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \
 --memory ${AIRPORT_MEMORY} \