4.8.4 (#1746)

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

@@ -12,6 +12,7 @@ import { readConfigData } from '@/service/common/system';
 import { exit } from 'process';
 import { FastGPTProUrl } from '@fastgpt/service/common/system/constants';
 import { initFastGPTConfig } from '@fastgpt/service/common/system/tools';
+import json5 from 'json5';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   await getInitConfig();
@@ -88,7 +89,7 @@ export async function initSystemConfig() {
     getFastGPTConfigFromDB(),
     readConfigData('config.json')
   ]);
-  const fileRes = JSON.parse(fileConfig) as FastGPTConfigFileType;
+  const fileRes = json5.parse(fileConfig) as FastGPTConfigFileType;
 
   // get config from database
   const config: FastGPTConfigFileType = {
@@ -131,7 +132,7 @@ export function getSystemVersion() {
     if (process.env.NODE_ENV === 'development') {
       global.systemVersion = process.env.npm_package_version || '0.0.0';
     } else {
-      const packageJson = JSON.parse(readFileSync('/app/package.json', 'utf-8'));
+      const packageJson = json5.parse(readFileSync('/app/package.json', 'utf-8'));
 
       global.systemVersion = packageJson?.version;
     }
@@ -157,7 +158,7 @@ function getSystemPlugin() {
   const fileTemplates: (PluginTemplateType & { weight: number })[] = filterFiles.map((filename) => {
     const content = readFileSync(`${basePath}/${filename}`, 'utf-8');
     return {
-      ...JSON.parse(content),
+      ...json5.parse(content),
       id: `${PluginSourceEnum.community}-${filename.replace('.json', '')}`,
       source: PluginSourceEnum.community
     };

projects/app/src/pages/api/core/app/del.ts

@@ -8,8 +8,12 @@ import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
 import { MongoAppVersion } from '@fastgpt/service/core/app/version/schema';
 import { NextAPI } from '@/service/middleware/entry';
 import { MongoChatInputGuide } from '@fastgpt/service/core/chat/inputGuide/schema';
-import { OwnerPermissionVal } from '@fastgpt/global/support/permission/constant';
+import {
+  OwnerPermissionVal,
+  PerResourceTypeEnum
+} from '@fastgpt/global/support/permission/constant';
 import { findAppAndAllChildren } from '@fastgpt/service/core/app/controller';
+import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema';
 
 async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   const { appId } = req.query as { appId: string };
@@ -27,8 +31,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
     fields: '_id'
   });
 
-  console.log(apps);
-
   await mongoSessionRun(async (session) => {
     for await (const app of apps) {
       const appId = app._id;
@@ -65,6 +67,14 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
         },
         { session }
       );
+      await MongoResourcePermission.deleteMany(
+        {
+          resourceType: PerResourceTypeEnum.app,
+          teamId,
+          resourceId: appId
+        },
+        { session }
+      );
       // delete app
       await MongoApp.deleteOne(
         {

projects/app/src/pages/api/core/chat/chatTest.ts

@@ -14,7 +14,6 @@ import { authApp } from '@fastgpt/service/support/permission/app/auth';
 import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
 import { getUserChatInfoAndAuthTeamPoints } from '@/service/support/permission/auth/team';
-import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
 import { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
 import { RuntimeNodeItemType } from '@fastgpt/global/core/workflow/runtime/type';
 import { removeEmptyUserInput } from '@fastgpt/global/core/chat/utils';
@@ -61,7 +60,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     }
 
     /* user auth */
-    const [_, { teamId, tmbId }] = await Promise.all([
+    const [{ app }, { teamId, tmbId }] = await Promise.all([
       authApp({ req, authToken: true, appId, per: ReadPermissionVal }),
       authCert({
         req,
@@ -79,7 +78,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       teamId,
       tmbId,
       user,
-      appId,
+      app,
       runtimeNodes: nodes,
       runtimeEdges: edges,
       variables,

projects/app/src/pages/api/core/workflow/debug.ts

@@ -9,6 +9,7 @@ import { PostWorkflowDebugProps, PostWorkflowDebugResponse } from '@/global/core
 import { authPluginCrud } from '@fastgpt/service/support/permission/auth/plugin';
 import { NextAPI } from '@/service/middleware/entry';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
+import { defaultApp } from '@/web/core/app/constants';
 
 async function handler(
   req: NextApiRequest,
@@ -45,6 +46,12 @@ async function handler(
   // auth balance
   const { user } = await getUserChatInfoAndAuthTeamPoints(tmbId);
 
+  const app = {
+    ...defaultApp,
+    teamId,
+    tmbId
+  };
+
   /* start process */
   const { flowUsages, flowResponses, debugResponse } = await dispatchWorkFlow({
     res,
@@ -52,7 +59,7 @@ async function handler(
     teamId,
     tmbId,
     user,
-    appId,
+    app,
     runtimeNodes: nodes,
     runtimeEdges: edges,
     variables,

projects/app/src/pages/api/proApi/[...path].ts

@@ -13,6 +13,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     if (!requestPath) {
       throw new Error('url is empty');
     }
+    if (!FastGPTProUrl) {
+      throw new Error('未配置商业版链接');
+    }
 
     const parsedUrl = new URL(FastGPTProUrl);
     delete req.headers?.rootkey;

projects/app/src/pages/api/v1/chat/completions.ts

@@ -191,7 +191,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
           user,
           teamId: String(teamId),
           tmbId: String(tmbId),
-          appId: String(app._id),
+          app,
           chatId,
           responseChatItemId,
           runtimeNodes: storeNodes2RuntimeNodes(nodes, getDefaultEntryNodeIds(nodes)),