Merge branch 'dev_minio_20251210' into master

mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java

@@ -43,9 +43,11 @@ import com.mhd.common.core.annotation.fieldsetvalue.NeedSetValueField;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.model.LoginUser;
 import lombok.extern.slf4j.Slf4j;
+import minio.MinIoUploadService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.File;
@@ -95,7 +97,8 @@ public class MenuApplicationService {
     private SpecialServiceFeign logisticsServiceFeign;
     @Resource
     private MenuUtils menuUtils;
-
+    @Autowired
+    private MinIoUploadService minIoUploadService;
 
     /**
      * 查询菜单集合
@@ -272,6 +275,19 @@ public class MenuApplicationService {
         return ossService.uploadOss(file);
     }
 
+
+    /**
+     * 上传文件到oss
+     *
+     * @param file 文件
+     * @return 文件路径
+     */
+    public String uploadMinio(MultipartFile file)
+    {
+        return minIoUploadService.uploadFileToMinIo(file);
+    }
+
+
     /**
      * 根据组织id查询菜单集合
      *

mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java

@@ -162,7 +162,8 @@ public class MenuApi extends BaseController {
             }
 
         }
-        return AjaxResult.success(menuApplicationService.uploadOss(fileUpload));
+        //return AjaxResult.success(menuApplicationService.uploadOss(fileUpload));
+        return AjaxResult.success(menuApplicationService.uploadMinio(file));
     }
 
     @PostMapping("/uploadFeign")