wangziqi/gongxue-base
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(admin,server): 上传改用 file.buffer 并移除手写 multipart 头

Browse Source
This commit is contained in:
wangziqi
2026-08-07 16:37:55 +08:00
parent 54b002455f
commit 899d2dde5b
16 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/admin/src/api/imports.ts
View File

@@ -31,9 +31,7 @@ export async function createImportRun(
if (options.mapping && Object.keys(options.mapping).length > 0) {
form.append('mapping', JSON.stringify(options.mapping));
}
const res = await api.post<ApiEnvelope<ImportRunDetail>>('/imports/runs', form, {
headers: { 'Content-Type': 'multipart/form-data' },
});
const res = await api.post<ApiEnvelope<ImportRunDetail>>('/imports/runs', form);
return res.data;
}

1
apps/admin/src/components/AiChat/api.ts
View File

@@ -35,7 +35,6 @@ export const aiChatApi = {
form.append('file', file);
return (
await api.post<AiApiResponse<AiAttachment>>('/ai/chat/attachments', form, {
headers: { 'Content-Type': 'multipart/form-data' },
timeout: 120_000,
})
).data;

4
apps/admin/src/components/StudentProfileContent/AttachmentsTab.tsx
View File

@@ -29,9 +29,7 @@ export const AttachmentsTab: React.FC<TabProps & { data: AttachmentRecord[] }> =
);
const uploadAttachmentMutation = useApiMutation(
async (formData: FormData) =>
api.post(`/archive/${studentId}/attachments`, formData, {
headers: { 'Content-Type': 'multipart/form-data' },
}),
api.post(`/archive/${studentId}/attachments`, formData),
{ invalidate: [['archive', studentId]] },
);

4
apps/admin/src/pages/ClassroomRentals/index.tsx
View File

@@ -140,9 +140,7 @@ const ClassroomRentalsPage: React.FC = () => {
);
const uploadContractMutation = useApiMutation(
async ({ id, formData }: { id: number; formData: FormData }) =>
api.post(`/classroom-rentals/${id}/contract`, formData, {
headers: { 'Content-Type': 'multipart/form-data' },
}),
api.post(`/classroom-rentals/${id}/contract`, formData),
{ invalidate: [['classroom-rentals']] },
);

4
apps/admin/src/pages/Classrooms/index.tsx
View File

@@ -110,9 +110,7 @@ const ClassroomsPage: React.FC = () => {
);
const importMutation = useApiMutation(
async (formData: FormData) =>
api.post('/classrooms/import', formData, {
headers: { 'Content-Type': 'multipart/form-data' },
}),
api.post('/classrooms/import', formData),
{ invalidate: [['classrooms']] },
);

8
apps/admin/src/pages/Expenses/index.tsx
View File

@@ -137,16 +137,12 @@ const ExpensesPage: React.FC = () => {
),
importUtility: useApiMutation(
async (formData: FormData) =>
api.post('/expenses/utility/import', formData, {
headers: { 'Content-Type': 'multipart/form-data' },
}),
api.post('/expenses/utility/import', formData),
{ invalidate: [['expenses']] },
),
importPersonal: useApiMutation(
async (formData: FormData) =>
api.post('/expenses/personal/import', formData, {
headers: { 'Content-Type': 'multipart/form-data' },
}),
api.post('/expenses/personal/import', formData),
{ invalidate: [['expenses']] },
),
archiveRoom: useApiMutation(

4
apps/admin/src/pages/Occupancies/useOccupancyMutations.ts
View File

@@ -44,9 +44,7 @@ export function useOccupancyMutations() {
);
const importMutation = useApiMutation(
async ({ formData, params }: { formData: FormData; params: string }) =>
api.post(`/occupancies/import?${params}`, formData, {
headers: { 'Content-Type': 'multipart/form-data' },
}),
api.post(`/occupancies/import?${params}`, formData),
{ invalidate: invalidateOccupancies },
);

4
apps/admin/src/pages/Rooms/useRoomMutations.ts
View File

@@ -143,9 +143,7 @@ export function useRoomMutations(editing: any) {
);
const importMutation = useApiMutation(
async (formData: FormData) =>
api.post<{ message?: string }>('/rooms/import', formData, {
headers: { 'Content-Type': 'multipart/form-data' },
}),
api.post<{ message?: string }>('/rooms/import', formData),
{ invalidate: [['rooms']] },
);

8
apps/admin/src/pages/Students/index.tsx
View File

@@ -228,16 +228,12 @@ const StudentsPage: React.FC = () => {
);
const importMutation = useApiMutation(
async (formData: FormData) =>
api.post('/students/import', formData, {
headers: { 'Content-Type': 'multipart/form-data' },
}),
api.post('/students/import', formData),
{ invalidate: invalidateStudents },
);
const importMatchMutation = useApiMutation(
async (formData: FormData) =>
api.post('/students/import-match', formData, {
headers: { 'Content-Type': 'multipart/form-data' },
}),
api.post('/students/import-match', formData),
{ invalidate: invalidateStudents },
);

2
apps/server/src/ai-chat/ai-excel-reader.service.ts
View File

@@ -86,7 +86,7 @@ export class AiExcelReaderService {
private async loadWithExcelJs(buffer: Buffer): Promise<ExcelSheetRows[]> {
const workbook = new ExcelJS.Workbook();
await workbook.xlsx.load(buffer.buffer as ArrayBuffer);
await workbook.xlsx.load(buffer as unknown as ArrayBuffer);
const sheets: ExcelSheetRows[] = [];
workbook.eachSheet((sheet) => {
const rows: string[][] = [];

2
apps/server/src/classrooms/classrooms.controller.ts
View File

@@ -158,7 +158,7 @@ export class ClassroomsController {
async importExcel(@UploadedFile() file: Express.Multer.File, @Request() req: any) {
const { ipAddress, userAgent } = extractRequestInfo(req);
const workbook = new ExcelJS.Workbook();
await workbook.xlsx.load(file.buffer.buffer as ArrayBuffer);
await workbook.xlsx.load(file.buffer as unknown as ArrayBuffer);
const ws = workbook.worksheets[0];
const rows: any[] = [];
ws.eachRow((row, idx) => {

4
apps/server/src/expenses/expenses.controller.ts
View File

@@ -316,7 +316,7 @@ export class ExpensesController {
@UseInterceptors(FileInterceptor('file'))
async importUtilityExpenses(@UploadedFile() file: Express.Multer.File, @Request() req: any) {
const workbook = new ExcelJS.Workbook();
await workbook.xlsx.load(file.buffer.buffer as ArrayBuffer);
await workbook.xlsx.load(file.buffer as unknown as ArrayBuffer);
const ws = workbook.worksheets[0];
const rows: any[] = [];
ws.eachRow((row, idx) => {
@@ -381,7 +381,7 @@ export class ExpensesController {
@UseInterceptors(FileInterceptor('file'))
async importPersonalExpenses(@UploadedFile() file: Express.Multer.File, @Request() req: any) {
const workbook = new ExcelJS.Workbook();
await workbook.xlsx.load(file.buffer.buffer as ArrayBuffer);
await workbook.xlsx.load(file.buffer as unknown as ArrayBuffer);
const ws = workbook.worksheets[0];
const rows: any[] = [];
ws.eachRow((row, idx) => {

2
apps/server/src/imports/imports.workbook.ts
View File

@@ -84,7 +84,7 @@ export async function parseSheets(
if (kind === 'csv') {
await workbook.csv.read(Readable.from(Buffer.from(buffer)));
} else {
await workbook.xlsx.load(buffer.buffer as ArrayBuffer);
await workbook.xlsx.load(buffer as unknown as ArrayBuffer);
}
const sheets = extractSheets(workbook, headerRow);
if (sheets.length === 0) {

2
apps/server/src/occupancies/occupancies.controller.ts
View File

@@ -264,7 +264,7 @@ export class OccupanciesController {
const { ipAddress, userAgent } = extractRequestInfo(req);
if (!file?.buffer) throw new BadRequestException('请上传入住名单 Excel 文件');
const workbook = new ExcelJS.Workbook();
await workbook.xlsx.load(file.buffer.buffer as ArrayBuffer);
await workbook.xlsx.load(file.buffer as unknown as ArrayBuffer);
const ws = workbook.worksheets[0];
const rows = parseOccupancyImportWorksheet(ws);
const result = await this.service.batchImportCheckIn(rows, {

2
apps/server/src/rooms/rooms.controller.ts
View File

@@ -343,7 +343,7 @@ export class RoomsController {
async importExcel(@UploadedFile() file: Express.Multer.File, @Request() req: any) {
const { ipAddress, userAgent } = extractRequestInfo(req);
const workbook = new ExcelJS.Workbook();
await workbook.xlsx.load(file.buffer.buffer as ArrayBuffer);
await workbook.xlsx.load(file.buffer as unknown as ArrayBuffer);
const ws = workbook.worksheets[0];
const rows: {
roomNumber: string;

4
apps/server/src/students/students.controller.ts
View File

@@ -255,7 +255,7 @@ export class StudentsController {
@UseInterceptors(FileInterceptor('file'))
async importExcel(@UploadedFile() file: Express.Multer.File, @Request() req: any) {
const workbook = new ExcelJS.Workbook();
await workbook.xlsx.load(file.buffer.buffer as ArrayBuffer);
await workbook.xlsx.load(file.buffer as unknown as ArrayBuffer);
const importData = parseStudentImportWorkbook(workbook);
// Resolve organization names to IDs
for (const row of importData.students) {
@@ -280,7 +280,7 @@ export class StudentsController {
@UseInterceptors(FileInterceptor('file'))
async matchImport(@UploadedFile() file: Express.Multer.File, @Request() req: any) {
const workbook = new ExcelJS.Workbook();
await workbook.xlsx.load(file.buffer.buffer as ArrayBuffer);
await workbook.xlsx.load(file.buffer as unknown as ArrayBuffer);
const importData = parseStudentImportWorkbook(workbook);
// Resolve organization names to IDs
for (const row of importData.students) {