diff --git a/start/airport.sh b/start/airport.sh index 21bbc0d..da8b4be 100755 --- a/start/airport.sh +++ b/start/airport.sh @@ -16,7 +16,7 @@ if [ "$USEDAJIANG" = "true" ]; then --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${AIRPORT_NAME} \ --env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ - --env XXL_ENABLE=false \ + --env XXL_ENABLE=true \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ --env SPRING_DATASOURCE_URL="jdbc:mysql://${MYSQL_NAME}:3306/tuoheng_airport?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \ @@ -43,7 +43,7 @@ else --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${AIRPORT_NAME} \ --env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ - --env XXL_ENABLE=false \ + --env XXL_ENABLE=true \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ --env SPRING_DATASOURCE_URL="jdbc:mysql://${MYSQL_NAME}:3306/tuoheng_airport?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \ diff --git a/start/dspapi.sh b/start/dspapi.sh index 04c8700..2bd6cec 100755 --- a/start/dspapi.sh +++ b/start/dspapi.sh @@ -15,7 +15,7 @@ docker run --pull always -d \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${DSP_API_NAME} \ --env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ ---env XXL_ENABLE=false \ +--env XXL_ENABLE=true \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ --env SPRING_DATASOURCE_DRUID_URL="jdbc:mysql://${MYSQL_NAME}:3306/tuoheng_dsp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \ diff --git a/start/nginx.sh b/start/nginx.sh index 148b785..46a2b41 100755 --- a/start/nginx.sh +++ b/start/nginx.sh @@ -17,8 +17,7 @@ DOCKER_RUN_CMD="docker run --pull always -d \ --env TZ=Asia/Shanghai \ --memory ${NGINX_MEMORY} \ --volume ${STREAM_DATA}:/data/recording \ ---volume ${SRS_DATA}:/data/srs \ ---restart unless-stopped" +--volume ${SRS_DATA}:/data/srs" # 如果配置了证书,添加证书挂载 if [ ! -z "${PEM_PATH}" ] && [ ! -z "${KEY_PATH}" ]; then diff --git a/说明.md b/说明.md index 70eb59f..f08ccab 100644 --- a/说明.md +++ b/说明.md @@ -42,9 +42,16 @@ https://minioconsole-develop.t-aaron.com:3443/ miniopassword miniopassword minio管理台: http://139.224.117.253:9022/login miniopassword miniopassword +https://minio-dashuju.t-aaron.com:3443/th-airport/testFile/5cd3ecbf-540e-4f75-afd3-fdc1c0a6b554.jpg + 文件读取地址样例: https://minio-develop.t-aaron.com:3443/image/WechatIMG65.jpg +http://MINIO:9000/th-airport/testFile/5cd3ecbf-540e-4f75-afd3-fdc1c0a6b554.jpg + + +https://minio-dashuju:3443/th-airport/testFile/5cd3ecbf-540e-4f75-afd3-fdc1c0a6b554.jpg + 录制视频地址样例: https://srs-develop.t-aaron.com:3443/recording/50ae8720-d8b3-40c6-9e2b-4eb31ed619e6.mp4