diff --git a/nginx-https.conf b/nginx-https.conf index 322595f..c634632 100644 --- a/nginx-https.conf +++ b/nginx-https.conf @@ -50,7 +50,7 @@ server { # ========== 重要:后端API代理配置 ========== # 将所有API请求代理到后端服务器(解决混合内容问题) # 注意:这里的路径需要与前端 VUE_APP_BASE_API 配置一致 - location /dev-api/ { + location /jarvis-api/ { proxy_pass http://127.0.0.1:30313/; # 后端服务地址 # 请求头设置 @@ -81,36 +81,36 @@ server { client_max_body_size 100M; } - # 腾讯文档OAuth回调接口(必须放在 /dev-api/ 之后,location / 之前) + # 腾讯文档OAuth回调接口(必须放在 /jarvis-api/ 之后,location / 之前) location /tendoc-callback { proxy_pass http://127.0.0.1:30313/tendoc-callback; - 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_set_header X-Forwarded-Host $server_name; - } - - # jarvis相关API代理(包括腾讯文档的其他接口) - location /jarvis/ { - proxy_pass http://127.0.0.1:30313/jarvis/; + + # 请求头设置 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_set_header X-Forwarded-Host $server_name; - # HTTP版本和WebSocket支持 + # POST请求支持 + proxy_set_header Content-Type $content_type; + proxy_set_header Content-Length $content_length; + proxy_pass_request_headers on; + proxy_pass_request_body on; + + # HTTP版本 proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; # 超时设置 proxy_connect_timeout 600s; proxy_send_timeout 600s; proxy_read_timeout 600s; + + # 请求体大小限制 + client_max_body_size 100M; } + # 注意:jarvis相关API已通过 /jarvis-api/ 代理,不再需要单独的 /jarvis/ location # Druid监控代理(如果需要) location /druid/ { diff --git a/src/api/jarvis/tendoc.js b/src/api/jarvis/tendoc.js index b380c25..315f3fd 100644 --- a/src/api/jarvis/tendoc.js +++ b/src/api/jarvis/tendoc.js @@ -97,3 +97,11 @@ export function getSheetList(params) { }) } +// 测试获取用户信息 +export function testUserInfo() { + return request({ + url: '/jarvis/tendoc/testUserInfo', + method: 'get' + }) +} + diff --git a/src/views/system/jdorder/orderList.vue b/src/views/system/jdorder/orderList.vue index c7c172f..09c2b2e 100644 --- a/src/views/system/jdorder/orderList.vue +++ b/src/views/system/jdorder/orderList.vue @@ -44,6 +44,7 @@ 搜索 重置 导出 + 测试用户信息 @@ -351,7 +352,7 @@