新增minio相关

src/main/java/com/glxp/api/entity/purchase/SupCertEntity.java

@@ -130,4 +130,5 @@ public class SupCertEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
+
 }

src/main/java/com/glxp/api/service/purchase/SupCertService.java

@@ -1,8 +1,6 @@
 package com.glxp.api.service.purchase;
 
 
-
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.purchase.SupCertEntity;
 import com.glxp.api.entity.sup.UserCertEntity;
@@ -14,7 +12,9 @@ import java.util.List;
 
 public interface SupCertService extends IService<SupCertEntity> {
     List<SupCertEntity> selectBybId(certRequest certRequest);
+
     List<SupCertEntity> filterCompanyCert(FilterSupCertRequest filterSupCertRequest);
+
     List<SupCertEntity> filterUserCompanyCert(FilterSupCertRequest filterSupCertRequest);
 
     SupCertEntity findCompanyCertByName(String name);
@@ -32,7 +32,7 @@ public interface SupCertService extends IService<SupCertEntity> {
 
     boolean updateCompanyCert(SupCertEntity supCertEntity);
 
-    boolean updateCustomerId(String oldId, String newId,Integer auditStatus);
+    boolean updateCustomerId(String oldId, String newId, Integer auditStatus);
 
     boolean updateManufacturerId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk);
 

src/main/java/com/glxp/api/upload/uploadController.java

@@ -3,6 +3,8 @@ package com.glxp.api.upload;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.util.MinioUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,6 +22,7 @@ import java.util.UUID;
 /**
  * 上传文件控制器
  */
+@Slf4j
 @RestController
 public class uploadController {
 
@@ -87,7 +90,7 @@ public class uploadController {
             file.transferTo(file1);
             Map<String, String> rMap = new HashMap<>();
             rMap.put("msg", "上传成功");
-            rMap.put("path",newName);
+            rMap.put("path", newName);
             return ResultVOUtils.success(rMap);
         } catch (IOException e) {
             e.printStackTrace();
@@ -107,31 +110,24 @@ public class uploadController {
         if (StringUtils.isBlank(type)) {
             return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件类型不能为空");
         }
-
-        // 保存文件 ---------------------
         String fileName = file.getOriginalFilename();
         String fileType = fileName.substring(fileName.lastIndexOf("."));
         // 文件类型判断
-        if (StringUtils.isBlank(fileType) || (!fileType.equals(".jpg") && !fileType.equals(".png") && !fileType.equals(".doc") && !fileType.equals(".pdf"))) {
-            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jpg,png,doc,pdf 格式");
+        if (StringUtils.isBlank(fileType) || !fileType.equals(".jpg") && !fileType.equals(".png")) {
+            return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 .jpg,.png 格式");
         }
         String newName = UUID.randomUUID() + fileType;//生成新文件名
-        String savePath = filePath + "/register/" + type;
-
-        File file1 = new File(savePath);
-        if (!file1.exists()) {// 判断目录是否存在
-            file1.mkdirs();// 创建多层目录
-        }
-        file1 = new File(savePath + "/" + newName);
+        String savePath = filePath + "/register/file/" + type;
+        String fileFullName = savePath + "/" + newName;
         try {
-            file.transferTo(file1);
+            MinioUtil.uploadFile(fileFullName, file);
             Map<String, String> rMap = new HashMap<>();
             rMap.put("msg", "上传成功");
-            rMap.put("name", newName);
+            rMap.put("name", fileFullName);
             rMap.put("type", type);
             return ResultVOUtils.success(rMap);
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
         }
         return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败");
     }