From 0099d31b659e49e0a101a18f279520226fa253d6 Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Tue, 19 Aug 2025 16:43:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 4 ++ .../src/main/resources/application-prod.yml | 4 ++ .../controller/EbikeBikeInfoController.java | 3 +- .../ebikemaintenance/utils/MinioUtil.java | 49 ++++++++++++------- .../src/main/resources/application-dev.yml | 4 ++ .../src/main/resources/application-prod.yml | 4 ++ .../dto/request/ReqAuthorizeOperationDto.java | 1 - 7 files changed, 49 insertions(+), 20 deletions(-) diff --git a/ebike-gateway/src/main/resources/application-dev.yml b/ebike-gateway/src/main/resources/application-dev.yml index 6f9141f1..449f643c 100644 --- a/ebike-gateway/src/main/resources/application-dev.yml +++ b/ebike-gateway/src/main/resources/application-dev.yml @@ -3,6 +3,10 @@ server: spring: application: name: ebike-gateway + servlet: + multipart: + max-file-size: 100MB + max-request-size: 100MB jackson: serialization: write-dates-as-timestamps: false diff --git a/ebike-gateway/src/main/resources/application-prod.yml b/ebike-gateway/src/main/resources/application-prod.yml index 7058862b..80e42842 100644 --- a/ebike-gateway/src/main/resources/application-prod.yml +++ b/ebike-gateway/src/main/resources/application-prod.yml @@ -3,6 +3,10 @@ server: spring: application: name: ebike-gateway + servlet: + multipart: + max-file-size: 100MB + max-request-size: 100MB jackson: serialization: write-dates-as-timestamps: false diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java index 16b65f1f..ad12e1d8 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java @@ -394,8 +394,9 @@ 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); + minioUtil.uploadFile(inputStream, MinioUtil.BUCKET_FAULT, fileUniqueKey,contentType); String fileUrl = minioUtil.getFileUrl(MinioUtil.BUCKET_FAULT, fileUniqueKey); ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto(); resEbikeFaultReportFileDto.setUrl(fileUrl); diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/utils/MinioUtil.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/utils/MinioUtil.java index 4f78e2a9..4b188b54 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/utils/MinioUtil.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/utils/MinioUtil.java @@ -21,33 +21,41 @@ 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 文件名称 + * @param bucket 数据桶名称 + * @param objectName 文件名称 * @throws Exception 异常 */ - public void uploadFile(InputStream inputStream, String bucket, String objectName) throws Exception{ + public void uploadFile(InputStream inputStream, String bucket, String objectName, String contentType) throws Exception { //上传文件 - minioClient.putObject(PutObjectArgs.builder().bucket(bucket).object(objectName) - .stream(inputStream,-1,Integer.MAX_VALUE).build()); + minioClient.putObject( + PutObjectArgs.builder() + .bucket(bucket) + .object(objectName) + .contentType(contentType) + .stream(inputStream, -1, Integer.MAX_VALUE).build() + ); } /** * 获取文件分析连接（7天有效 - * @param bucket 数据桶名称 + * + * @param bucket 数据桶名称 * @param fileName 文件名称 * @return url * @throws Exception 异常 @@ -57,7 +65,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() @@ -67,55 +75,60 @@ public class MinioUtil { /** * 或曲解文件链接地址 * - * @param bucket 数据桶名称 + * @param bucket 数据桶名称 * @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 getAllBucket() throws Exception{ + public List getAllBucket() throws Exception { List buckets = minioClient.listBuckets(); return buckets.stream().map(Bucket::name).collect(Collectors.toList()); } /** * 下载文件 - * @param bucket 数据桶名称 + * + * @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 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()); } } \ No newline at end of file diff --git a/ebike-maintenance/src/main/resources/application-dev.yml b/ebike-maintenance/src/main/resources/application-dev.yml index 9ff39566..e5a08fca 100644 --- a/ebike-maintenance/src/main/resources/application-dev.yml +++ b/ebike-maintenance/src/main/resources/application-dev.yml @@ -1,6 +1,10 @@ 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 diff --git a/ebike-maintenance/src/main/resources/application-prod.yml b/ebike-maintenance/src/main/resources/application-prod.yml index a86736a7..dbc7220a 100644 --- a/ebike-maintenance/src/main/resources/application-prod.yml +++ b/ebike-maintenance/src/main/resources/application-prod.yml @@ -1,6 +1,10 @@ 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 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqAuthorizeOperationDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqAuthorizeOperationDto.java index 6f0d56fa..946bfbae 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqAuthorizeOperationDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqAuthorizeOperationDto.java @@ -1,6 +1,5 @@ package com.cdzy.ebikeoperate.model.dto.request; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data;