diff --git a/.gitignore b/.gitignore index 3c38bb4..9a11415 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ dist/ # ==================== 日志文件 ==================== logs/ *.log -log/ +/log/ # ==================== 临时文件 ==================== *.tmp diff --git a/deploy/nginx/worklog.conf b/deploy/nginx/worklog.conf index e22f380..4f5ecf7 100644 --- a/deploy/nginx/worklog.conf +++ b/deploy/nginx/worklog.conf @@ -24,9 +24,9 @@ server { gzip_min_length 1024; gzip_types text/plain text/css text/xml text/javascript application/json application/javascript application/xml+rss application/rss+xml font/truetype font/opentype application/vnd.ms-fontobject image/svg+xml; - # 管理后台 + # 管理后台前端静态资源 location /admin/ { - alias /opt/worklog/worklog-admin/dist/; + alias /opt/worklog/worklog-web/dist/; try_files $uri $uri/ /admin/index.html; index index.html; @@ -37,7 +37,7 @@ server { } } - # 移动端 H5 + # 移动端 H5 前端静态资源 location /mobile/ { alias /opt/worklog/worklog-mobile/dist/; try_files $uri $uri/ /mobile/index.html; @@ -50,9 +50,9 @@ server { } } - # 后端 API 代理 - location /api/ { - proxy_pass http://127.0.0.1:8080; + # 管理后台 API 代理 (/wladmin/api/v1 → /wlog/api/v1) + location /wladmin/api/ { + proxy_pass http://127.0.0.1:8200/wlog/api/; # 代理头设置 proxy_set_header Host $host; @@ -70,16 +70,33 @@ server { proxy_buffer_size 4k; proxy_buffers 8 4k; proxy_busy_buffers_size 8k; + } + + # 移动端 API 代理 (/wlmobile/api/v1 → /wlog/api/v1) + location /wlmobile/api/ { + proxy_pass http://127.0.0.1:8200/wlog/api/; - # WebSocket 支持(如需要) - # proxy_http_version 1.1; - # proxy_set_header Upgrade $http_upgrade; - # proxy_set_header Connection "upgrade"; + # 代理头设置 + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + # 超时设置 + proxy_connect_timeout 60s; + proxy_send_timeout 60s; + proxy_read_timeout 60s; + + # 缓冲设置 + proxy_buffering on; + proxy_buffer_size 4k; + proxy_buffers 8 4k; + proxy_busy_buffers_size 8k; } # Swagger API 文档(生产环境建议关闭或限制访问) - location /swagger-ui.html { - proxy_pass http://127.0.0.1:8080; + location /wlog/swagger-ui.html { + proxy_pass http://127.0.0.1:8200; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -90,8 +107,8 @@ server { } # 健康检查接口 - location /api/v1/health { - proxy_pass http://127.0.0.1:8080; + location /wlog/api/v1/health { + proxy_pass http://127.0.0.1:8200; proxy_set_header Host $host; access_log off; # 健康检查不记录日志 } diff --git a/worklog-mobile/.gitignore b/worklog-mobile/.gitignore new file mode 100644 index 0000000..a547bf3 --- /dev/null +++ b/worklog-mobile/.gitignore @@ -0,0 +1,24 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/worklog-mobile/index.html b/worklog-mobile/index.html new file mode 100644 index 0000000..5aa90f9 --- /dev/null +++ b/worklog-mobile/index.html @@ -0,0 +1,13 @@ + + +
+ + + +{{ log.content || '暂无内容' }}
+