diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml index d5fb6fc..3b2bb50 100644 --- a/deploy/docker-compose.yaml +++ b/deploy/docker-compose.yaml @@ -1,6 +1,6 @@ services: oneterm-api: - image: registry.cn-hangzhou.aliyuncs.com/veops/oneterm-api:v25.6.1 + image: registry.cn-hangzhou.aliyuncs.com/veops/oneterm-api:v25.6.2 container_name: oneterm-api environment: ONETERM_RDP_DRIVE_PATH: /rdp @@ -95,7 +95,7 @@ services: - redis oneterm-ui: - image: registry.cn-hangzhou.aliyuncs.com/veops/oneterm-ui:v25.6.1 + image: registry.cn-hangzhou.aliyuncs.com/veops/oneterm-ui:v25.6.2 container_name: oneterm-ui depends_on: oneterm-api: @@ -121,7 +121,7 @@ services: - "8666:80" acl-api: - image: registry.cn-hangzhou.aliyuncs.com/veops/acl-api:2.0 + image: registry.cn-hangzhou.aliyuncs.com/veops/acl-api:2.1 container_name: oneterm-acl-api depends_on: mysql: @@ -131,6 +131,7 @@ services: environment: TZ: Asia/Shanghai WAIT_HOSTS: mysql:3306, redis:6379 + SYSTEM_DEFAULT_LANGUAGE: en-US # en-US, zh-CN volumes: - ./.env:/data/apps/acl/.env restart: always diff --git a/deploy/nginx.oneterm.conf.example b/deploy/nginx.oneterm.conf.example index 1a1540a..207dcfc 100644 --- a/deploy/nginx.oneterm.conf.example +++ b/deploy/nginx.oneterm.conf.example @@ -76,7 +76,7 @@ server { client_body_timeout 1800s; # Body timeout: 30 minutes } - location /api/oneterm { + location ^~ /api/oneterm { proxy_pass http://${ONETERM_API_HOST}; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -90,7 +90,7 @@ server { } - location /api/v1/acl { + location /api { proxy_pass http://${ACL_API_HOST}; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr;