v4.6.5 (#620)

projects/app/src/pages/api/common/file/upload.ts

@@ -2,79 +2,15 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
-import { customAlphabet } from 'nanoid';
-import multer from 'multer';
-import path from 'path';
 import { uploadFile } from '@fastgpt/service/common/file/gridfs/controller';
-import { BucketNameEnum } from '@fastgpt/global/common/file/constants';
-
-const nanoid = customAlphabet('1234567890abcdef', 12);
-
-type FileType = {
-  fieldname: string;
-  originalname: string;
-  encoding: string;
-  mimetype: string;
-  filename: string;
-  path: string;
-  size: number;
-};
+import { getUploadModel } from '@fastgpt/service/common/file/upload/multer';
 
 /**
  * Creates the multer uploader
  */
-const maxSize = 500 * 1024 * 1024;
-class UploadModel {
-  uploader = multer({
-    limits: {
-      fieldSize: maxSize
-    },
-    preservePath: true,
-    storage: multer.diskStorage({
-      filename: (_req, file, cb) => {
-        const { ext } = path.parse(decodeURIComponent(file.originalname));
-        cb(null, nanoid() + ext);
-      }
-    })
-  }).any();
-
-  async doUpload(req: NextApiRequest, res: NextApiResponse) {
-    return new Promise<{
-      files: FileType[];
-      bucketName: `${BucketNameEnum}`;
-      metadata: Record<string, any>;
-    }>((resolve, reject) => {
-      // @ts-ignore
-      this.uploader(req, res, (error) => {
-        if (error) {
-          return reject(error);
-        }
-
-        resolve({
-          ...req.body,
-          files:
-            // @ts-ignore
-            req.files?.map((file) => ({
-              ...file,
-              originalname: decodeURIComponent(file.originalname)
-            })) || [],
-          metadata: (() => {
-            if (!req.body?.metadata) return {};
-            try {
-              return JSON.parse(req.body.metadata);
-            } catch (error) {
-              console.log(error);
-
-              return {};
-            }
-          })()
-        });
-      });
-    });
-  }
-}
-
-const upload = new UploadModel();
+const upload = getUploadModel({
+  maxSize: 500 * 1024 * 1024
+});
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -82,6 +18,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     const { userId, teamId, tmbId } = await authCert({ req, authToken: true });
     const { files, bucketName, metadata } = await upload.doUpload(req, res);
 
+    if (!bucketName) {
+      throw new Error('bucketName is empty');
+    }
+
     const upLoadResults = await Promise.all(
       files.map((file) =>
         uploadFile({

projects/app/src/pages/api/common/tools/urlFetch.ts

@@ -4,7 +4,7 @@ import { jsonRes } from '@fastgpt/service/common/response';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
 import { connectToDatabase } from '@/service/mongo';
 import { UrlFetchParams, UrlFetchResponse } from '@fastgpt/global/common/file/api.d';
-import { urlsFetch } from '@fastgpt/global/common/file/tools';
+import { urlsFetch } from '@fastgpt/service/common/string/cheerio';
 
 const fetchContent = async (req: NextApiRequest, res: NextApiResponse) => {
   try {