diff --git a/docs/docker/nginx.conf b/docs/docker/nginx.conf index 9b9c3889..ca3bac3a 100644 --- a/docs/docker/nginx.conf +++ b/docs/docker/nginx.conf @@ -42,9 +42,9 @@ http { proxy_set_header Referer $http_referer; proxy_set_header Cookie $http_cookie; - proxy_connect_timeout 10; - proxy_send_timeout 10; - proxy_read_timeout 10; + proxy_connect_timeout 15; + proxy_send_timeout 15; + proxy_read_timeout 15; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/docs/docker/start.sh b/docs/docker/start.sh index bdaa1e1a..a64f46ba 100644 --- a/docs/docker/start.sh +++ b/docs/docker/start.sh @@ -6,6 +6,7 @@ java -jar /app/xiaozhi-esp32-api.jar \ --spring.datasource.druid.username=${SPRING_DATASOURCE_DRUID_USERNAME} \ --spring.datasource.druid.password=${SPRING_DATASOURCE_DRUID_PASSWORD} \ --spring.data.redis.host=${SPRING_DATA_REDIS_HOST} \ + --spring.data.redis.password=${SPRING_DATA_REDIS_PASSWORD} \ --spring.data.redis.port=${SPRING_DATA_REDIS_PORT} & # 启动Nginx(前台运行保持容器存活) diff --git a/main/xiaozhi-server/docker-compose_all.yml b/main/xiaozhi-server/docker-compose_all.yml index 4707a449..b3602d45 100644 --- a/main/xiaozhi-server/docker-compose_all.yml +++ b/main/xiaozhi-server/docker-compose_all.yml @@ -48,6 +48,7 @@ services: - SPRING_DATASOURCE_DRUID_USERNAME=root - SPRING_DATASOURCE_DRUID_PASSWORD=123456 - SPRING_DATA_REDIS_HOST=xiaozhi-esp32-server-redis + - SPRING_DATA_REDIS_PASSWORD= - SPRING_DATA_REDIS_PORT=6379 volumes: # 配置文件目录