diff --git a/config/proxy.ts b/config/proxy.ts index 01401f4..525d2cb 100644 --- a/config/proxy.ts +++ b/config/proxy.ts @@ -15,13 +15,13 @@ export default { // 如果需要自定义本地开发服务器 请取消注释按需调整 dev: { // localhost:8000/api/** -> https://preview.pro.ant.design/api/** - '/story/': { + '/api/story/': { // 要代理的地址 target: basePath, // 配置了这个可以从 http 代理到 https // 依赖 origin 的功能可能需要这个,比如 cookie changeOrigin: true, - pathRewrite: { '^/story': '/story' }, + pathRewrite: { '^/api/story': '/api/story' }, }, '/file/': { // 要代理的地址 @@ -57,13 +57,13 @@ export default { changeOrigin: true, pathRewrite: { '^': '' }, }, - '/story/': { + '/api/story/': { // 要代理的地址 target: 'http://localhost:30001', // 配置了这个可以从 http 代理到 https // 依赖 origin 的功能可能需要这个,比如 cookie changeOrigin: true, - pathRewrite: { '^/story': '/story' }, + pathRewrite: { '^/api/story': '/api/story' }, }, }, pre: { diff --git a/nginx.conf b/nginx.conf index 8f439f5..367ccfe 100644 --- a/nginx.conf +++ b/nginx.conf @@ -30,7 +30,7 @@ http { proxy_set_header Authorization $http_authorization; proxy_pass http://localhost:33333/file/; } - location /story/ { + location /api/story/ { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $host; @@ -38,7 +38,7 @@ http { proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Port $server_port; proxy_set_header Authorization $http_authorization; - proxy_pass http://localhost:33333/story/; + proxy_pass http://localhost:33333/api/story/; } # MinIO 对象存储代理 diff --git a/public/sw.js b/public/sw.js index 4fbf349..42b8860 100644 --- a/public/sw.js +++ b/public/sw.js @@ -94,7 +94,7 @@ self.addEventListener('fetch', (event) => { */ function isApiRequest(url) { return url.pathname.startsWith('/api/') || - url.pathname.startsWith('/story/') || + url.pathname.startsWith('/api/story/') || url.pathname.startsWith('/file/') || url.pathname.startsWith('/user/'); } diff --git a/src/pages/account/center/service.ts b/src/pages/account/center/service.ts index 6099cbd..255f85a 100644 --- a/src/pages/account/center/service.ts +++ b/src/pages/account/center/service.ts @@ -43,7 +43,7 @@ export async function queryHistoryMessages(): Promise> { - return request('/story/activity/authorized-items', { + return request('/api/story/activity/authorized-items', { method: 'GET', }); } diff --git a/src/pages/story/service.ts b/src/pages/story/service.ts index 5a0d057..aebdfc7 100644 --- a/src/pages/story/service.ts +++ b/src/pages/story/service.ts @@ -13,19 +13,19 @@ type ParamsType = { export async function queryTimelineList( params: ParamsType, ): Promise<{ data: StoryType[] }> { - return await request('/story/list', { + return await request('/api/story/list', { params, }); } export async function deleteStory(params: ParamsType): Promise<{ data: { list: StoryType[] } }> { - return request(`/story/${params.instanceId}`, { + return request(`/api/story/${params.instanceId}`, { method: 'DELETE', }); } export async function addStory(params: ParamsType): Promise<{ data: { list: StoryType[] } }> { - return request('/story/add', { + return request('/api/story/add', { method: 'POST', data: { ...params, @@ -35,7 +35,7 @@ export async function addStory(params: ParamsType): Promise<{ data: { list: Stor } export async function updateStory(params: ParamsType): Promise<{ data: { list: StoryType[] } }> { - return await request(`/story/${params.instanceId}`, { + return await request(`/api/story/${params.instanceId}`, { method: 'PUT', data: { ...params, @@ -44,12 +44,12 @@ export async function updateStory(params: ParamsType): Promise<{ data: { list: S }); } export async function queryStoryDetail(itemId: string): Promise<{ data: StoryType }> { - return request(`/story/${itemId}`, { + return request(`/api/story/${itemId}`, { method: 'GET', }); } export async function addStoryItem(params: FormData): Promise { - return request(`/story/item`, { + return request(`/api/story/item`, { method: 'POST', data: params, requestType: 'form', @@ -57,7 +57,7 @@ export async function addStoryItem(params: FormData): Promise { }); } export async function updateStoryItem(params: FormData): Promise { - return request(`/story/item`, { + return request(`/api/story/item`, { method: 'PUT', data: params, requestType: 'form', @@ -66,29 +66,29 @@ export async function updateStoryItem(params: FormData): Promise { } export async function queryStoryItem(params: ParamsType): Promise<{ data: CommonListResponse }> { - return request(`/story/item/list`, { + return request(`/api/story/item/list`, { method: 'GET', params: params, }); } export async function queryStoryItemDetail(itemId: string): Promise<{ data: StoryItem }> { - return request(`/story/item/${itemId}`, { + return request(`/api/story/item/${itemId}`, { method: 'GET', }); } export async function countStoryItem(storyInstanceId: string): Promise<{ data: StoryItem }> { - return request(`/story/item/count/${storyInstanceId}`, { + return request(`/api/story/item/count/${storyInstanceId}`, { method: 'GET', }); } export async function queryStoryItemImages(itemId: string): Promise<{ data: string[] }> { - return request(`/story/item/images/${itemId}`, { + return request(`/api/story/item/images/${itemId}`, { method: 'GET', }); } -export async function removeStoryItem(instanceId: string) { +export async function removeStoryItem(instanceId: string): Promise> { return request(`/api/story/item/${instanceId}`, { method: 'DELETE', }); @@ -110,46 +110,46 @@ export async function fetchImage(imageInstanceId: string): Promise { } export async function authorizeStoryPermission(params: {userId: string, storyInstanceId: string, permissionType: number}) { - return request('/story/permission/authorize', { + return request('/api/story/permission/authorize', { method: 'POST', data: params, }); } export async function getStoryPermissions(storyId: string) { - return request(`/story/permission/story/${storyId}`, { + return request(`/api/story/permission/story/${storyId}`, { method: 'GET', }); } export async function inviteUser(params: {userId: string, storyInstanceId: string, permissionType: number}) { - return request('/story/permission/invite', { + return request('/api/story/permission/invite', { method: 'POST', data: params, }); } export async function acceptInvite(inviteId: string) { - return request(`/story/permission/invite/${inviteId}/accept`, { + return request(`/api/story/permission/invite/${inviteId}/accept`, { method: 'PUT', }); } export async function rejectInvite(inviteId: string) { - return request(`/story/permission/invite/${inviteId}/reject`, { + return request(`/api/story/permission/invite/${inviteId}/reject`, { method: 'PUT', }); } export async function updatePermission(params: {permissionId: string, permissionType: number}) { - return request('/story/permission', { + return request('/api/story/permission', { method: 'PUT', data: params }); } export async function removePermission(permissionId: string) { - return request(`/story/permission/${permissionId}`, { + return request(`/api/story/permission/${permissionId}`, { method: 'DELETE' }); } @@ -173,7 +173,7 @@ export async function removePermission(permissionId: string) { export async function updateStoryItemOrder( orderData: Array<{ instanceId: string; sortOrder: number }> ): Promise> { - return request('/story/item/order', { + return request('/api/story/item/order', { method: 'PUT', data: { items: orderData }, }); @@ -195,7 +195,7 @@ export async function updateStoryItemOrder( export async function batchDeleteStoryItems( instanceIds: string[] ): Promise> { - return request('/story/item/batch-delete', { + return request('/api/story/item/batch-delete', { method: 'POST', data: { instanceIds }, }); @@ -215,7 +215,7 @@ export async function batchUpdateStoryItemTime( instanceIds: string[], storyItemTime: string ): Promise> { - return request('/story/item/batch-time', { + return request('/api/story/item/batch-time', { method: 'PUT', data: { instanceIds, storyItemTime }, }); diff --git a/src/services/file/api.ts b/src/services/file/api.ts index 6c9a774..2f17986 100644 --- a/src/services/file/api.ts +++ b/src/services/file/api.ts @@ -3,7 +3,7 @@ import {CommonListResponse, CommonResponse} from "@/types/common"; import {ImageItem} from "@/pages/gallery/typings"; // 查询storyItem图片列表 export async function queryStoryItemImages(itemId: string): Promise<{ data: string[] }> { - return request(`/story/item/images/${itemId}`, { + return request(`/api/story/item/images/${itemId}`, { method: 'GET', }); }