From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 123 +++++++++++++++++++++++++++++++++++++---
1 files changed, 113 insertions(+), 10 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 1fa4c71..7ddbf07 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -30,6 +30,7 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
+import org.springblade.common.constant.FtpConstant;
import org.springblade.common.utils.arg;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.oss.model.BladeFile;
@@ -42,19 +43,26 @@
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.FileUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.resource.builder.oss.OssBuilder;
import org.springblade.modules.resource.entity.Attach;
import org.springblade.modules.resource.service.IAttachService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+
+import static org.springblade.common.constant.FtpConstant.*;
/**
* 对象存储端点
@@ -173,8 +181,8 @@
/**
- *
* app 文件上传
+ *
* @param file 图片对象
*/
@PostMapping("put-file-app")
@@ -200,6 +208,7 @@
String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
+ fileName.substring(fileName.lastIndexOf("."));
InputStream in = file.getInputStream();
+ String[] split = newName.split("/");
//创建头部信息
Map<String, String> headers = new HashMap<>(1 << 2);
//添加自定义内容类型
@@ -210,6 +219,8 @@
in, in.available(), -1)
.headers(headers)
.build());
+ InputStream inputStream = file.getInputStream();
+ FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
String urls = "http://223.82.109.183:2081/zhba/" + newName;
return R.data(urls);
@@ -217,8 +228,8 @@
/**
- *
* 文件上传,自定义上传
+ *
* @param file 图片对象
*/
@PostMapping("put-files")
@@ -244,6 +255,7 @@
String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
+ fileName.substring(fileName.lastIndexOf("."));
InputStream in = file.getInputStream();
+ String[] split = newName.split("/");
//创建头部信息
Map<String, String> headers = new HashMap<>(1 << 2);
//添加自定义内容类型
@@ -254,12 +266,66 @@
in, in.available(), -1)
.headers(headers)
.build());
+ InputStream inputStream = file.getInputStream();
+ FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
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);
+ map.put("name", newName);
+ map.put("url", urls);
+ //返回
+ return R.data(map);
+ }
+
+
+ /**
+ * 文件上传,自定义上传
+ *
+ * @param file 图片对象
+ */
+ @PostMapping("put-files-talk")
+ public R putFilestak(@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();
+ String[] split = newName.split("/");
+ //创建头部信息
+ 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());
+ InputStream inputStream = file.getInputStream();
+ FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ 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);
}
@@ -286,10 +352,11 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach")
- public R<BladeFile> putFileAttach(@RequestParam MultipartFile file,String deptid,String type,Long noticeId,String cardid) {
+ 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,cardid);
+ InputStream inputStream = file.getInputStream();
+ Long attachId = buildAttach(fileName, file.getSize(), bladeFile, deptid, type, noticeId, cardid, inputStream);
bladeFile.setAttachId(attachId);
return R.data(bladeFile);
}
@@ -303,9 +370,9 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach-by-name")
- public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file,String deptid,String type,Long noticeId,String cardid) {
+ 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,cardid);
+ Long attachId = buildAttach(fileName, file.getSize(), bladeFile, deptid, type, noticeId, cardid, file.getInputStream());
bladeFile.setAttachId(attachId);
return R.data(bladeFile);
}
@@ -318,7 +385,7 @@
* @param bladeFile 对象存储文件
* @return attachId
*/
- private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String deptid,String type,Long noticeId,String cardid) throws Exception {
+ private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile, String deptid, String type, Long noticeId, String cardid, InputStream in) throws Exception {
//BladeUser user = AuthUtil.getUser();
String fileExtension = FileUtil.getFileExtension(fileName);
Attach attach = new Attach();
@@ -331,10 +398,46 @@
attach.setDeptid(deptid);
attach.setCardid(cardid);
attach.setType(type);
- if (null!=noticeId){
+ if (null != noticeId) {
attach.setNoticeId(noticeId);
}
attachService.save(attach);
+ String[] split = bladeFile.getName().split("/");
+ String ip = FtpConstant.ip+"/zhba/picture/";
+ String imgurl = ip + split[2];
+ FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
+ //数据同步
+ String s1 =
+ "insert into blade_attach(id,tenant_id,link,domain,name,original_name,extension,attach_size,create_user,create_dept," +
+ "create_time,update_user,update_time,status,is_deleted,type,cardid";
+ if (noticeId != null) {
+ s1 += ",notice_id";
+ } else {
+ s1 += ") " +
+ "values(" + "'" + attach.getId() + "'" + "," +
+ "'" + attach.getTenantId() + "'" + "," +
+ "'" + imgurl + "'" + "," +
+ "'" + ip + "'" + "," +
+ "'" + split[2] + "'" + "," +
+ "'" + attach.getOriginalName() + "'" + "," +
+ "'" + attach.getExtension() + "'" + "," +
+ "'" + attach.getAttachSize() + "'" + "," +
+ "'" + attach.getCreateUser() + "'" + "," +
+ "'" + attach.getCreateDept() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
+ "'" + attach.getUpdateUser() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
+ "'" + attach.getStatus() + "'" + "," +
+ "'" + attach.getIsDeleted() + "'" + "," +
+ "'" + attach.getType() + "'" + "," +
+ "'" + cardid + "'";
+ }
+ if (noticeId != null) {
+ s1 += "'" + noticeId + "'" + ")";
+ } else {
+ s1 += ")";
+ }
+ FtpUtil.sqlFileUpload(s1);
return attach.getId();
}
--
Gitblit v1.9.3