attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: attiya:85e99bff3b18fb0fe1af930f49c271971f166bfe
Branches Tags
attiya:main
..
compare: attiya:58d629ab40fc2c1a4c98aebc648a3d6180db50e2
Branches Tags
attiya:main

No commits in common. "85e99bff3b18fb0fe1af930f49c271971f166bfe" and "58d629ab40fc2c1a4c98aebc648a3d6180db50e2" have entirely different histories.
85e99bff3b ... 58d629ab40

7 changed files with 20 additions and 49 deletions
Show Stats Expand all files Collapse all files

4
ebike-gateway/src/main/resources/application-dev.yml
View File

@ -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

4
ebike-gateway/src/main/resources/application-prod.yml
View File

@ -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
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
View File

@ -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);

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

@ -21,41 +21,33 @@ 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, 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 bucket 数据桶名称
* @param fileName 文件名称
* @return url
* @throws Exception 异常
@ -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()
@ -75,60 +67,55 @@ 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<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 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());
}
}

4
ebike-maintenance/src/main/resources/application-dev.yml
View File

@ -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

4
ebike-maintenance/src/main/resources/application-prod.yml
View File

@ -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
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqAuthorizeOperationDto.java
View File

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