diff --git a/nginx-default.conf b/nginx-default.conf index 0bacf43..cfc04ca 100644 --- a/nginx-default.conf +++ b/nginx-default.conf @@ -1,6 +1,14 @@ +# ============ 生产环境部署必读（避免「本地可以、线上不行」）============ +# 1. 本文件必须真正生效：确认 oms.nanafa.com 的请求由「本 server 块」处理 +# - 若用 include：确保 include 的是含本 server 的 conf，且无其它 server 抢先匹配 +# - 更新后必须执行：nginx -t && nginx -s reload +# 2. /api、/Track 由 nginx 代理到 api.nanafa.com，避免浏览器跨域 405；rbac 由前端直连 admin +# 3. 使用 HTTP（listen 80）；root 指向「包含 index.html 的目录」 +# ============================================================================ + server { - listen 80; - server_name 10.1.20.6; + listen 80; # HTTP + server_name oms.nanafa.com 10.1.20.6; # 启用gzip压缩 gzip on; @@ -16,35 +24,15 @@ server { # brotli_comp_level 6; # brotli_types text/plain text/css text/xml text/javascript application/javascript application/xml+rss application/json application/xml image/svg+xml; - # 启用 HTTP/2（如果使用 HTTPS） - # listen 443 ssl http2; - # 静态文件根目录 root /usr/share/nginx/html; - # ============ API 代理配置（放在最前面，使用 ^~ 提高优先级）============ - - # RBAC 权限管理服务代理 - location ^~ /rbac { - proxy_pass http://43.139.210.35:5281; + # ============ API 代理（同源请求，避免跨域 405）============ + location ^~ /api/ { + rewrite ^/api/(.*)$ /itfx/$1 break; + proxy_pass http://api.nanafa.com; proxy_http_version 1.1; - 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 $host; - proxy_connect_timeout 30s; - proxy_send_timeout 30s; - proxy_read_timeout 30s; - proxy_buffering off; - } - - # trackApi 服务代理（使用 ^~ 确保优先匹配） - location ^~ /api/trackApi { - rewrite ^/api/trackApi(.*)$ $1 break; - proxy_pass http://43.139.210.35:8889; - proxy_http_version 1.1; - proxy_set_header Host $host; + proxy_set_header Host api.nanafa.com; 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; @@ -52,17 +40,11 @@ server { proxy_send_timeout 30s; proxy_read_timeout 30s; } - - # 排除前端路由路径，只代理真正的 API 请求 - # 前端路由路径（驼峰命名）：upstreamInterface, downstreamInterface, upstreamInterfaceConfig, - # upstreamInterfaceConfigEdit, appList, requestLog, callStatistics, apiDebugger 等 - # 使用负向前瞻正则，排除这些前端路由路径 - # 前端路由会继续往下走到 location /，由 try_files 返回 index.html（与 /track/ 路由一样） - location ~ ^/api/(?!(trackApi|upstreamInterface|downstreamInterface|upstreamInterfaceConfig|upstreamInterfaceConfigEdit|appList|requestLog|callStatistics|apiDebugger)) { - rewrite ^/api(.*)$ $1 break; - proxy_pass http://43.139.210.35:8888; + location ^~ /Track { + rewrite ^/Track(.*)$ /track/Track$1 break; + proxy_pass http://api.nanafa.com; proxy_http_version 1.1; - proxy_set_header Host $host; + proxy_set_header Host api.nanafa.com; 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; @@ -102,17 +84,18 @@ server { } # ============ SPA 前端路由（放在最后）============ + # 所有非文件请求都回落到 index.html，避免刷新/直接访问子路径 404 location / { index index.html; try_files $uri $uri/ /index.html; - - # HTML 不缓存 - location ~* \.html?$ { - add_header Cache-Control "no-cache, no-store, must-revalidate"; - add_header Pragma "no-cache"; - add_header Expires "0"; - } + } + + # HTML 不缓存（单独 location 避免嵌套导致 fallback 异常） + location = /index.html { + add_header Cache-Control "no-cache, no-store, must-revalidate"; + add_header Pragma "no-cache"; + add_header Expires "0"; } # 错误页面 diff --git a/openapi2ts.config.ts b/openapi2ts.config.ts index 15aa5fd..9b1cc48 100644 --- a/openapi2ts.config.ts +++ b/openapi2ts.config.ts @@ -61,7 +61,7 @@ export default [ serversPath: './src/api', requestLibPath: '@/utils/request', projectName: 'interface-Provider', - apiPrefix: "'api/trackApi'", + apiPrefix: "'Track'", }, // 轨迹状态 @@ -71,7 +71,7 @@ export default [ serversPath: './src/api', requestLibPath: '@/utils/request', projectName: 'TrajectoryState', - apiPrefix: "'api/trackApi'", + apiPrefix: "'Track'", }, // 轨迹标志 @@ -82,7 +82,7 @@ export default [ serversPath: './src/api', requestLibPath: '@/utils/request', projectName: 'TrajectoryFlag', - apiPrefix: "'api/trackApi'", + apiPrefix: "'Track'", }, { @@ -91,7 +91,7 @@ export default [ serversPath: './src/api', requestLibPath: '@/utils/request', projectName: 'TrajectoryContent', - apiPrefix: "'api/trackApi'", + apiPrefix: "'Track'", }, // 预警服务 @@ -102,7 +102,7 @@ export default [ serversPath: './src/api', requestLibPath: '@/utils/request', projectName: 'WarningServices', - apiPrefix: "'api/trackApi'", + apiPrefix: "'Track'", }, // 轨迹订单 @@ -112,7 +112,7 @@ export default [ serversPath: './src/api', requestLibPath: '@/utils/request', projectName: 'TrajectoryOrder', - apiPrefix: "'api/trackApi'", + apiPrefix: "'Track'", }, // 轨迹拉取 @@ -122,7 +122,7 @@ export default [ serversPath: './src/api', requestLibPath: '@/utils/request', projectName: 'TrajectoryPull', - apiPrefix: "'api/trackApi'", + apiPrefix: "'Track'", }, // 轨迹推送 { @@ -131,7 +131,7 @@ export default [ serversPath: './src/api', requestLibPath: '@/utils/request', projectName: 'TrajectoryPush', - apiPrefix: "'api/trackApi'", + apiPrefix: "'Track'", }, // 提供接口 @@ -141,7 +141,7 @@ export default [ serversPath: './src/api', requestLibPath: '@/utils/request', projectName: 'InterfaceMappingProvider', - apiPrefix: "'api/trackApi'", + apiPrefix: "'Track'", }, // 应用服务接口 @@ -151,7 +151,7 @@ export default [ serversPath: './src/api', requestLibPath: '@/utils/request', projectName: 'ApplicationServicesProvider', - apiPrefix: "'api/trackApi'", + apiPrefix: "'Track'", }, { diff --git a/src/api/ApplicationServicesProvider/dictionary.ts b/src/api/ApplicationServicesProvider/dictionary.ts index 830fb49..800453a 100644 --- a/src/api/ApplicationServicesProvider/dictionary.ts +++ b/src/api/ApplicationServicesProvider/dictionary.ts @@ -8,7 +8,7 @@ export async function postCleanCache( params: API.postCleanCacheParams, options?: { [key: string]: any } ) { - return request(`api/trackApi/Dictionary/CleanCache`, { + return request(`Track/Dictionary/CleanCache`, { method: 'POST', params: { ...params, @@ -23,7 +23,7 @@ export async function getGetList( params: API.getGetListParams, options?: { [key: string]: any } ) { - return request(`api/trackApi/Dictionary/GetList`, { + return request(`Track/Dictionary/GetList`, { method: 'GET', params: { ...params, diff --git a/src/api/InterfaceMappingProvider/order.ts b/src/api/InterfaceMappingProvider/order.ts index 2aac349..6628d1f 100644 --- a/src/api/InterfaceMappingProvider/order.ts +++ b/src/api/InterfaceMappingProvider/order.ts @@ -7,7 +7,7 @@ export async function postOrderBatchUpsert( body: API.BatchUpsertOrderInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/ProviderService/Order/BatchUpsert`, { + return request(`Track/ProviderService/Order/BatchUpsert`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -22,7 +22,7 @@ export async function postOrderDelete( body: API.DeleteOrderInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/ProviderService/Order/Delete`, { + return request(`Track/ProviderService/Order/Delete`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -37,7 +37,7 @@ export async function postOrderLink( body: API.LinkOrderInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/ProviderService/Order/Link`, { + return request(`Track/ProviderService/Order/Link`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -53,7 +53,7 @@ export async function postOrderUpdateOrderPullConfigs( options?: { [key: string]: any } ) { return request( - `api/trackApi/ProviderService/Order/UpdateOrderPullConfigs`, + `Track/ProviderService/Order/UpdateOrderPullConfigs`, { method: 'POST', headers: { @@ -70,7 +70,7 @@ export async function postOrderUpsert( body: API.UpsertOrderInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/ProviderService/Order/Upsert`, { + return request(`Track/ProviderService/Order/Upsert`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', diff --git a/src/api/InterfaceMappingProvider/track.ts b/src/api/InterfaceMappingProvider/track.ts index 3c16174..79b3c0d 100644 --- a/src/api/InterfaceMappingProvider/track.ts +++ b/src/api/InterfaceMappingProvider/track.ts @@ -7,7 +7,7 @@ export async function postTrackBatchDelete( body: API.BatchDeleteTrackInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/ProviderService/Track/BatchDelete`, { + return request(`Track/ProviderService/Track/BatchDelete`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -22,7 +22,7 @@ export async function postTrackBatchDeleteByEsId( body: API.BatchDeleteTrackByEsIdInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/ProviderService/Track/BatchDeleteByEsId`, { + return request(`Track/ProviderService/Track/BatchDeleteByEsId`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -37,7 +37,7 @@ export async function postTrackBatchUpsert( body: API.BatchUpsertTrackInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/ProviderService/Track/BatchUpsert`, { + return request(`Track/ProviderService/Track/BatchUpsert`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -52,7 +52,7 @@ export async function postTrackDelete( body: API.DeleteTrackInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/ProviderService/Track/Delete`, { + return request(`Track/ProviderService/Track/Delete`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -68,7 +68,7 @@ export async function postTrackQuery( options?: { [key: string]: any } ) { return request( - `api/trackApi/ProviderService/Track/Query`, + `Track/ProviderService/Track/Query`, { method: 'POST', headers: { @@ -86,7 +86,7 @@ export async function postTrackQueryV2( options?: { [key: string]: any } ) { return request( - `api/trackApi/ProviderService/Track/QueryV2`, + `Track/ProviderService/Track/QueryV2`, { method: 'POST', headers: { @@ -103,7 +103,7 @@ export async function postTrackUpsert( body: API.UpsertTrackInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/ProviderService/Track/Upsert`, { + return request(`Track/ProviderService/Track/Upsert`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', diff --git a/src/api/InterfaceMappingProvider/trackContent.ts b/src/api/InterfaceMappingProvider/trackContent.ts index af3821e..fb2b5b7 100644 --- a/src/api/InterfaceMappingProvider/trackContent.ts +++ b/src/api/InterfaceMappingProvider/trackContent.ts @@ -9,7 +9,7 @@ export async function postTrackGetTrackContents( options?: { [key: string]: any } ) { return request( - `api/trackApi/ProviderService/Track/GetTrackContents`, + `Track/ProviderService/Track/GetTrackContents`, { method: 'POST', params: { diff --git a/src/api/InterfaceMappingProvider/trackPull.ts b/src/api/InterfaceMappingProvider/trackPull.ts index 7eb30fd..f43557d 100644 --- a/src/api/InterfaceMappingProvider/trackPull.ts +++ b/src/api/InterfaceMappingProvider/trackPull.ts @@ -7,7 +7,7 @@ export async function postTrackRefresh( body: API.RefreshTrackInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/ProviderService/Track/Refresh`, { + return request(`Track/ProviderService/Track/Refresh`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -23,7 +23,7 @@ export async function postTrackTrackRefreshEventTest( options?: { [key: string]: any } ) { return request( - `api/trackApi/ProviderService/Track/TrackRefreshEventTest`, + `Track/ProviderService/Track/TrackRefreshEventTest`, { method: 'POST', headers: { diff --git a/src/api/InterfaceMappingProvider/trackPush.ts b/src/api/InterfaceMappingProvider/trackPush.ts index 1b3051e..1c2b2b6 100644 --- a/src/api/InterfaceMappingProvider/trackPush.ts +++ b/src/api/InterfaceMappingProvider/trackPush.ts @@ -9,7 +9,7 @@ export async function getTrackGetTrackPushContentList( options?: { [key: string]: any } ) { return request( - `api/trackApi/ProviderService/Track/GetTrackPushContentList`, + `Track/ProviderService/Track/GetTrackPushContentList`, { method: 'GET', params: { @@ -27,7 +27,7 @@ export async function getTrackGetTrackPushRecords( options?: { [key: string]: any } ) { return request( - `api/trackApi/ProviderService/Track/GetTrackPushRecords`, + `Track/ProviderService/Track/GetTrackPushRecords`, { method: 'GET', params: { @@ -43,7 +43,7 @@ export async function postTrackPush( body: API.PushTrackInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/ProviderService/Track/Push`, { + return request(`Track/ProviderService/Track/Push`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -59,7 +59,7 @@ export async function postTrackQueryTrackPushRecords( options?: { [key: string]: any } ) { return request( - `api/trackApi/ProviderService/Track/QueryTrackPushRecords`, + `Track/ProviderService/Track/QueryTrackPushRecords`, { method: 'POST', headers: { diff --git a/src/api/InterfaceMappingProvider/trackPushConfig.ts b/src/api/InterfaceMappingProvider/trackPushConfig.ts index 8ed4316..748eb96 100644 --- a/src/api/InterfaceMappingProvider/trackPushConfig.ts +++ b/src/api/InterfaceMappingProvider/trackPushConfig.ts @@ -8,7 +8,7 @@ export async function postTrackQueryTrackPullMappings( options?: { [key: string]: any } ) { return request( - `api/trackApi/ProviderService/Track/QueryTrackPullMappings`, + `Track/ProviderService/Track/QueryTrackPullMappings`, { method: 'POST', headers: { diff --git a/src/api/TrackContent/trackContent.ts b/src/api/TrackContent/trackContent.ts index b85c88d..1fb0c03 100644 --- a/src/api/TrackContent/trackContent.ts +++ b/src/api/TrackContent/trackContent.ts @@ -7,7 +7,7 @@ export async function postEdit( body: API.EditTrackContentInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/Content/Edit`, { + return request(`Track/Track/Content/Edit`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -22,7 +22,7 @@ export async function postEditMap( body: API.EditTrackContentMapInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/Content/EditMap`, { + return request(`Track/Track/Content/EditMap`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -38,7 +38,7 @@ export async function postGetAvailableContent( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Content/GetAvailableContent`, + `Track/Track/Content/GetAvailableContent`, { method: 'POST', headers: { @@ -56,7 +56,7 @@ export async function postGetContentDetail( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Content/GetContentDetail`, + `Track/Track/Content/GetContentDetail`, { method: 'POST', headers: { @@ -75,7 +75,7 @@ export async function getGetDetail( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Content/GetDetail`, + `Track/Track/Content/GetDetail`, { method: 'GET', params: { @@ -92,7 +92,7 @@ export async function postGetList( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Content/GetList`, + `Track/Track/Content/GetList`, { method: 'POST', headers: { @@ -111,7 +111,7 @@ export async function getGetMapDetail( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Content/GetMapDetail`, + `Track/Track/Content/GetMapDetail`, { method: 'GET', params: { @@ -128,7 +128,7 @@ export async function postGetMapPage( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Content/GetMapPage`, + `Track/Track/Content/GetMapPage`, { method: 'POST', headers: { @@ -146,7 +146,7 @@ export async function postGetTrackContentByCode( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Content/GetTrackContentByCode`, + `Track/Track/Content/GetTrackContentByCode`, { method: 'POST', headers: { diff --git a/src/api/TrackFlag/trackFlag.ts b/src/api/TrackFlag/trackFlag.ts index 6c2203c..197749a 100644 --- a/src/api/TrackFlag/trackFlag.ts +++ b/src/api/TrackFlag/trackFlag.ts @@ -7,7 +7,7 @@ export async function postEdit( body: API.EditTrackFlagInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/Flag/Edit`, { + return request(`Track/Track/Flag/Edit`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -24,7 +24,7 @@ export async function getGetDetail( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Flag/GetDetail`, + `Track/Track/Flag/GetDetail`, { method: 'GET', params: { @@ -41,7 +41,7 @@ export async function postGetList( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Flag/GetList`, + `Track/Track/Flag/GetList`, { method: 'POST', headers: { diff --git a/src/api/TrackOrder/trackOrder.ts b/src/api/TrackOrder/trackOrder.ts index 51682f9..f2cd5aa 100644 --- a/src/api/TrackOrder/trackOrder.ts +++ b/src/api/TrackOrder/trackOrder.ts @@ -8,7 +8,7 @@ export async function postDeleteTrackById( params: API.postDeleteTrackByIdParams, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/Order/DeleteTrackById`, { + return request(`Track/Track/Order/DeleteTrackById`, { method: 'POST', params: { ...params, @@ -24,7 +24,7 @@ export async function postGetDetails( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Order/GetDetails`, + `Track/Track/Order/GetDetails`, { method: 'POST', params: { @@ -41,7 +41,7 @@ export async function postGetDetailTimeline( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Order/GetDetailTimeline`, + `Track/Track/Order/GetDetailTimeline`, { method: 'POST', headers: { @@ -60,7 +60,7 @@ export async function getGetOrderOperationsById( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Order/GetOrderOperationsById`, + `Track/Track/Order/GetOrderOperationsById`, { method: 'GET', params: { @@ -77,7 +77,7 @@ export async function postGetTrackOrderList( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Order/GetTrackOrderList`, + `Track/Track/Order/GetTrackOrderList`, { method: 'POST', headers: { @@ -96,7 +96,7 @@ export async function getGetTrackPushRecords( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Order/GetTrackPushRecords`, + `Track/Track/Order/GetTrackPushRecords`, { method: 'GET', params: { @@ -112,7 +112,7 @@ export async function postUpdateOrderStatus( body: API.UpdateOrderStatusInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/Order/UpdateOrderStatus`, { + return request(`Track/Track/Order/UpdateOrderStatus`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', diff --git a/src/api/TrackPull/trackPull.ts b/src/api/TrackPull/trackPull.ts index d09abc4..9ca72e4 100644 --- a/src/api/TrackPull/trackPull.ts +++ b/src/api/TrackPull/trackPull.ts @@ -7,7 +7,7 @@ export async function postEdit( body: API.EditTrackPullConfigInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/PullConfig/Edit`, { + return request(`Track/Track/PullConfig/Edit`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -22,7 +22,7 @@ export async function postEditContent( body: API.EditTrackPullContentInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/PullConfig/EditContent`, { + return request(`Track/Track/PullConfig/EditContent`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -39,7 +39,7 @@ export async function getGetContentDetail( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/PullConfig/GetContentDetail`, + `Track/Track/PullConfig/GetContentDetail`, { method: 'GET', params: { @@ -56,7 +56,7 @@ export async function postGetContentPage( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/PullConfig/GetContentPage`, + `Track/Track/PullConfig/GetContentPage`, { method: 'POST', headers: { @@ -75,7 +75,7 @@ export async function getGetDetail( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/PullConfig/GetDetail`, + `Track/Track/PullConfig/GetDetail`, { method: 'GET', params: { @@ -92,7 +92,7 @@ export async function postGetPage( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/PullConfig/GetPage`, + `Track/Track/PullConfig/GetPage`, { method: 'POST', headers: { @@ -110,7 +110,7 @@ export async function postGetPriorityPage( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/PullConfig/GetPriorityPage`, + `Track/Track/PullConfig/GetPriorityPage`, { method: 'POST', headers: { @@ -129,7 +129,7 @@ export async function getGetPriorityDetail( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/PullConfig/GetPriorityDetail`, + `Track/Track/PullConfig/GetPriorityDetail`, { method: 'GET', params: { @@ -145,7 +145,7 @@ export async function postEditPriority( body: API.EditTrackPullPriorityInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/PullConfig/EditPriority`, { + return request(`Track/Track/PullConfig/EditPriority`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', diff --git a/src/api/TrackPush/trackPush.ts b/src/api/TrackPush/trackPush.ts index fa8b715..d088333 100644 --- a/src/api/TrackPush/trackPush.ts +++ b/src/api/TrackPush/trackPush.ts @@ -7,7 +7,7 @@ export async function postEdit( body: API.EditTrackPushConfigInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/PushConfig/Edit`, { + return request(`Track/Track/PushConfig/Edit`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -22,7 +22,7 @@ export async function postEditContent( body: API.EditTrackPushContentInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/PushConfig/EditContent`, { + return request(`Track/Track/PushConfig/EditContent`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -39,7 +39,7 @@ export async function getGetContentDetail( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/PushConfig/GetContentDetail`, + `Track/Track/PushConfig/GetContentDetail`, { method: 'GET', params: { @@ -56,7 +56,7 @@ export async function postGetContentPage( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/PushConfig/GetContentPage`, + `Track/Track/PushConfig/GetContentPage`, { method: 'POST', headers: { @@ -75,7 +75,7 @@ export async function getGetDetail( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/PushConfig/GetDetail`, + `Track/Track/PushConfig/GetDetail`, { method: 'GET', params: { @@ -92,7 +92,7 @@ export async function postGetPage( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/PushConfig/GetPage`, + `Track/Track/PushConfig/GetPage`, { method: 'POST', headers: { @@ -109,7 +109,7 @@ export async function postSortContent( body: API.SortTrackPushContentInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/PushConfig/SortContent`, { + return request(`Track/Track/PushConfig/SortContent`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', diff --git a/src/api/TrackState/trackStatus.ts b/src/api/TrackState/trackStatus.ts index c1be1cd..ba4722c 100644 --- a/src/api/TrackState/trackStatus.ts +++ b/src/api/TrackState/trackStatus.ts @@ -7,7 +7,7 @@ export async function postEdit( body: API.EditTrackStatusInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Track/Status/Edit`, { + return request(`Track/Track/Status/Edit`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -24,7 +24,7 @@ export async function getGetDetail( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Status/GetDetail`, + `Track/Track/Status/GetDetail`, { method: 'GET', params: { @@ -41,7 +41,7 @@ export async function postGetList( options?: { [key: string]: any } ) { return request( - `api/trackApi/Track/Status/GetList`, + `Track/Track/Status/GetList`, { method: 'POST', headers: { diff --git a/src/api/WarningServices/completeWarning.ts b/src/api/WarningServices/completeWarning.ts index 39b8420..4e6e63e 100644 --- a/src/api/WarningServices/completeWarning.ts +++ b/src/api/WarningServices/completeWarning.ts @@ -8,7 +8,7 @@ export async function postWarningCompleteEditCompleteWarningRuleItem( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Complete/EditCompleteWarningRuleItem`, + `Track/Warning/Complete/EditCompleteWarningRuleItem`, { method: 'POST', headers: { @@ -26,7 +26,7 @@ export async function postWarningCompleteGetCompleteWarningRuleItem( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Complete/GetCompleteWarningRuleItem`, + `Track/Warning/Complete/GetCompleteWarningRuleItem`, { method: 'POST', headers: { @@ -44,7 +44,7 @@ export async function postWarningCompleteGetPageCompleteWarningDetails( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Complete/GetPageCompleteWarningDetails`, + `Track/Warning/Complete/GetPageCompleteWarningDetails`, { method: 'POST', headers: { diff --git a/src/api/WarningServices/kpiArea.ts b/src/api/WarningServices/kpiArea.ts index 8ffc945..dd34f68 100644 --- a/src/api/WarningServices/kpiArea.ts +++ b/src/api/WarningServices/kpiArea.ts @@ -8,7 +8,7 @@ export async function postForewarningServiceKpiAreaAddAreaInfo( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/AddAreaInfo`, + `Track/ForewarningService/KpiArea/AddAreaInfo`, { method: 'POST', headers: { @@ -26,7 +26,7 @@ export async function postForewarningServiceKpiAreaCreateKpiArea( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/CreateKpiArea`, + `Track/ForewarningService/KpiArea/CreateKpiArea`, { method: 'POST', headers: { @@ -44,7 +44,7 @@ export async function deleteForewarningServiceKpiAreaDeleteKpiArea( params: API.deleteForewarningServiceKpiAreaDeleteKpiAreaParams, options?: { [key: string]: any } ) { - return request(`api/trackApi/ForewarningService/KpiArea/DeleteKpiArea`, { + return request(`Track/ForewarningService/KpiArea/DeleteKpiArea`, { method: 'DELETE', params: { ...params, @@ -60,7 +60,7 @@ export async function deleteForewarningServiceKpiAreaDeleteKpiAreaInfo( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/DeleteKpiAreaInfo`, + `Track/ForewarningService/KpiArea/DeleteKpiAreaInfo`, { method: 'DELETE', params: { @@ -77,7 +77,7 @@ export async function postForewarningServiceKpiAreaGetKpiAreaInfos( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/GetKpiAreaInfos`, + `Track/ForewarningService/KpiArea/GetKpiAreaInfos`, { method: 'POST', headers: { @@ -95,7 +95,7 @@ export async function postForewarningServiceKpiAreaGetKpiAreas( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/GetKpiAreas`, + `Track/ForewarningService/KpiArea/GetKpiAreas`, { method: 'POST', headers: { @@ -112,7 +112,7 @@ export async function postForewarningServiceKpiAreaModifyKpiArea( body: API.UpdateRuleAreaRequest, options?: { [key: string]: any } ) { - return request(`api/trackApi/ForewarningService/KpiArea/ModifyKpiArea`, { + return request(`Track/ForewarningService/KpiArea/ModifyKpiArea`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -128,7 +128,7 @@ export async function postForewarningServiceKpiAreaModifyKpiAreaInfo( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/ModifyKpiAreaInfo`, + `Track/ForewarningService/KpiArea/ModifyKpiAreaInfo`, { method: 'POST', headers: { diff --git a/src/api/WarningServices/returnWarning.ts b/src/api/WarningServices/returnWarning.ts index 12141c6..0ae02e6 100644 --- a/src/api/WarningServices/returnWarning.ts +++ b/src/api/WarningServices/returnWarning.ts @@ -7,7 +7,7 @@ export async function postWarningReturnEditReturnWarningRuleItem( body: API.EditReturnWarningRuleItemInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Warning/Return/EditReturnWarningRuleItem`, { + return request(`Track/Warning/Return/EditReturnWarningRuleItem`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -23,7 +23,7 @@ export async function postWarningReturnGetPageReturnWarningDetails( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Return/GetPageReturnWarningDetails`, + `Track/Warning/Return/GetPageReturnWarningDetails`, { method: 'POST', headers: { @@ -41,7 +41,7 @@ export async function postWarningReturnGetReturnMessageRecord( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Return/GetReturnMessageRecord`, + `Track/Warning/Return/GetReturnMessageRecord`, { method: 'POST', headers: { @@ -59,7 +59,7 @@ export async function postWarningReturnGetReturnWarningRuleItem( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Return/GetReturnWarningRuleItem`, + `Track/Warning/Return/GetReturnWarningRuleItem`, { method: 'POST', headers: { @@ -76,7 +76,7 @@ export async function postWarningReturnReturnPush( body: API.ReturnPushInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Warning/Return/ReturnPush`, { + return request(`Track/Warning/Return/ReturnPush`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', diff --git a/src/api/WarningServices/transportWarning.ts b/src/api/WarningServices/transportWarning.ts index 9b236cd..e79705b 100644 --- a/src/api/WarningServices/transportWarning.ts +++ b/src/api/WarningServices/transportWarning.ts @@ -8,7 +8,7 @@ export async function postWarningTransportDeleteTransportWarningScene( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/DeleteTransportWarningScene`, + `Track/Warning/Transport/DeleteTransportWarningScene`, { method: 'POST', headers: { @@ -26,7 +26,7 @@ export async function postWarningTransportEditTransportWarningSceneRuleItem( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/EditTransportWarningSceneRuleItem`, + `Track/Warning/Transport/EditTransportWarningSceneRuleItem`, { method: 'POST', headers: { @@ -44,7 +44,7 @@ export async function postWarningTransportGetPageTransportWarningDetails( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/GetPageTransportWarningDetails`, + `Track/Warning/Transport/GetPageTransportWarningDetails`, { method: 'POST', headers: { @@ -62,7 +62,7 @@ export async function postWarningTransportGetTransportWarningScene( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/GetTransportWarningScene`, + `Track/Warning/Transport/GetTransportWarningScene`, { method: 'POST', headers: { @@ -80,7 +80,7 @@ export async function postWarningTransportGetTransportWarningSceneRuleItem( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/GetTransportWarningSceneRuleItem`, + `Track/Warning/Transport/GetTransportWarningSceneRuleItem`, { method: 'POST', headers: { @@ -98,7 +98,7 @@ export async function postWarningTransportUpsertTransportWarningScene( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/UpsertTransportWarningScene`, + `Track/Warning/Transport/UpsertTransportWarningScene`, { method: 'POST', headers: { diff --git a/src/api/WarningServices/warning.ts b/src/api/WarningServices/warning.ts index 3819bb1..46d978c 100644 --- a/src/api/WarningServices/warning.ts +++ b/src/api/WarningServices/warning.ts @@ -7,7 +7,7 @@ export async function postWarningGetWarningRule( body: API.GetWarningRuleInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Warning/GetWarningRule`, { + return request(`Track/Warning/GetWarningRule`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -22,7 +22,7 @@ export async function postWarningUpdateEnabledStatus( body: API.UpdateEnabledStatusInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Warning/UpdateEnabledStatus`, { + return request(`Track/Warning/UpdateEnabledStatus`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -37,7 +37,7 @@ export async function postWarningUpsertWarningRule( body: API.UpsertWarningRuleInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Warning/UpsertWarningRule`, { + return request(`Track/Warning/UpsertWarningRule`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', diff --git a/src/api/interface-Provider/completeWarning.ts b/src/api/interface-Provider/completeWarning.ts index 39b8420..4e6e63e 100644 --- a/src/api/interface-Provider/completeWarning.ts +++ b/src/api/interface-Provider/completeWarning.ts @@ -8,7 +8,7 @@ export async function postWarningCompleteEditCompleteWarningRuleItem( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Complete/EditCompleteWarningRuleItem`, + `Track/Warning/Complete/EditCompleteWarningRuleItem`, { method: 'POST', headers: { @@ -26,7 +26,7 @@ export async function postWarningCompleteGetCompleteWarningRuleItem( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Complete/GetCompleteWarningRuleItem`, + `Track/Warning/Complete/GetCompleteWarningRuleItem`, { method: 'POST', headers: { @@ -44,7 +44,7 @@ export async function postWarningCompleteGetPageCompleteWarningDetails( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Complete/GetPageCompleteWarningDetails`, + `Track/Warning/Complete/GetPageCompleteWarningDetails`, { method: 'POST', headers: { diff --git a/src/api/interface-Provider/kpiArea.ts b/src/api/interface-Provider/kpiArea.ts index 8ffc945..dd34f68 100644 --- a/src/api/interface-Provider/kpiArea.ts +++ b/src/api/interface-Provider/kpiArea.ts @@ -8,7 +8,7 @@ export async function postForewarningServiceKpiAreaAddAreaInfo( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/AddAreaInfo`, + `Track/ForewarningService/KpiArea/AddAreaInfo`, { method: 'POST', headers: { @@ -26,7 +26,7 @@ export async function postForewarningServiceKpiAreaCreateKpiArea( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/CreateKpiArea`, + `Track/ForewarningService/KpiArea/CreateKpiArea`, { method: 'POST', headers: { @@ -44,7 +44,7 @@ export async function deleteForewarningServiceKpiAreaDeleteKpiArea( params: API.deleteForewarningServiceKpiAreaDeleteKpiAreaParams, options?: { [key: string]: any } ) { - return request(`api/trackApi/ForewarningService/KpiArea/DeleteKpiArea`, { + return request(`Track/ForewarningService/KpiArea/DeleteKpiArea`, { method: 'DELETE', params: { ...params, @@ -60,7 +60,7 @@ export async function deleteForewarningServiceKpiAreaDeleteKpiAreaInfo( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/DeleteKpiAreaInfo`, + `Track/ForewarningService/KpiArea/DeleteKpiAreaInfo`, { method: 'DELETE', params: { @@ -77,7 +77,7 @@ export async function postForewarningServiceKpiAreaGetKpiAreaInfos( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/GetKpiAreaInfos`, + `Track/ForewarningService/KpiArea/GetKpiAreaInfos`, { method: 'POST', headers: { @@ -95,7 +95,7 @@ export async function postForewarningServiceKpiAreaGetKpiAreas( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/GetKpiAreas`, + `Track/ForewarningService/KpiArea/GetKpiAreas`, { method: 'POST', headers: { @@ -112,7 +112,7 @@ export async function postForewarningServiceKpiAreaModifyKpiArea( body: API.UpdateRuleAreaRequest, options?: { [key: string]: any } ) { - return request(`api/trackApi/ForewarningService/KpiArea/ModifyKpiArea`, { + return request(`Track/ForewarningService/KpiArea/ModifyKpiArea`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -128,7 +128,7 @@ export async function postForewarningServiceKpiAreaModifyKpiAreaInfo( options?: { [key: string]: any } ) { return request( - `api/trackApi/ForewarningService/KpiArea/ModifyKpiAreaInfo`, + `Track/ForewarningService/KpiArea/ModifyKpiAreaInfo`, { method: 'POST', headers: { diff --git a/src/api/interface-Provider/returnWarning.ts b/src/api/interface-Provider/returnWarning.ts index 12141c6..0ae02e6 100644 --- a/src/api/interface-Provider/returnWarning.ts +++ b/src/api/interface-Provider/returnWarning.ts @@ -7,7 +7,7 @@ export async function postWarningReturnEditReturnWarningRuleItem( body: API.EditReturnWarningRuleItemInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Warning/Return/EditReturnWarningRuleItem`, { + return request(`Track/Warning/Return/EditReturnWarningRuleItem`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -23,7 +23,7 @@ export async function postWarningReturnGetPageReturnWarningDetails( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Return/GetPageReturnWarningDetails`, + `Track/Warning/Return/GetPageReturnWarningDetails`, { method: 'POST', headers: { @@ -41,7 +41,7 @@ export async function postWarningReturnGetReturnMessageRecord( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Return/GetReturnMessageRecord`, + `Track/Warning/Return/GetReturnMessageRecord`, { method: 'POST', headers: { @@ -59,7 +59,7 @@ export async function postWarningReturnGetReturnWarningRuleItem( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Return/GetReturnWarningRuleItem`, + `Track/Warning/Return/GetReturnWarningRuleItem`, { method: 'POST', headers: { @@ -76,7 +76,7 @@ export async function postWarningReturnReturnPush( body: API.ReturnPushInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Warning/Return/ReturnPush`, { + return request(`Track/Warning/Return/ReturnPush`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', diff --git a/src/api/interface-Provider/transportWarning.ts b/src/api/interface-Provider/transportWarning.ts index 9b236cd..e79705b 100644 --- a/src/api/interface-Provider/transportWarning.ts +++ b/src/api/interface-Provider/transportWarning.ts @@ -8,7 +8,7 @@ export async function postWarningTransportDeleteTransportWarningScene( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/DeleteTransportWarningScene`, + `Track/Warning/Transport/DeleteTransportWarningScene`, { method: 'POST', headers: { @@ -26,7 +26,7 @@ export async function postWarningTransportEditTransportWarningSceneRuleItem( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/EditTransportWarningSceneRuleItem`, + `Track/Warning/Transport/EditTransportWarningSceneRuleItem`, { method: 'POST', headers: { @@ -44,7 +44,7 @@ export async function postWarningTransportGetPageTransportWarningDetails( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/GetPageTransportWarningDetails`, + `Track/Warning/Transport/GetPageTransportWarningDetails`, { method: 'POST', headers: { @@ -62,7 +62,7 @@ export async function postWarningTransportGetTransportWarningScene( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/GetTransportWarningScene`, + `Track/Warning/Transport/GetTransportWarningScene`, { method: 'POST', headers: { @@ -80,7 +80,7 @@ export async function postWarningTransportGetTransportWarningSceneRuleItem( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/GetTransportWarningSceneRuleItem`, + `Track/Warning/Transport/GetTransportWarningSceneRuleItem`, { method: 'POST', headers: { @@ -98,7 +98,7 @@ export async function postWarningTransportUpsertTransportWarningScene( options?: { [key: string]: any } ) { return request( - `api/trackApi/Warning/Transport/UpsertTransportWarningScene`, + `Track/Warning/Transport/UpsertTransportWarningScene`, { method: 'POST', headers: { diff --git a/src/api/interface-Provider/warning.ts b/src/api/interface-Provider/warning.ts index 3819bb1..46d978c 100644 --- a/src/api/interface-Provider/warning.ts +++ b/src/api/interface-Provider/warning.ts @@ -7,7 +7,7 @@ export async function postWarningGetWarningRule( body: API.GetWarningRuleInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Warning/GetWarningRule`, { + return request(`Track/Warning/GetWarningRule`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -22,7 +22,7 @@ export async function postWarningUpdateEnabledStatus( body: API.UpdateEnabledStatusInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Warning/UpdateEnabledStatus`, { + return request(`Track/Warning/UpdateEnabledStatus`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -37,7 +37,7 @@ export async function postWarningUpsertWarningRule( body: API.UpsertWarningRuleInput, options?: { [key: string]: any } ) { - return request(`api/trackApi/Warning/UpsertWarningRule`, { + return request(`Track/Warning/UpsertWarningRule`, { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', diff --git a/src/api/rbac/axios-config.ts b/src/api/rbac/axios-config.ts index de5052e..3f3202f 100644 --- a/src/api/rbac/axios-config.ts +++ b/src/api/rbac/axios-config.ts @@ -5,9 +5,7 @@ import { OpenAPI, clearAuthToken } from './index' import { useRbacUserStore } from '@/store/modules/rbac-user' // 创建自定义 axios 实例 -// 注意：baseURL 设置为空，因为 OpenAPI.BASE 已经处理了 URL 构建 -// 生产环境：OpenAPI.BASE = 'http://43.139.210.35:5281' -// 开发环境：OpenAPI.BASE = ''（通过 Vite 代理） +// baseURL 为空，URL 由 OpenAPI.BASE + path 构建；生产环境 OpenAPI.BASE = http://api.nanafa.com/admin export const axiosInstance = axios.create({ baseURL: '', // 始终为空，URL 由 OpenAPI.BASE + path 构建 timeout: 30000, diff --git a/src/api/rbac/index.ts b/src/api/rbac/index.ts index ec2023e..bc0122d 100644 --- a/src/api/rbac/index.ts +++ b/src/api/rbac/index.ts @@ -10,19 +10,11 @@ export * from './generated' import { OpenAPI } from './generated/core/OpenAPI' import { axiosInstance } from './axios-config' -// 设置基础 URL -// 生产环境和开发环境都使用相对路径，通过 nginx/Vite 代理转发 -// 生产环境：通过 nginx 代理 /rbac -> http://43.139.210.35:5281 -// 开发环境：通过 Vite 代理 /rbac -> http://43.139.210.35:5281 -OpenAPI.BASE = '' - -// 调试信息 +// 设置基础 URL：生产直连 http://api.nanafa.com/admin，开发走 Vite 代理 const isProduction = (import.meta as any).env?.MODE === 'production' || (import.meta as any).env?.PROD === true -if (isProduction) { - console.log('[RBAC Config] Production mode: BASE =', OpenAPI.BASE, '(using nginx proxy)') -} else { - console.log('[RBAC Config] Development mode: BASE =', OpenAPI.BASE, '(using Vite proxy)') -} +OpenAPI.BASE = isProduction + ? (import.meta.env.VITE_API_ADMIN_URL || 'http://api.nanafa.com/admin') + : '' // 认证 token 管理 export function setAuthToken(token: string) { diff --git a/src/components/HandsontablePro/index.vue b/src/components/HandsontablePro/index.vue index 998be01..ca1fd5e 100644 --- a/src/components/HandsontablePro/index.vue +++ b/src/components/HandsontablePro/index.vue @@ -54,6 +54,8 @@ actionColumnWidth?: number; // 是否显示复选框列 showCheckboxColumn?: boolean; + // 复选框列表头文案（空则表头为空） + checkboxColumnHeader?: string; // 复选框变化回调 onCheckboxChange?: (row: any, checked: boolean, rowIndex: number) => void; // 操作列渲染器 @@ -86,6 +88,7 @@ actionColumnPosition: 'start', actionColumnWidth: 60, showCheckboxColumn: false, + checkboxColumnHeader: '', readOnly: true, multiValueFields: () => [], height: undefined, @@ -108,6 +111,7 @@ }>(); const hotContainer = ref(null); + const containerRef = ref(null); let hotInstance: Handsontable | null = null; const selectedRows = ref([]); @@ -173,7 +177,7 @@ // 复选框列 if (props.showCheckboxColumn) { columns.push({ data: currentDataIndex, type: 'checkbox', readOnly: false, width: 60, className: 'htLeft' }); - headerTexts.push(''); + headerTexts.push(props.checkboxColumnHeader ?? ''); currentDataIndex++; } @@ -266,6 +270,10 @@ }); try { + // 未传 height 时使用容器实际高度，使列表高度与容器一致 + const containerH = containerRef.value?.clientHeight ?? 0; + const tableHeight = props.height ?? (containerH > 0 ? containerH : calculatedHeight.value); + const hotConfig: any = { data: data, columns: columns, @@ -273,7 +281,7 @@ rowHeaders: false, selectionMode: 'multiple', width: '100%', - height: calculatedHeight.value, + height: tableHeight, licenseKey: 'non-commercial-and-evaluation', className: 'ht-theme-classic', language: 'zh-CN', @@ -1068,12 +1076,26 @@ } }; + // 容器尺寸变化时同步表格高度，使列表高度与容器一致 + let resizeObserver: ResizeObserver | null = null; + const setupResizeObserver = () => { + if (!containerRef.value) return; + resizeObserver = new ResizeObserver((entries) => { + const entry = entries[0]; + if (entry && hotInstance && entry.contentRect.height > 0) { + hotInstance.updateSettings({ height: entry.contentRect.height }); + } + }); + resizeObserver.observe(containerRef.value); + }; + onMounted(() => { nextTick(() => { // 确保样式已加载后再初始化 setTimeout(() => { initHandsontable(); finalizeInit(); + setupResizeObserver(); }, 200); }); @@ -1085,6 +1107,12 @@ }); onUnmounted(() => { + if (resizeObserver && containerRef.value) { + try { + resizeObserver.unobserve(containerRef.value); + } catch (_) {} + resizeObserver = null; + } // 停止定期刷新 stopDimensionRefresh(); @@ -1112,7 +1140,7 @@ diff --git a/src/components/top-nav/RightTopUser.vue b/src/components/top-nav/RightTopUser.vue index 401c844..ce57e99 100644 --- a/src/components/top-nav/RightTopUser.vue +++ b/src/components/top-nav/RightTopUser.vue @@ -9,7 +9,7 @@ 个人中心 - 主题 / 页面配置 + 页面配置 退出登录 diff --git a/src/utils/request.ts b/src/utils/request.ts index 7db1c27..c84c10d 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -10,7 +10,6 @@ import router from '@/router'; import { clearToken } from '@/utils/auth'; import { useUserStore } from '@/store'; -// 创建axios实例 const service: AxiosInstance = axios.create({ baseURL: '/', timeout: 10000, // 请求超时时间 @@ -22,7 +21,9 @@ const service: AxiosInstance = axios.create({ // 请求拦截器 service.interceptors.request.use( (config: AxiosRequestConfig) => { - // 在发送请求之前做些什么 + config.headers = config.headers ?? {}; + // 生产：/api、/Track 走同源，由 nginx 代理到 api.nanafa.com，避免跨域 405；rbac 直连 admin + // 开发：Vite 代理 /api、/Track、/rbac // 从 localStorage 获取 token const token = localStorage.getItem('token'); if (token) { diff --git a/src/views/api/downstreamInterface/index.vue b/src/views/api/downstreamInterface/index.vue index bfe4e2a..b92747d 100644 --- a/src/views/api/downstreamInterface/index.vue +++ b/src/views/api/downstreamInterface/index.vue @@ -1854,11 +1854,41 @@ .header-actions { display: flex; - gap: 8px; + gap: 2px; flex-shrink: 0; margin-left: auto; - display: flex; - gap: 8px; +} + +/* 下游接口中间容器：刷新、新增按钮无背景无框，黑色纯符号 */ +.middle-content.nav-panel .header-actions .action-icon-btn.refresh-btn { + color: #000 !important; + background-color: transparent !important; + border-color: transparent !important; + &:hover:not(:disabled) { + color: #262626 !important; + background-color: transparent !important; + border-color: transparent !important; + } + &:disabled { + color: #d9d9d9 !important; + background-color: transparent !important; + border-color: transparent !important; + } +} +.middle-content.nav-panel .header-actions .action-icon-btn.add-btn { + color: #000 !important; + background-color: transparent !important; + border-color: transparent !important; + &:hover:not(:disabled) { + color: #262626 !important; + background-color: transparent !important; + border-color: transparent !important; + } + &:disabled { + color: #d9d9d9 !important; + background-color: transparent !important; + border-color: transparent !important; + } } .content-body { diff --git a/src/views/api/upstreamInterface/index.vue b/src/views/api/upstreamInterface/index.vue index d2213d4..6548523 100644 --- a/src/views/api/upstreamInterface/index.vue +++ b/src/views/api/upstreamInterface/index.vue @@ -1686,23 +1686,24 @@ import { IconClose, IconEdit, IconPlus, IconSearch, IconMore, IconMinus, IconRef } .mapping-search-box { - flex: 1; + flex: 1 1 calc(100% - 22px); padding: 0; - margin-right: 8px; + margin-right: 4px; box-sizing: border-box; + min-width: 0; } .mapping-search-box :deep(.arco-input-wrapper) { background: #fff !important; border: 1px solid var(--color-border-2) !important; - border-radius: 4px !important; + border-radius: 24px !important; height: auto !important; } .mapping-search-box :deep(.arco-input) { background: #fff !important; border: none !important; - border-radius: 4px !important; + border-radius: 24px !important; color: var(--color-text-1) !important; height: auto !important; } @@ -1863,19 +1864,40 @@ import { IconClose, IconEdit, IconPlus, IconSearch, IconMore, IconMinus, IconRef .header-actions { display: flex; - gap: 8px; + gap: 0px; flex-shrink: 0; margin-left: auto; } - - // 映射列表区域的刷新按钮改为灰色 - .middle-content.nav-panel .header-actions .refresh-btn { - color: #8c8c8c !important; - &:hover { - color: #666 !important; + + /* 映射列表区域：刷新、新增按钮为黑色纯符号（无背景无框），两按钮紧挨 */ + .middle-content.nav-panel .header-actions .action-icon-btn.refresh-btn { + color: #000 !important; + background-color: transparent !important; + border-color: transparent !important; + &:hover:not(:disabled) { + color: #262626 !important; + background-color: transparent !important; + border-color: transparent !important; } &:disabled { color: #d9d9d9 !important; + background-color: transparent !important; + border-color: transparent !important; + } + } + .middle-content.nav-panel .header-actions .action-icon-btn.add-btn { + color: #000 !important; + background-color: transparent !important; + border-color: transparent !important; + &:hover:not(:disabled) { + color: #262626 !important; + background-color: transparent !important; + border-color: transparent !important; + } + &:disabled { + color: #d9d9d9 !important; + background-color: transparent !important; + border-color: transparent !important; } } diff --git a/src/views/track/trackWarningOrder/CompleteWarning.vue b/src/views/track/trackWarningOrder/CompleteWarning.vue index 63bff3a..b6ec7c7 100644 --- a/src/views/track/trackWarningOrder/CompleteWarning.vue +++ b/src/views/track/trackWarningOrder/CompleteWarning.vue @@ -1361,28 +1361,29 @@ - - - + + +
+ +
@@ -1523,11 +1524,12 @@