Commercial baseurl (#697)

projects/app/src/pages/api/core/dataset/data/pushData.ts

@@ -96,32 +96,31 @@ export async function pushDataToDatasetCollection({
     repeat: [],
     error: []
   };
-  await Promise.all(
-    data.map(async (item) => {
-      if (!item.q) {
-        filterResult.error.push(item);
-        return;
-      }
 
-      const text = item.q + item.a;
+  data.forEach((item) => {
+    if (!item.q) {
+      filterResult.error.push(item);
+      return;
+    }
 
-      // count q token
-      const token = countPromptTokens(item.q);
+    const text = item.q + item.a;
 
-      if (token > maxToken) {
-        filterResult.overToken.push(item);
-        return;
-      }
+    // count q token
+    const token = countPromptTokens(item.q);
 
-      if (set.has(text)) {
-        console.log('repeat', item);
-        filterResult.repeat.push(item);
-      } else {
-        filterResult.success.push(item);
-        set.add(text);
-      }
-    })
-  );
+    if (token > maxToken) {
+      filterResult.overToken.push(item);
+      return;
+    }
+
+    if (set.has(text)) {
+      console.log('repeat', item);
+      filterResult.repeat.push(item);
+    } else {
+      filterResult.success.push(item);
+      set.add(text);
+    }
+  });
 
   // 插入记录
   const insertRes = await MongoDatasetTraining.insertMany(

projects/app/src/pages/api/core/plugin/templates.ts

@@ -8,6 +8,7 @@ import { FlowModuleTemplateType } from '@fastgpt/global/core/module/type';
 import { ModuleTemplateTypeEnum } from '@fastgpt/global/core/module/constants';
 import { GET } from '@fastgpt/service/common/api/plusRequest';
 import type { PluginTemplateType } from '@fastgpt/global/core/plugin/type.d';
+import { FastGPTProUrl } from '@fastgpt/service/common/system/constants';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -16,7 +17,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
 
     const [userPlugins, plusPlugins] = await Promise.all([
       MongoPlugin.find({ teamId }).lean(),
-      global.systemEnv?.pluginBaseUrl ? GET<PluginTemplateType[]>('/core/plugin/getTemplates') : []
+      FastGPTProUrl ? GET<PluginTemplateType[]>('/core/plugin/getTemplates') : []
     ]);
 
     const data: FlowModuleTemplateType[] = [