ca2a2190 by 荆蔚杰

升级minio sdk版本,代码修改中.

minio批量删除接口修改.
附件删除接口bug修改.
1 parent d93c14b8
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
247 <dependency> 247 <dependency>
248 <groupId>cn.hutool</groupId> 248 <groupId>cn.hutool</groupId>
249 <artifactId>hutool-all</artifactId> 249 <artifactId>hutool-all</artifactId>
250 <version>5.6.0</version> 250 <version>5.7.16</version>
251 </dependency> 251 </dependency>
252 252
253 <dependency> 253 <dependency>
......
...@@ -33,7 +33,6 @@ public class MinioUtil { ...@@ -33,7 +33,6 @@ public class MinioUtil {
33 if (!isExist) { 33 if (!isExist) {
34 minioClient.makeBucket(MakeBucketArgs.builder().bucket(minioConfig.getBucket()).build()); 34 minioClient.makeBucket(MakeBucketArgs.builder().bucket(minioConfig.getBucket()).build());
35 } 35 }
36 // minioClient = new MinioClient(String.format("http://%s:%s", minioConfig.getEndpoint(), minioConfig.getPort()), minioConfig.getAccessKeyId(), minioConfig.getAccessKeySecret());
37 } catch (Exception e) { 36 } catch (Exception e) {
38 e.printStackTrace(); 37 e.printStackTrace();
39 } 38 }
...@@ -65,7 +64,6 @@ public class MinioUtil { ...@@ -65,7 +64,6 @@ public class MinioUtil {
65 String pUrl = minioConfig.getType() + minioConfig.getEndpoint() + "/file/" + saveUrl; 64 String pUrl = minioConfig.getType() + minioConfig.getEndpoint() + "/file/" + saveUrl;
66 try { 65 try {
67 minioClient.putObject(PutObjectArgs.builder().bucket(minioConfig.getBucket()).object(saveUrl).stream(file.getInputStream(), file.getSize(), -1).contentType(contentType).build()); 66 minioClient.putObject(PutObjectArgs.builder().bucket(minioConfig.getBucket()).object(saveUrl).stream(file.getInputStream(), file.getSize(), -1).contentType(contentType).build());
68 // minioClient.putObject(minioConfig.getBucket(), saveUrl, file.getInputStream(), contentType);
69 } catch (Exception e) { 67 } catch (Exception e) {
70 e.printStackTrace(); 68 e.printStackTrace();
71 } 69 }
......
...@@ -121,8 +121,6 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple ...@@ -121,8 +121,6 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
121 minioUtil.removeObject(minioConfig.getBucket(), url); 121 minioUtil.removeObject(minioConfig.getBucket(), url);
122 } 122 }
123 123
124 // Iterable<Result<DeleteError>> results = minioUtil.batchRemove(minioConfig.getBucket(), urls);
125
126 //删除数据库记录 124 //删除数据库记录
127 return this.removeByIds(bsmFileList); 125 return this.removeByIds(bsmFileList);
128 } 126 }
...@@ -140,8 +138,8 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple ...@@ -140,8 +138,8 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
140 //文件上传 138 //文件上传
141 FileAttribute fileAttribute = minioUtil.upload(uploadFile); 139 FileAttribute fileAttribute = minioUtil.upload(uploadFile);
142 140
143 //如果序号不为空
144 Integer firstXh = fileRequest.getXh(); 141 Integer firstXh = fileRequest.getXh();
142 //如果序号不为空
145 if (!StrUtil.isEmptyIfStr(firstXh)) { 143 if (!StrUtil.isEmptyIfStr(firstXh)) {
146 String firstBsmCatalog = fileRequest.getBsmCatalog(); 144 String firstBsmCatalog = fileRequest.getBsmCatalog();
147 QueryWrapper<DgFileDO> fileWrapper = new QueryWrapper<>(); 145 QueryWrapper<DgFileDO> fileWrapper = new QueryWrapper<>();
......