From c9424db1c23fcddd6f4eabdb5e3ef51d2c208613 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 24 Aug 2021 16:09:49 +0800
Subject: [PATCH] 派遣记录，单位数据内网推送
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 68 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index 1dc39f7..1fa4c71 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -180,9 +180,9 @@
@PostMapping("put-file-app")
public R putFileApp(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
//填写你文件上传的地址以及相应信息
- String url = "http://192.168.0.109:9000";
- String access = "minioadmin";
- String secret = "minioadmin";
+ String url = "http://223.82.109.183:2081";
+ String access = "zhbaadmin";
+ String secret = "zhbapassword";
String bucket = "zhba";
MinioClient minioClient =
MinioClient.builder()
@@ -211,8 +211,57 @@
.headers(headers)
.build());
in.close();
- String urls = "http://192.168.0.109:9000/zhba/" + newName;
+ String urls = "http://223.82.109.183:2081/zhba/" + newName;
return R.data(urls);
+ }
+
+
+ /**
+ *
+ * 文件上传,自定义上传
+ * @param file 图片对象
+ */
+ @PostMapping("put-files")
+ public R putFiles(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
+ //填写你文件上传的地址以及相应信息
+ String url = "http://223.82.109.183:2081";
+ String access = "zhbaadmin";
+ String secret = "zhbapassword";
+ String bucket = "zhba";
+ MinioClient minioClient =
+ MinioClient.builder()
+ .endpoint(url)
+ .credentials(access, secret)
+ .build();
+ // 检查存储桶是否已经存在
+ boolean isExist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucket).build());
+ if (!isExist) {
+ // 创建一个名为zip的存储桶，用于zip文件。
+ minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
+ minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
+ }
+ String fileName = file.getOriginalFilename();
+ String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
+ + fileName.substring(fileName.lastIndexOf("."));
+ InputStream in = file.getInputStream();
+ //创建头部信息
+ Map<String, String> headers = new HashMap<>(1 << 2);
+ //添加自定义内容类型
+ headers.put("Content-Type", "application/octet-stream");
+ //上传
+ minioClient.putObject(
+ PutObjectArgs.builder().bucket(bucket).object(newName).stream(
+ in, in.available(), -1)
+ .headers(headers)
+ .build());
+ in.close();
+ String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ //数据封装
+ Map<String, Object> map = new HashMap<>(2);
+ map.put("name",newName);
+ map.put("url",urls);
+ //返回
+ return R.data(map);
}
/**
@@ -237,10 +286,10 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach")
- public R<BladeFile> putFileAttach(@RequestParam MultipartFile file,String deptid,String type,Long noticeId) {
+ public R<BladeFile> putFileAttach(@RequestParam MultipartFile file,String deptid,String type,Long noticeId,String cardid) {
String fileName = file.getOriginalFilename();
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
- Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type,noticeId);
+ Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type,noticeId,cardid);
bladeFile.setAttachId(attachId);
return R.data(bladeFile);
}
@@ -254,9 +303,9 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach-by-name")
- public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file,String deptid,String type,Long noticeId) {
+ public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file,String deptid,String type,Long noticeId,String cardid) {
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
- Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type,noticeId);
+ Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type,noticeId,cardid);
bladeFile.setAttachId(attachId);
return R.data(bladeFile);
}
@@ -269,7 +318,7 @@
* @param bladeFile 对象存储文件
* @return attachId
*/
- private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String deptid,String type,Long noticeId) throws Exception {
+ private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String deptid,String type,Long noticeId,String cardid) throws Exception {
//BladeUser user = AuthUtil.getUser();
String fileExtension = FileUtil.getFileExtension(fileName);
Attach attach = new Attach();
@@ -280,6 +329,7 @@
attach.setAttachSize(fileSize);
attach.setExtension(fileExtension);
attach.setDeptid(deptid);
+ attach.setCardid(cardid);
attach.setType(type);
if (null!=noticeId){
attach.setNoticeId(noticeId);
--
Gitblit v1.9.3