Refactor MinIO configuration variables and clean up API plugin handlers for improved readability and consistency

Author: ctrlz526

packages/service/common/minio/index.ts

@@ -3,11 +3,11 @@ import { Client } from 'minio';
 export * from 'minio';
 export { Client };
 
-export const S3_ENDPOINT = process.env.MINIO_ENDPOINT || 'localhost';
-export const S3_PORT = process.env.MINIO_PORT ? parseInt(process.env.MINIO_PORT) : 9000;
-export const S3_USE_SSL = process.env.MINIO_USE_SSL === 'true';
-export const S3_ACCESS_KEY = process.env.MINIO_ACCESS_KEY || 'minioadmin';
-export const S3_SECRET_KEY = process.env.MINIO_SECRET_KEY || 'minioadmin';
+export const S3_ENDPOINT = process.env.S3_ENDPOINT || 'localhost';
+export const S3_PORT = process.env.S3_PORT ? parseInt(process.env.S3_PORT) : 9000;
+export const S3_USE_SSL = process.env.S3_USE_SSL === 'true';
+export const S3_ACCESS_KEY = process.env.S3_ACCESS_KEY || 'minioadmin';
+export const S3_SECRET_KEY = process.env.S3_SECRET_KEY || 'minioadmin';
 
 export const connectionMinio = (() => {
   if (!global.minioClient) {

packages/service/core/app/plugin/controller.ts

@@ -373,7 +373,6 @@ const dbPluginFormat = (item: SystemPluginConfigSchemaType): SystemPluginTemplat
     pluginOrder: item.pluginOrder,
     associatedPluginId,
     userGuide,
-    toolSource: 'uploaded', // Custom plugins are uploaded
     workflow: {
       nodes: [],
       edges: []

packages/web/i18n/zh-CN/file.json

@@ -13,13 +13,13 @@
   "Only_support_uploading_one_image": "仅支持上传一张图片",
   "Please select the image to upload": "请选择要上传的图片",
   "Please wait for all files to upload": "请等待所有文件上传完成",
-  "common.common.upload_system_tools": "上传系统工具",
   "bucket_chat": "对话文件",
   "bucket_file": "知识库文件",
   "click_to_view_raw_source": "点击查看来源",
   "common.Some images failed to process": "部分图片处理失败",
   "common.dataset_data_input_image_support_format": "支持 .jpg, .jpeg, .png, .gif, .webp 格式",
   "common.import_update": "导入/更新",
+  "common.upload_system_tools": "上传系统工具",
   "count.core.dataset.collection.Create Success": "成功导入 {{count}} 张图片",
   "delete_image": "删除图片",
   "file_name": "文件名",

projects/app/.env.template

@@ -91,3 +91,10 @@ CONFIG_JSON_PATH=
 # Signoz
 SIGNOZ_BASE_URL=
 SIGNOZ_SERVICE_NAME=
+
+# MINIO
+S3_ENDPOINT=localhost
+S3_PORT=9000
+S3_USE_SSL=false
+S3_ACCESS_KEY=minioadmin
+S3_SECRET_KEY=minioadmin

projects/app/src/pages/api/plugin/delete.ts

@@ -1,38 +1,22 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
 import { NextAPI } from '@/service/middleware/entry';
 import { deleteSystemTool } from '@fastgpt/service/core/app/tool/api';
 import { cleanSystemPluginCache } from '@fastgpt/service/core/app/plugin/controller';
 
-type RequestBody = {
-  toolId: string;
-};
-
 async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
-  try {
-    const { toolId }: RequestBody = req.body;
+  const toolId = (req.query.toolId as string) || req.body?.toolId;
 
-    if (!toolId) {
-      return Promise.reject('ToolId is required');
-    }
+  if (!toolId) {
+    return Promise.reject('ToolId is required');
+  }
 
-    const actualToolId = toolId.includes('-') ? toolId.split('-').slice(1).join('-') : toolId;
+  const actualToolId = toolId.includes('-') ? toolId.split('-').slice(1).join('-') : toolId;
 
-    const result = await deleteSystemTool(actualToolId);
+  const result = await deleteSystemTool(actualToolId);
 
-    try {
-      await cleanSystemPluginCache();
-    } catch (error) {
-      console.error('Clear plugin cache error:', error);
-    }
+  cleanSystemPluginCache();
 
-    return jsonRes(res, result);
-  } catch (error) {
-    return jsonRes(res, {
-      code: 500,
-      error: error instanceof Error ? error.message : 'Unknown error'
-    });
-  }
+  return result;
 }
 
 export default NextAPI(handler);

projects/app/src/pages/api/plugin/upload.ts

@@ -1,32 +1,20 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@fastgpt/service/common/response';
 import { NextAPI } from '@/service/middleware/entry';
 import { uploadSystemTool } from '@fastgpt/service/core/app/tool/api';
 import { cleanSystemPluginCache } from '@fastgpt/service/core/app/plugin/controller';
 
 async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
-  try {
-    const { url } = req.body;
+  const { url } = req.body;
 
-    if (!url) {
-      return Promise.reject('URL is required');
-    }
+  if (!url) {
+    return Promise.reject('URL is required');
+  }
 
-    const result = await uploadSystemTool(url);
+  const result = await uploadSystemTool(url);
 
-    try {
-      await cleanSystemPluginCache();
-    } catch (error) {
-      console.error('Clear plugin cache error:', error);
-    }
+  cleanSystemPluginCache();
 
-    return jsonRes(res, result);
-  } catch (error) {
-    return jsonRes(res, {
-      code: 500,
-      error: error instanceof Error ? error.message : 'Unknown error'
-    });
-  }
+  return result;
 }
 
 export default NextAPI(handler);

projects/app/src/pages/dashboard/[pluginGroupId]/index.tsx

@@ -56,6 +56,7 @@ const SystemTools = () => {
     data: plugins = [],
     loading: isLoading,
     runAsync: refreshPlugins
+    // refreshAsync: refreshPlugins
   } = useRequest2(getSystemPlugTemplates, {
     manual: false
   });
@@ -94,6 +95,7 @@ const SystemTools = () => {
       });
 
       await postUploadFileAndUrl(fileUrl);
+      await refreshPlugins({ parentId: null });
     },
     {
       manual: true,
@@ -106,7 +108,6 @@ const SystemTools = () => {
         setSelectFiles([]);
         onClose();
         // null means all tools
-        await refreshPlugins({ parentId: null });
       },
       onError: (error) => {
         toast({
@@ -184,7 +185,7 @@ const SystemTools = () => {
                 <Flex alignItems={'center'} justifyContent={'space-between'}>
                   {isPc ? (
                     <Box fontSize={'lg'} color={'myGray.900'} fontWeight={500}>
-                      {t('common:core.module.template.System Tools')}
+                      {t('app:core.module.template.System Tools')}
                     </Box>
                   ) : (
                     MenuIcon

projects/app/src/web/common/file/api.ts

@@ -1,4 +1,4 @@
-import { GET, POST } from '@/web/common/api/request';
+import { DELETE, GET, POST } from '@/web/common/api/request';
 import type { UploadImgProps } from '@fastgpt/global/common/file/api.d';
 import { type AxiosProgressEvent } from 'axios';
 import type { PresignedUrlResponse } from '@fastgpt/service/common/file/plugin/config';
@@ -43,14 +43,12 @@ export const postPresignedUrl = (data: {
 export const postConfirmUpload = (data: { objectName: string; size: string }) =>
   POST<string>('/common/file/plugin/confirmUpload', data);
 
-export const postUploadFileAndUrl = async (url: string) => {
-  POST('/plugin/upload', {
+export const postUploadFileAndUrl = (url: string) =>
+  POST<void>('/plugin/upload', {
     url: url
   });
-};
 
-export const postDeletePlugin = async (toolId: string) => {
-  POST('/plugin/delete', {
+export const postDeletePlugin = (toolId: string) =>
+  DELETE<void>('/plugin/delete', {
     toolId
   });
-};