feat: 同步dev分支并保留当前修改
This commit is contained in:
@@ -621,11 +621,46 @@ class MessageService {
|
||||
params: CursorPaginationRequest = {}
|
||||
): Promise<CursorPaginationResponse<SystemMessageResponse>> {
|
||||
try {
|
||||
const response = await api.get<CursorPaginationResponse<SystemMessageResponse>>(
|
||||
'/messages/system/cursor',
|
||||
{ params }
|
||||
);
|
||||
return response.data;
|
||||
// 始终传递 cursor 参数(空字符串表示首次请求),确保使用游标分页
|
||||
const requestParams: Record<string, any> = {
|
||||
cursor: params.cursor || '',
|
||||
page_size: params.page_size,
|
||||
};
|
||||
|
||||
const response = await api.get<any>('/messages/system', requestParams);
|
||||
|
||||
const data = response.data;
|
||||
|
||||
// 兼容两种 API 响应格式
|
||||
if (data && typeof data === 'object') {
|
||||
// 游标分页格式
|
||||
if (Array.isArray(data.items)) {
|
||||
return {
|
||||
items: data.items,
|
||||
next_cursor: data.next_cursor ?? null,
|
||||
prev_cursor: data.prev_cursor ?? null,
|
||||
has_more: data.has_more ?? false,
|
||||
};
|
||||
}
|
||||
// 传统分页格式 - 转换为游标格式
|
||||
if (Array.isArray(data.list)) {
|
||||
const currentPage = data.page || 1;
|
||||
const totalPages = data.total_pages || 1;
|
||||
return {
|
||||
items: data.list,
|
||||
next_cursor: currentPage < totalPages ? String(currentPage + 1) : null,
|
||||
prev_cursor: currentPage > 1 ? String(currentPage - 1) : null,
|
||||
has_more: currentPage < totalPages,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
items: [],
|
||||
next_cursor: null,
|
||||
prev_cursor: null,
|
||||
has_more: false,
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('获取系统消息列表失败:', error);
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user