From 4be7e27ee0785cc441e7bb799b05a740b580c5fc Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Wed, 10 Dec 2025 14:21:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?minio=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/minio/MinioBootUtil.java | 240 ++++++++++++++++++ 1 file changed, 240 insertions(+) create mode 100644 mhd-common/mhd-common-core/src/main/java/minio/MinioBootUtil.java diff --git a/mhd-common/mhd-common-core/src/main/java/minio/MinioBootUtil.java b/mhd-common/mhd-common-core/src/main/java/minio/MinioBootUtil.java new file mode 100644 index 000000000..f0ab2e931 --- /dev/null +++ b/mhd-common/mhd-common-core/src/main/java/minio/MinioBootUtil.java @@ -0,0 +1,240 @@ +package minio; + +import com.aliyun.oss.ServiceException; +import io.minio.MinioClient; +import io.minio.errors.InvalidEndpointException; +import io.minio.errors.InvalidPortException; +import lombok.extern.slf4j.Slf4j; +import net.coobird.thumbnailator.Thumbnails; +import org.jeecg.modules.oss.dto.WaterMarkDTO; +import org.jeecg.modules.system.entity.SysDepartInterfaceInfo; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.util.UriUtils; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +/** + * @Description: minio oss 上传工具类 + */ +@Slf4j +public class MinioBootUtil { + + private static String bucket; + private static String host; + private static String accessKey; + private static String secretKey; + /** + * minio 工具客户端 + */ + private static MinioClient minioClient = null; + + private static String FILE_URL; + + /** + * @Description 强制初始化minio + * @Author Alex + * @Date 2023/10/25 11:12 + */ + public static MinioClient forceInitMinio(List sysDepartInterfaceInfoList) throws InvalidPortException, InvalidEndpointException { + for (SysDepartInterfaceInfo sysDepartInterfaceInfo : sysDepartInterfaceInfoList) { + String interfaceTypeKey = sysDepartInterfaceInfo.getInterfaceTypeKey();//接口参数 + String interfaceTypeValue = sysDepartInterfaceInfo.getInterfaceTypeValue();//接口参数值 + switch (interfaceTypeKey) { + case "bucket": + bucket = interfaceTypeValue; + break; + case "host": + host = interfaceTypeValue; + break; + case "accessKey": + accessKey = interfaceTypeValue; + break; + case "secretKey": + secretKey = interfaceTypeValue; + break; + default: + break; + } + } + minioClient = new MinioClient(host, accessKey, secretKey); + return minioClient; + } + private static MinioClient initMinio() throws InvalidPortException, InvalidEndpointException { + if (minioClient == null) { + minioClient = new MinioClient(host, accessKey, secretKey); + } + return minioClient; + } + /** + * 上传文件 + * 文件上传成功,返回文件完整访问路径 + * 文件上传失败,返回 null + * + * @param multipartFile 待上传文件 + * @param fileDir 文件保存目录 + * @return oss 中的相对文件路径 + */ + public static String upload(MultipartFile multipartFile, String fileDir, List sysDepartInterfaceInfoList) { + for (SysDepartInterfaceInfo sysDepartInterfaceInfo : sysDepartInterfaceInfoList) { + String interfaceTypeKey = sysDepartInterfaceInfo.getInterfaceTypeKey();//接口参数 + String interfaceTypeValue = sysDepartInterfaceInfo.getInterfaceTypeValue();//接口参数值 + switch (interfaceTypeKey) { + case "bucket": + bucket = interfaceTypeValue; + break; + case "host": + host = interfaceTypeValue; + break; + case "accessKey": + accessKey = interfaceTypeValue; + break; + case "secretKey": + secretKey = interfaceTypeValue; + break; + default: + break; + } + } + + try (InputStream inputStream = multipartFile.getInputStream()) { + //初始化minio + initMinio(); + // bucket 不存在，创建 + if (!minioClient.bucketExists(bucket)) { + minioClient.makeBucket(bucket); + } + // 上传文件的名称 + String fileName = multipartFile.getOriginalFilename(); + long timestamp = Calendar.getInstance().getTimeInMillis(); + // PutObjectOptions，上传配置(文件大小，内存中文件分片大小) +// PutObjectOptions putObjectOptions = new PutObjectOptions(multipartFile.getSize(), PutObjectOptions.MIN_MULTIPART_SIZE); +// // 文件的ContentType +// putObjectOptions.setContentType(multipartFile.getContentType()); + + SimpleDateFormat sdYear = new SimpleDateFormat("yyyy"); + SimpleDateFormat sdMonth = new SimpleDateFormat("MM"); + SimpleDateFormat sdDay = new SimpleDateFormat("dd"); + String year = sdYear.format(new Date()); + String month = sdMonth.format(new Date()); + String day = sdDay.format(new Date()); + String filrDir = "wlhy/" + year + "/" + month + "/" + day + "/"; + +// minioClient.putObject(bucket, filrDir+timestamp+fileName, inputStream, putObjectOptions); + minioClient.putObject(bucket, filrDir+timestamp+fileName, inputStream, multipartFile.getContentType()); + // 返回访问路径 + String fileurl = host+ "/"+bucket + "/"+filrDir+timestamp+ UriUtils.encode(fileName, StandardCharsets.UTF_8); + System.out.println("fileurl===="+fileurl); + FILE_URL = fileurl; + return fileurl; + } catch (ServiceException e){ + log.error(e.getErrorMessage()); + } catch (Exception e){ + log.error(e.getMessage()); + } + return FILE_URL; + } + + /** + * 上传文件 带时间水印 + * 文件上传成功,返回文件完整访问路径 + * 文件上传失败,返回 null + * + * @param multipartFile 待上传文件 + * @param fileDir 文件保存目录 + * @return oss 中的相对文件路径 + */ + public static String uploadWaterMark(MultipartFile multipartFile, WaterMarkDTO waterMarkDTO, String fileDir, List sysDepartInterfaceInfoList) { + for (SysDepartInterfaceInfo sysDepartInterfaceInfo : sysDepartInterfaceInfoList) { + String interfaceTypeKey = sysDepartInterfaceInfo.getInterfaceTypeKey();//接口参数 + String interfaceTypeValue = sysDepartInterfaceInfo.getInterfaceTypeValue();//接口参数值 + switch (interfaceTypeKey) { + case "bucket": + bucket = interfaceTypeValue; + break; + case "host": + host = interfaceTypeValue; + break; + case "accessKey": + accessKey = interfaceTypeValue; + break; + case "secretKey": + secretKey = interfaceTypeValue; + break; + default: + break; + } + } + + // 压缩代码 + InputStream inputStream = null; + try { + //初始化minio + initMinio(); + // bucket 不存在，创建 + if (!minioClient.bucketExists(bucket)) { + minioClient.makeBucket(bucket); + } + String OriginalFilename = multipartFile.getOriginalFilename(); + inputStream = multipartFile.getInputStream(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //水印内容 + String waterMarkContent = sdf.format(new Date()); + //以下两种方法加水印 + //方法1 + if (OriginalFilename.indexOf(".pdf") < 0) { + ByteArrayOutputStream byteArrayOutputStreamut = new ByteArrayOutputStream(); + Thumbnails.of(inputStream).width(1024).keepAspectRatio(true).outputQuality(0.9).toOutputStream(byteArrayOutputStreamut); + inputStream = new ByteArrayInputStream(byteArrayOutputStreamut.toByteArray()); + //添加水印 + inputStream = OssBootUtil.buildWatermarkOfText(inputStream, waterMarkDTO, OssBootUtil.WaterMarkLocation.SOUTH_WEST, null, 0.5f); + } + //方法2 + /*if (ImageUtil.isImage(multipartFile.getOriginalFilename())) { + inputStream = ImageUtil.getInputStream( + ImageUtil.setWatermark( + ImageUtil.compress( + ImageIO.read(inputStream)),waterMarkContent), + ImageUtil.getFileExtention(multipartFile.getOriginalFilename())); + }*/ + StringBuilder fileUrl = new StringBuilder(); + String suffix = multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().lastIndexOf('.')); + // 上传文件的名称 + String fileName = multipartFile.getOriginalFilename(); + long timestamp = Calendar.getInstance().getTimeInMillis(); + // PutObjectOptions，上传配置(文件大小，内存中文件分片大小) +// PutObjectOptions putObjectOptions = new PutObjectOptions(multipartFile.getSize(), PutObjectOptions.MIN_MULTIPART_SIZE); +// // 文件的ContentType +// putObjectOptions.setContentType(multipartFile.getContentType()); + + SimpleDateFormat sdYear = new SimpleDateFormat("yyyy"); + SimpleDateFormat sdMonth = new SimpleDateFormat("MM"); + SimpleDateFormat sdDay = new SimpleDateFormat("dd"); + String year = sdYear.format(new Date()); + String month = sdMonth.format(new Date()); + String day = sdDay.format(new Date()); + String filrDir = "wlhy/" + year + "/" + month + "/" + day + "/"; + +// minioClient.putObject(bucket, filrDir+timestamp+fileName, inputStream, putObjectOptions); + minioClient.putObject(bucket, filrDir+timestamp+fileName, inputStream, multipartFile.getContentType()); + // 返回访问路径 + String fileurl = host+ "/"+bucket + "/"+filrDir+timestamp+ UriUtils.encode(fileName, StandardCharsets.UTF_8); + System.out.println("fileurl===="+fileurl); + FILE_URL = fileurl; + return fileurl; + } catch (IOException e) { + log.error(e.getMessage()); + } catch (Exception e) { + log.error(e.getMessage()); + } + return FILE_URL; + } + +} From ddd8f7c4d71d9e4cb55769fc7d58fc47f7ece0af Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Wed, 10 Dec 2025 15:01:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-auth/src/main/resources/bootstrap.yml | 8 ++++---- mhd-gateway/src/main/resources/bootstrap.yml | 8 ++++---- mhd-modules/mhd-system/src/main/resources/bootstrap.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mhd-auth/src/main/resources/bootstrap.yml b/mhd-auth/src/main/resources/bootstrap.yml index 0d77c84d4..0e2deba8b 100644 --- a/mhd-auth/src/main/resources/bootstrap.yml +++ b/mhd-auth/src/main/resources/bootstrap.yml @@ -14,15 +14,15 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.105:6848 +# server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.105:6848 +# server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml index 0693f24a5..6fbcae731 100644 --- a/mhd-gateway/src/main/resources/bootstrap.yml +++ b/mhd-gateway/src/main/resources/bootstrap.yml @@ -16,16 +16,16 @@ spring: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.102.192.5:6848 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.105:6848 +# server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.102.192.5:6848 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.105:6848 +# server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index df3406e6b..474f6196f 100644 --- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml @@ -15,15 +15,15 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.105:6848 +# server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.105:6848 +# server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 From 71fbf2ad1b630f1dd4bbd1f0049d2aca87aad424 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Wed, 10 Dec 2025 22:31:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?minio=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-common/mhd-common-core/pom.xml | 6 + .../main/java/minio/MinIoUploadService.java | 116 ++++++++++++++++++ .../service/menu/MenuApplicationService.java | 11 ++ mhd_transport/pom.xml | 12 ++ 4 files changed, 145 insertions(+) create mode 100644 mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java diff --git a/mhd-common/mhd-common-core/pom.xml b/mhd-common/mhd-common-core/pom.xml index 20fd35e39..c023cacc6 100644 --- a/mhd-common/mhd-common-core/pom.xml +++ b/mhd-common/mhd-common-core/pom.xml @@ -180,6 +180,12 @@ 3.3.2 compile + + io.minio + minio + 8.5.2 + compile + diff --git a/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java b/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java new file mode 100644 index 000000000..b1960dceb --- /dev/null +++ b/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java @@ -0,0 +1,116 @@ +package minio; + +import com.aliyun.oss.ServiceException; +import io.minio.MinioClient; +import io.minio.PutObjectArgs; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.util.UriUtils; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +public class MinIoUploadService { + @Autowired + private MinioClient minioClient; + private static String bucket="ngwl"; + private static String host="http://10.102.192.5:6001/"; + private static String accessKey="minioadmin"; + private static String secretKey="gmminioadmin"; + /** + * minio 工具客户端 + */ + private static MinioClient minioClient1 = null; + + private static String FILE_URL; + + /** + * 上传到minio + * @param fileName + * @throws Exception + */ + + public boolean uploadFileToMinIo(MultipartFile multipartFile, String fileName) { + try { + initMinio(); + InputStream inputStream = multipartFile.getInputStream(); + PutObjectArgs putObjectArgs = PutObjectArgs.builder() + .object(fileName)//文件名 + .bucket(bucket)//桶名词 与minio创建的名词一致 + // fileInputStream.available() 表示一直有内容就会上传 -1 表示将所有的相关文件的内容都上传 + .stream(inputStream, inputStream.available(), -1) //文件流 + .build(); + minioClient.putObject(putObjectArgs); + return true; + }catch (Exception e){ + //log.error(e.getMessage(),e); + } + return false; + } + private MinioClient initMinio() { + try{ + MinioClient minioClient = MinioClient.builder() + .endpoint(host) + .credentials(accessKey, secretKey) + .build(); + return minioClient; + }catch (Exception e) { + e.printStackTrace(); + } + return minioClient; + } + + /** + * 上传文件 + * 文件上传成功,返回文件完整访问路径 + * 文件上传失败,返回 null + * + * @param multipartFile 待上传文件 + * @param fileDir 文件保存目录 + * @return oss 中的相对文件路径 + */ + /* public static String upload(MultipartFile multipartFile, String fileDir) { + + + try (InputStream inputStream = multipartFile.getInputStream()) { + //初始化minio + initMinio(); + // bucket 不存在，创建 + if (!minioClient1.bucketExists(bucket)) { + minioClient1.makeBucket(bucket); + } + // 上传文件的名称 + String fileName = multipartFile.getOriginalFilename(); + long timestamp = Calendar.getInstance().getTimeInMillis(); + // PutObjectOptions，上传配置(文件大小，内存中文件分片大小) +// PutObjectOptions putObjectOptions = new PutObjectOptions(multipartFile.getSize(), PutObjectOptions.MIN_MULTIPART_SIZE); +// // 文件的ContentType +// putObjectOptions.setContentType(multipartFile.getContentType()); + + SimpleDateFormat sdYear = new SimpleDateFormat("yyyy"); + SimpleDateFormat sdMonth = new SimpleDateFormat("MM"); + SimpleDateFormat sdDay = new SimpleDateFormat("dd"); + String year = sdYear.format(new Date()); + String month = sdMonth.format(new Date()); + String day = sdDay.format(new Date()); + String filrDir = "wlhy/" + year + "/" + month + "/" + day + "/"; + +// minioClient.putObject(bucket, filrDir+timestamp+fileName, inputStream, putObjectOptions); + minioClient1.putObject(bucket, filrDir+timestamp+fileName, inputStream, multipartFile.getContentType()); + // 返回访问路径 + String fileurl = host+ "/"+bucket + "/"+filrDir+timestamp+ UriUtils.encode(fileName, StandardCharsets.UTF_8); + System.out.println("fileurl===="+fileurl); + FILE_URL = fileurl; + return fileurl; + } catch (ServiceException e){ + log.error(e.getErrorMessage()); + } catch (Exception e){ + log.error(e.getMessage()); + } + return FILE_URL; + }*/ +} diff --git a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java index 288b097e1..57d6d5b50 100644 --- a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java +++ b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java @@ -272,6 +272,17 @@ public class MenuApplicationService { return ossService.uploadOss(file); } + /** + * 上传文件到oss + * + * @param file 文件 + * @return 文件路径 + */ + public String uploadMinio(File file) + { + return ossService.uploadOss(file); + } + /** * 根据组织id查询菜单集合 * diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml index 328497119..33822d0e4 100644 --- a/mhd_transport/pom.xml +++ b/mhd_transport/pom.xml @@ -101,6 +101,18 @@ org.springframework.cloud spring-cloud-starter-sleuth + + io.minio + minio + 8.4.3 + + + com.squareup.okhttp3 + okhttp + 4.8.1 + compile + + org.springframework.cloud From e6c9c206b2343be401c1c1135de906cd0fd8f5e2 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Thu, 11 Dec 2025 12:36:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?minio=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/minio/MinIoUploadService.java | 45 ++++++++++++++----- .../service/menu/MenuApplicationService.java | 11 +++-- .../interfaces/facade/menu/MenuApi.java | 3 +- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java b/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java index b1960dceb..9517886e2 100644 --- a/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java +++ b/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java @@ -13,12 +13,13 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.UUID; public class MinIoUploadService { @Autowired private MinioClient minioClient; private static String bucket="ngwl"; - private static String host="http://10.102.192.5:6001/"; + private static String host="http://10.102.192.5:6000"; private static String accessKey="minioadmin"; private static String secretKey="gmminioadmin"; /** @@ -34,22 +35,43 @@ public class MinIoUploadService { * @throws Exception */ - public boolean uploadFileToMinIo(MultipartFile multipartFile, String fileName) { + public String uploadFileToMinIo(MultipartFile multipartFile) { try { initMinio(); InputStream inputStream = multipartFile.getInputStream(); - PutObjectArgs putObjectArgs = PutObjectArgs.builder() - .object(fileName)//文件名 - .bucket(bucket)//桶名词 与minio创建的名词一致 - // fileInputStream.available() 表示一直有内容就会上传 -1 表示将所有的相关文件的内容都上传 - .stream(inputStream, inputStream.available(), -1) //文件流 - .build(); - minioClient.putObject(putObjectArgs); - return true; + + // 上传文件的名称 + String filename = multipartFile.getOriginalFilename(); + + // PutObjectOptions，上传配置(文件大小，内存中文件分片大小) +// PutObjectOptions putObjectOptions = new PutObjectOptions(multipartFile.getSize(), PutObjectOptions.MIN_MULTIPART_SIZE); +// // 文件的ContentType +// putObjectOptions.setContentType(multipartFile.getContentType()); + + String prefix = filename.substring(filename.lastIndexOf(".") + 1);//后缀 + //根据当前时间生成文件夹 + Calendar calendar = Calendar.getInstance(); + Date time = calendar.getTime(); + // 2. 格式化系统时间--- 这里的时间格式可以根据自己的需要进行改变 + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + String buckfilename = format.format(time); + + String uuid= UUID.randomUUID().toString().replace("-","");//customer_YYYYMMDDHHMM + String fileName = buckfilename+"/"+uuid+"."+prefix; //文件全路径 + + PutObjectArgs objectArgs = PutObjectArgs.builder() + .object(fileName).bucket(bucket) + .stream(inputStream,inputStream.available(),-1).build(); + //文件名称相同会覆盖 + minioClient.putObject(objectArgs); + String url =host+ "/"+bucket + "/"+fileName; + +// + return url; }catch (Exception e){ //log.error(e.getMessage(),e); } - return false; + return ""; } private MinioClient initMinio() { try{ @@ -64,6 +86,7 @@ public class MinIoUploadService { return minioClient; } + /** * 上传文件 * 文件上传成功,返回文件完整访问路径 diff --git a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java index 57d6d5b50..4ccea8aeb 100644 --- a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java +++ b/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,17 +275,19 @@ public class MenuApplicationService { return ossService.uploadOss(file); } + /** * 上传文件到oss * * @param file 文件 * @return 文件路径 */ - public String uploadMinio(File file) + public String uploadMinio(MultipartFile file) { - return ossService.uploadOss(file); + return minIoUploadService.uploadFileToMinIo(file); } + /** * 根据组织id查询菜单集合 * diff --git a/mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java b/mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java index 0164ed791..26b266a6d 100644 --- a/mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java +++ b/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")