4.6.7 first pr (#726)

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

@@ -3,7 +3,7 @@ import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
 import { uploadFile } from '@fastgpt/service/common/file/gridfs/controller';
-import { getUploadModel, removeFilesByPaths } from '@fastgpt/service/common/file/upload/multer';
+import { getUploadModel } from '@fastgpt/service/common/file/multer';
 
 /**
  * Creates the multer uploader
@@ -16,12 +16,13 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
   let filePaths: string[] = [];
 
   try {
+    const { userId, teamId, tmbId } = await authCert({ req, authToken: true });
+
     const { files, bucketName, metadata } = await upload.doUpload(req, res);
 
     filePaths = files.map((file) => file.path);
 
     await connectToDatabase();
-    const { userId, teamId, tmbId } = await authCert({ req, authToken: true });
 
     if (!bucketName) {
       throw new Error('bucketName is empty');
@@ -53,8 +54,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       error
     });
   }
-
-  removeFilesByPaths(filePaths);
 }
 
 export const config = {

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

@@ -8,15 +8,13 @@ import { UploadImgProps } from '@fastgpt/global/common/file/api';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
     await connectToDatabase();
-    const { base64Img, expiredTime, metadata, shareId } = req.body as UploadImgProps;
+    const { shareId, ...body } = req.body as UploadImgProps;
 
     const { teamId } = await authCertOrShareId({ req, shareId, authToken: true });
 
     const data = await uploadMongoImg({
       teamId,
-      base64Img,
-      expiredTime,
-      metadata
+      ...body
     });
 
     jsonRes(res, { data });

projects/app/src/pages/api/common/system/getInitData.ts

@@ -59,39 +59,44 @@ const defaultFeConfigs: FastGPTFeConfigsType = {
 };
 
 export async function getInitConfig() {
+  if (global.systemInitd) return;
+  global.systemInitd = true;
+
   try {
-    if (global.feConfigs) return;
     await connectToDatabase();
 
-    initGlobal();
-    await initSystemConfig();
+    await Promise.all([
+      initGlobal(),
+      initSystemConfig(),
+      getSimpleModeTemplates(),
+      getSystemVersion(),
+      getSystemPlugin()
+    ]);
+
+    console.log({
+      simpleModeTemplates: global.simpleModeTemplates,
+      communityPlugins: global.communityPlugins
+    });
   } catch (error) {
     console.error('Load init config error', error);
+    global.systemInitd = false;
 
     if (!global.feConfigs) {
       exit(1);
     }
   }
-  await getSimpleModeTemplates();
+}
 
-  getSystemVersion();
-  getSystemPlugin();
+export function initGlobal() {
+  if (global.communityPlugins) return;
 
-  console.log({
-    feConfigs: global.feConfigs,
-    systemEnv: global.systemEnv,
-    chatModels: global.chatModels,
-    qaModels: global.qaModels,
-    cqModels: global.cqModels,
-    extractModels: global.extractModels,
-    qgModels: global.qgModels,
-    vectorModels: global.vectorModels,
-    reRankModels: global.reRankModels,
-    audioSpeechModels: global.audioSpeechModels,
-    whisperModel: global.whisperModel,
-    simpleModeTemplates: global.simpleModeTemplates,
-    communityPlugins: global.communityPlugins
-  });
+  global.communityPlugins = [];
+  global.simpleModeTemplates = [];
+  global.qaQueueLen = global.qaQueueLen ?? 0;
+  global.vectorQueueLen = global.vectorQueueLen ?? 0;
+  // init tikToken
+  getTikTokenEnc();
+  initHttpAgent();
 }
 
 export async function initSystemConfig() {
@@ -137,19 +142,24 @@ export async function initSystemConfig() {
   global.reRankModels = config.reRankModels;
   global.audioSpeechModels = config.audioSpeechModels;
   global.whisperModel = config.whisperModel;
-}
 
-export function initGlobal() {
-  global.communityPlugins = [];
-  global.simpleModeTemplates = [];
-  global.qaQueueLen = global.qaQueueLen ?? 0;
-  global.vectorQueueLen = global.vectorQueueLen ?? 0;
-  // init tikToken
-  getTikTokenEnc();
-  initHttpAgent();
+  console.log({
+    feConfigs: global.feConfigs,
+    systemEnv: global.systemEnv,
+    chatModels: global.chatModels,
+    qaModels: global.qaModels,
+    cqModels: global.cqModels,
+    extractModels: global.extractModels,
+    qgModels: global.qgModels,
+    vectorModels: global.vectorModels,
+    reRankModels: global.reRankModels,
+    audioSpeechModels: global.audioSpeechModels,
+    whisperModel: global.whisperModel
+  });
 }
 
 export function getSystemVersion() {
+  if (global.systemVersion) return;
   try {
     if (process.env.NODE_ENV === 'development') {
       global.systemVersion = process.env.npm_package_version || '0.0.0';

projects/app/src/pages/api/common/system/refreshConfig.ts

@@ -1,31 +0,0 @@
-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 { initSystemConfig } from './getInitData';
-
-export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
-  try {
-    await connectToDatabase();
-    await authCert({ req, authRoot: true });
-    await initSystemConfig();
-
-    console.log(`refresh config`);
-    console.log({
-      chatModels: global.chatModels,
-      qaModels: global.qaModels,
-      cqModels: global.cqModels,
-      extractModels: global.extractModels,
-      qgModels: global.qgModels,
-      vectorModels: global.vectorModels,
-      reRankModels: global.reRankModels,
-      audioSpeechModels: global.audioSpeechModels,
-      whisperModel: global.whisperModel,
-      feConfigs: global.feConfigs,
-      systemEnv: global.systemEnv
-    });
-  } catch (error) {
-    console.log(error);
-  }
-  jsonRes(res);
-}