ebike-gateway/src/main/resources/application-dev.yml

@@ -3,10 +3,6 @@ server:
 spring:
   application:
     name: ebike-gateway
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
   jackson:
     serialization:
       write-dates-as-timestamps: false

ebike-gateway/src/main/resources/application-prod.yml

@@ -3,10 +3,6 @@ server:
 spring:
   application:
     name: ebike-gateway
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
   jackson:
     serialization:
       write-dates-as-timestamps: false

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java

@@ -394,9 +394,8 @@ public class EbikeBikeInfoController {
             minioUtil.createBucket(MinioUtil.BUCKET_FAULT);
             InputStream inputStream = multipartFile.getInputStream();
             String fileName = multipartFile.getOriginalFilename();
-            String contentType = multipartFile.getContentType();
             String fileUniqueKey = UUID.randomUUID() + fileName.substring(fileName.lastIndexOf("."));
-            minioUtil.uploadFile(inputStream, MinioUtil.BUCKET_FAULT, fileUniqueKey,contentType);
+            minioUtil.uploadFile(inputStream, MinioUtil.BUCKET_FAULT, fileUniqueKey);
             String fileUrl = minioUtil.getFileUrl(MinioUtil.BUCKET_FAULT, fileUniqueKey);
             ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto();
             resEbikeFaultReportFileDto.setUrl(fileUrl);

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/utils/MinioUtil.java

@@ -21,40 +21,32 @@ public class MinioUtil {
 
     /**
      * 创建桶
-     *
      * @param bucket 数据桶名称
      * @throws Exception 异常
      */
     public void createBucket(String bucket) throws Exception {
         //查看桶是否存在
         boolean exists = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucket).build());
-        if (!exists) {
+        if (!exists){
             minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
         }
     }
 
     /**
      * 上传文件
-     *
      * @param inputStream 文件流
      * @param bucket 数据桶名称
      * @param objectName 文件名称
      * @throws Exception 异常
      */
-    public void uploadFile(InputStream inputStream, String bucket, String objectName, String contentType) throws Exception {
+    public void uploadFile(InputStream inputStream, String bucket, String objectName) throws Exception{
         //上传文件
-        minioClient.putObject(
+        minioClient.putObject(PutObjectArgs.builder().bucket(bucket).object(objectName)
-                PutObjectArgs.builder()
+                .stream(inputStream,-1,Integer.MAX_VALUE).build());
-                        .bucket(bucket)
-                        .object(objectName)
-                        .contentType(contentType)
-                        .stream(inputStream, -1, Integer.MAX_VALUE).build()
-        );
     }
 
     /**
      * 获取文件分析连接（7天有效
-     *
      * @param bucket 数据桶名称
      * @param fileName 文件名称
      * @return url
@@ -65,7 +57,7 @@ public class MinioUtil {
         return minioClient.getPresignedObjectUrl(
                 GetPresignedObjectUrlArgs.builder()
                         .method(Method.GET)
-                        .bucket(bucket == null || bucket.isEmpty() ? BUCKET_FAULT : bucket)
+                        .bucket(bucket==null||bucket.isEmpty()? BUCKET_FAULT: bucket)
                         .object(fileName)
                         .expiry(7, TimeUnit.DAYS)  // 有效期7天
                         .build()
@@ -79,56 +71,51 @@ public class MinioUtil {
      * @param fileName 文件名称
      * @return url
      */
-    public String getFileUrl2(String bucket, String fileName) {
+    public String getFileUrl2(String bucket, String fileName){
         try {
-            String url = getFileUrl(bucket == null || bucket.isEmpty() ? BUCKET_FAULT : bucket, fileName);
+            String url = getFileUrl(bucket==null||bucket.isEmpty()? BUCKET_FAULT: bucket, fileName);
             return url;
-        } catch (Exception e) {
+        }catch (Exception e){
             return null;
         }
     }
-
     /**
      * 获取所有的桶
-     *
      * @return 数据桶名称列表
      * @throws Exception 异常
      */
-    public List<String> getAllBucket() throws Exception {
+    public List<String> getAllBucket() throws Exception{
         List<Bucket> buckets = minioClient.listBuckets();
         return buckets.stream().map(Bucket::name).collect(Collectors.toList());
     }
 
     /**
      * 下载文件
-     *
      * @param bucket 数据桶名称
      * @param objectName 文件名称
      * @return 文件流
      * @throws Exception 异常
      */
-    public InputStream downLoad(String bucket, String objectName) throws Exception {
+    public InputStream downLoad(String bucket,String objectName) throws Exception{
         return minioClient.getObject(GetObjectArgs.builder().bucket(bucket).object(objectName).build());
     }
 
     /**
      * 删除桶
-     *
      * @param bucket 数据桶名称
      * @throws Exception 异常
      */
-    public void deleteBucket(String bucket) throws Exception {
+    public void deleteBucket(String bucket) throws Exception{
         minioClient.removeBucket(RemoveBucketArgs.builder().bucket(bucket).build());
     }
 
     /**
      * 删除文件
-     *
      * @param bucket 数据桶名称
      * @param objectName 文件名称
      * @throws Exception 异常
      */
-    public void deleteObject(String bucket, String objectName) throws Exception {
+    public void deleteObject(String bucket,String objectName) throws Exception{
         minioClient.removeObject(RemoveObjectArgs.builder().bucket(bucket).object(objectName).build());
     }
 }

ebike-maintenance/src/main/resources/application-dev.yml

@@ -1,10 +1,6 @@
 spring:
   application:
     name: ebike-maintenance
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
   cloud:
     nacos:
       server-addr: 127.0.0.1:8848 # nacos

ebike-maintenance/src/main/resources/application-prod.yml

@@ -1,10 +1,6 @@
 spring:
   application:
     name: ebike-maintenance
-  servlet:
-    multipart:
-      max-request-size: 100MB
-      max-file-size: 100MB
   cloud:
     nacos:
       server-addr: 47.109.141.125:8848 # nacos

ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqAuthorizeOperationDto.java

@@ -1,5 +1,6 @@
 package com.cdzy.ebikeoperate.model.dto.request;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;