diff --git a/admin-web/nginx-admin.conf b/admin-web/nginx-admin.conf index 2c638be..f46d37b 100644 --- a/admin-web/nginx-admin.conf +++ b/admin-web/nginx-admin.conf @@ -32,8 +32,12 @@ server { } # API proxy to backend + # 用 resolver + 变量 proxy_pass:避免 nginx 启动时 backend DNS 还没就绪就 [emerg] 退出 + # Docker Compose 默认网络的内置 DNS resolver 是 127.0.0.11 + resolver 127.0.0.11 valid=30s ipv6=off; + set $backend_upstream "http://backend:8080"; location /api/ { - proxy_pass http://backend:8080; + proxy_pass $backend_upstream; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -42,7 +46,7 @@ server { # WebSocket proxy for chat location /ws/ { - proxy_pass http://backend:8080; + proxy_pass $backend_upstream; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; diff --git a/admin-web/pnpm-workspace.yaml b/admin-web/pnpm-workspace.yaml index 4cc8c79..fea6d3f 100644 --- a/admin-web/pnpm-workspace.yaml +++ b/admin-web/pnpm-workspace.yaml @@ -20,8 +20,8 @@ packages: - '.' allowBuilds: - esbuild: set this to true or false - vue-demi: set this to true or false + esbuild: true + vue-demi: true onlyBuiltDependencies: - esbuild - vue-demi diff --git a/admin-web/public/brand/logo-mark.png b/admin-web/public/brand/logo-mark.png index 7658bcb..ec11903 100644 Binary files a/admin-web/public/brand/logo-mark.png and b/admin-web/public/brand/logo-mark.png differ diff --git a/admin-web/src/layouts/MainLayout.vue b/admin-web/src/layouts/MainLayout.vue index 5276e3c..e727b1f 100644 --- a/admin-web/src/layouts/MainLayout.vue +++ b/admin-web/src/layouts/MainLayout.vue @@ -1,26 +1,52 @@