Compare commits
No commits in common. "85e99bff3b18fb0fe1af930f49c271971f166bfe" and "58d629ab40fc2c1a4c98aebc648a3d6180db50e2" have entirely different histories.
85e99bff3b
...
58d629ab40
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -21,7 +21,6 @@ public class MinioUtil {
|
||||
|
||||
/**
|
||||
* 创建桶
|
||||
*
|
||||
* @param bucket 数据桶名称
|
||||
* @throws Exception 异常
|
||||
*/
|
||||
@ -35,26 +34,19 @@ public class MinioUtil {
|
||||
|
||||
/**
|
||||
* 上传文件
|
||||
*
|
||||
* @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(
|
||||
PutObjectArgs.builder()
|
||||
.bucket(bucket)
|
||||
.object(objectName)
|
||||
.contentType(contentType)
|
||||
.stream(inputStream, -1, Integer.MAX_VALUE).build()
|
||||
);
|
||||
minioClient.putObject(PutObjectArgs.builder().bucket(bucket).object(objectName)
|
||||
.stream(inputStream,-1,Integer.MAX_VALUE).build());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取文件分析连接(7天有效
|
||||
*
|
||||
* @param bucket 数据桶名称
|
||||
* @param fileName 文件名称
|
||||
* @return url
|
||||
@ -87,10 +79,8 @@ public class MinioUtil {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有的桶
|
||||
*
|
||||
* @return 数据桶名称列表
|
||||
* @throws Exception 异常
|
||||
*/
|
||||
@ -101,7 +91,6 @@ public class MinioUtil {
|
||||
|
||||
/**
|
||||
* 下载文件
|
||||
*
|
||||
* @param bucket 数据桶名称
|
||||
* @param objectName 文件名称
|
||||
* @return 文件流
|
||||
@ -113,7 +102,6 @@ public class MinioUtil {
|
||||
|
||||
/**
|
||||
* 删除桶
|
||||
*
|
||||
* @param bucket 数据桶名称
|
||||
* @throws Exception 异常
|
||||
*/
|
||||
@ -123,7 +111,6 @@ public class MinioUtil {
|
||||
|
||||
/**
|
||||
* 删除文件
|
||||
*
|
||||
* @param bucket 数据桶名称
|
||||
* @param objectName 文件名称
|
||||
* @throws Exception 异常
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.cdzy.ebikeoperate.model.dto.request;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user