From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 353 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 299 insertions(+), 54 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 5035912..cd99ea5 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -19,13 +19,14 @@
import io.minio.*;
import io.minio.errors.*;
import io.swagger.annotations.Api;
-import javafx.scene.Parent;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.config.FileConfig;
-import org.springblade.common.constant.FtpConstant;
+import org.springblade.common.config.FtpConfig;
import org.springblade.common.utils.FileUtil;
import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.oss.model.OssFile;
import org.springblade.core.secure.annotation.PreAuth;
@@ -44,6 +45,7 @@
import org.springblade.modules.resource.service.IAttachService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
@@ -54,9 +56,9 @@
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern;
-
-import static org.springblade.common.constant.FtpConstant.*;
+import static org.springblade.common.config.FtpConfig.*;
/**
* 对象存储端点
@@ -87,6 +89,7 @@
private final ExamPaperService examPaperService;
private final ExamPaymentService examPaymentService;
+ private final MyAsyncService myAsyncService;
/**
* 创建存储桶
@@ -181,16 +184,17 @@
return R.data(bladeFile);
}
-
/**
- * app 文件上传
+ * 上传文件
*
- * @param file 图片对象
+ * @param file 文件
+ * @return ObjectStat
*/
- @PostMapping("put-file-app")
- public R putFileApp(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
+ @SneakyThrows
+ @PostMapping("/put-file-user-avatar")
+ public R putFileUserAvatar(@RequestParam MultipartFile file) {
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -207,7 +211,7 @@
minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
}
String fileName = file.getOriginalFilename();
- String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
+ String newName = "upload/picture/f" + UUID.randomUUID().toString().replaceAll("-", "")
+ fileName.substring(fileName.lastIndexOf("."));
InputStream in = file.getInputStream();
String[] split = newName.split("/");
@@ -222,9 +226,61 @@
.headers(headers)
.build());
InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
+ //数据封装
+ Map<String, Object> map = new HashMap<>(2);
+ map.put("name", newName);
+ map.put("url", urls);
+ //返回
+ return R.data(map);
+ }
+
+
+ /**
+ * app 文件上传
+ *
+ * @param file 图片对象
+ */
+ @PostMapping("put-file-app")
+ public R putFileApp(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
+ //填写你文件上传的地址以及相应信息
+ String url = "http://61.131.136.25: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/f" + 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, ftpPort, ftpUserName, ftpPassword, ftpPath, "/",split[2], inputStream);
+ in.close();
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
return R.data(urls);
}
@@ -237,7 +293,7 @@
@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 url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -254,7 +310,7 @@
minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
}
String fileName = file.getOriginalFilename();
- String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
+ String newName = "upload/picture/f" + UUID.randomUUID().toString().replaceAll("-", "")
+ fileName.substring(fileName.lastIndexOf("."));
InputStream in = file.getInputStream();
String[] split = newName.split("/");
@@ -269,9 +325,9 @@
.headers(headers)
.build());
InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
map.put("name", newName);
@@ -290,7 +346,7 @@
public R putFileZip(@RequestParam MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<>(1);
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -311,8 +367,9 @@
String fileType = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(Locale.US);
//判断文件是不是zip类型
if(!fileType.equals("zip")){
- map.put("data","上传文件类型不符!");
- return R.data(map);
+// map.put("data","上传文件类型不符!");
+// return R.data(map);
+ throw new ServiceException("上传文件类型不符!必须是 zip 压缩文件格式!");
}
//FileConfig.localtion是配置文件和config类生产的，测试demo可以直接把FileConfig.localtion替换成D:/test
String uuid = UUID.randomUUID().toString();
@@ -327,10 +384,29 @@
List<MultipartFile> fileList = new ArrayList<>();
//获取图片文件
- fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
+// fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
+ fileList = fileUtil.getSubFiles(desPath,fileList);
+ //将不能导入的保安员账号存起来
+ List<String> errorList = new ArrayList<>();
+ //导入状态，默认为true ,如果有一个出现问题则为 false
+ AtomicBoolean status = new AtomicBoolean(true);
+ //遍历
for (MultipartFile multipartFile : fileList){
+ long size = multipartFile.getSize();
+ if (size<30*1024 || size>500*1024){
+ status.set(false);
+ //取出身份证号,查询用户信息，更新用户信息
+ String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
+ String regex ="[\u4e00-\u9fa5]";
+ Pattern compile = Pattern.compile(regex);
+ String idCardNo = compile.matcher(pictrueName).replaceAll("");
+ //加入集合
+ errorList.add(idCardNo);
+
+ }
if(multipartFile.getName().toLowerCase().endsWith(".png") || multipartFile.getName().toLowerCase().endsWith(".jpg")) {
- String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "") + multipartFile.getName().substring(multipartFile.getName().lastIndexOf("."));
+ String name = UUID.randomUUID().toString().replaceAll("-", "") + multipartFile.getName().substring(multipartFile.getName().lastIndexOf("."));
+ String newName = "upload/picture/f" + name;
InputStream in = multipartFile.getInputStream();
String[] split = newName.split("/");
//创建头部信息
@@ -344,9 +420,9 @@
.headers(headers)
.build());
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//内网
- String inUrl = ip + newName;
+ String inUrl = FtpConfig.ip + "/zhba/" + newName;
//取出身份证号,查询用户信息，更新用户信息
String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
// String regex ="([1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx])|([1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3})";
@@ -356,18 +432,20 @@
User user = userService.getUserInfoByIdCardNo(idCardNo);
//设置用户头像url
if (null!=user){
- user.setAvatar(urls);
+// user.setAvatar(urls);
+// user.setAvatar("");
//更新用户信息
- userService.updateById(user);
+// userService.updateById(user);
//内网数据推送
//数据推送
String s = "update blade_user set avatar = " + "'" + inUrl + "'" + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
//文件推送
InputStream inputStream = multipartFile.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
}
}
@@ -377,21 +455,24 @@
FileUtil.clearFiles(desPath);
//数据封装
map.put("data", "上传成功!");
+ if (!status.get()) {
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ throw new ServiceException("用户:[" + errorAccount + "]照片导入失败!照片不能小于30KB,且不能大于500KB!!");
+ }
//返回
return R.data(map);
}
-
/**
- * 文件上传,zip , 缴费凭证
+ * 文件上传,zip(保安员头像上传)
*
* @param file 图片对象
*/
- @PostMapping("put-file-exam-payment-zip")
- public R putFileExamPaymentZip(@RequestParam MultipartFile file) throws Exception {
+ @PostMapping("put-file-zips")
+ public R putFileZips(@RequestParam MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<>(1);
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -412,12 +493,14 @@
String fileType = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(Locale.US);
//判断文件是不是zip类型
if(!fileType.equals("zip")){
- map.put("data","上传文件类型不符!");
- return R.data(map);
+// map.put("data","上传文件类型不符!");
+// return R.data(map);
+ throw new ServiceException("上传文件类型不符!必须是 zip 压缩文件格式!");
}
//FileConfig.localtion是配置文件和config类生产的，测试demo可以直接把FileConfig.localtion替换成D:/test
String uuid = UUID.randomUUID().toString();
String desPath = FileConfig.localtion + File.separator + uuid.replaceAll("-", "");
+// String desPath = "D:/test" + File.separator + uuid.replaceAll("-", "");
//遗漏了这个代码，在本地测试环境不会出问题，在服务器上一定会报没有找到文件的错误
String savePath = FileConfig.localtion + File.separator;
@@ -427,10 +510,30 @@
List<MultipartFile> fileList = new ArrayList<>();
//获取图片文件
- fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
+// fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
+ fileList = fileUtil.getSubFiles(desPath,fileList);
+ //将不能导入的保安员账号存起来
+ List<String> errorList = new ArrayList<>();
+ List<String> picList = new ArrayList<>();
+ //导入状态，默认为true ,如果有一个出现问题则为 false
+ AtomicBoolean pic = new AtomicBoolean(true);
+ AtomicBoolean status = new AtomicBoolean(true);
+ //遍历
for (MultipartFile multipartFile : fileList){
+ long size = multipartFile.getSize();
+ if (size<30*1024 || size>500*1024){
+ status.set(false);
+ //取出身份证号,查询用户信息，更新用户信息
+ String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
+ String regex ="[\u4e00-\u9fa5]";
+ Pattern compile = Pattern.compile(regex);
+ String idCardNo = compile.matcher(pictrueName).replaceAll("");
+ //加入集合
+ errorList.add(idCardNo);
+
+ }
if(multipartFile.getName().toLowerCase().endsWith(".png") || multipartFile.getName().toLowerCase().endsWith(".jpg")) {
- String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "") + multipartFile.getName().substring(multipartFile.getName().lastIndexOf("."));
+ String newName = "upload/picture/f" + UUID.randomUUID().toString().replaceAll("-", "") + multipartFile.getName().substring(multipartFile.getName().lastIndexOf("."));
InputStream in = multipartFile.getInputStream();
String[] split = newName.split("/");
//创建头部信息
@@ -444,9 +547,130 @@
.headers(headers)
.build());
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//内网
- String inUrl = ip + newName;
+ String inUrl = FtpConfig.ip + "/zhba/" + newName;
+ //取出身份证号,查询用户信息，更新用户信息
+ String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
+// String regex ="([1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx])|([1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3})";
+ String regex ="[\u4e00-\u9fa5]";
+ Pattern compile = Pattern.compile(regex);
+ String idCardNo = compile.matcher(pictrueName).replaceAll("");
+ User user = userService.getById(idCardNo);
+ //设置用户头像url
+ if (null!=user){
+// user.setAvatar(urls);
+// user.setAvatar("");
+// //更新用户信息
+// userService.updateById(user);
+
+ //内网数据推送
+ //数据推送
+ String s = "update blade_user set avatar = " + "'" + inUrl + "'" + "where id = " + "'" + user.getId() + "'";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
+
+ //文件推送
+ InputStream inputStream = multipartFile.getInputStream();
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ in.close();
+ }else {
+ pic.set(false);
+ picList.add(idCardNo);
+ }
+ }
+ }
+ //最后要删除文件
+ FileUtil.clearFiles(FileConfig.localtion + File.separator + file.getOriginalFilename());
+ FileUtil.clearFiles(desPath);
+ //数据封装
+ map.put("data", "上传成功!");
+ //如果所有数据导入有一个异常
+ StringBuilder errorBuilder = new StringBuilder();
+ if (!status.get()) {
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]照片导入失败!照片不能小于30KB,且不能大于500KB!!");
+ }
+
+ if (!pic.get()){
+ String errorAccount = StringUtils.join(picList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]导入失败!编号不存在，请检查核对后再上传!");
+ }
+ //抛出异常
+ if (errorBuilder.length()>0){
+ throw new ServiceException(errorBuilder.toString());
+ }
+ //返回
+ return R.data(map);
+ }
+
+
+ /**
+ * 文件上传,zip , 缴费凭证
+ *
+ * @param file 图片对象
+ */
+ @PostMapping("put-file-exam-payment-zip")
+ public R putFileExamPaymentZip(@RequestParam MultipartFile file) throws Exception {
+ Map<String, Object> map = new HashMap<>(1);
+ //填写你文件上传的地址以及相应信息
+ String url = "http://61.131.136.25: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 namePath = fileName.substring(0,fileName.lastIndexOf("."));
+ String fileType = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(Locale.US);
+ //判断文件是不是zip类型
+ if(!fileType.equals("zip")){
+// map.put("data","上传文件类型不符!");
+// return R.data(map);
+ throw new ServiceException("上传文件类型不符!必须是 zip 压缩文件格式!");
+ }
+ //FileConfig.localtion是配置文件和config类生产的，测试demo可以直接把FileConfig.localtion替换成D:/test
+ String uuid = UUID.randomUUID().toString();
+ String desPath = FileConfig.localtion + File.separator + uuid.replaceAll("-", "");
+
+ //遗漏了这个代码，在本地测试环境不会出问题，在服务器上一定会报没有找到文件的错误
+ String savePath = FileConfig.localtion + File.separator;
+ FileUtil fileUtil = new FileUtil();
+ //解压zip文件
+ FileUtil.unZip(file, desPath,savePath);
+
+ List<MultipartFile> fileList = new ArrayList<>();
+ //获取图片文件
+ fileList = fileUtil.getSubFiles(desPath,fileList);
+ for (MultipartFile multipartFile : fileList){
+ if(multipartFile.getName().toLowerCase().endsWith(".png") || multipartFile.getName().toLowerCase().endsWith(".jpg")) {
+ String newName = "upload/picture/f" + UUID.randomUUID().toString().replaceAll("-", "") + multipartFile.getName().substring(multipartFile.getName().lastIndexOf("."));
+ InputStream in = multipartFile.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());
+
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
+ //内网
+ String inUrl = FtpConfig.ip +"/zhba/"+ newName;
//取出身份证号,查询用户信息，更新用户信息
String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
// String regex ="([1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx])|([1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3})";
@@ -458,6 +682,7 @@
if (null!=user){
ExamPayment examPayment = new ExamPayment();
examPayment.setWorkerId(user.getId().toString());
+ examPayment.setPaymentStatus(3);
examPayment.setCertificateUrl(urls);
examPayment.setType(1);
examPayment.setPaymentTime(new Date());
@@ -472,18 +697,19 @@
//数据推送
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPayment.getPaymentTime());
- String s = "insert into sys_apply(id,type,payment_time,worker_id,apply_code,certificate_url) " +
+ String s = "insert into sys_exam_payment(id,type,payment_time,worker_id,payment_status,certificate_url) " +
"values(" + "'" + examPayment.getId() + "'" +
"," + "'" + examPayment.getType() + "'" +
"," + "'" + formatStr + "'" +
"," + "'" + examPayment.getWorkerId() + "'" +
- "," + "'" + examPayment.getApplyCode() + "'" +
- "," +"'" + examPayment.getCertificateUrl() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ "," + "'" + examPayment.getPaymentStatus() + "'" +
+ "," +"'" + inUrl + "'" + ")";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
//文件推送
InputStream inputStream = multipartFile.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
}
}
@@ -506,7 +732,7 @@
@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 url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -523,7 +749,7 @@
minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
}
String fileName = file.getOriginalFilename();
- String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
+ String newName = "upload/picture/f" + UUID.randomUUID().toString().replaceAll("-", "")
+ fileName.substring(fileName.lastIndexOf("."));
InputStream in = file.getInputStream();
String[] split = newName.split("/");
@@ -537,10 +763,12 @@
in, in.available(), -1)
.headers(headers)
.build());
+
+ //文件推送
InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
map.put("name", newName);
@@ -623,22 +851,38 @@
}
attachService.save(attach);
String[] split = bladeFile.getName().split("/");
- String ip = FtpConstant.ip+"/zhba/upload/picture/";
+ String ip = FtpConfig.ip+"/zhba/upload/picture/";
String imgurl = ip + split[2];
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", "f"+split[2], in);
//数据同步
String s1 =
"insert into blade_attach(id,tenant_id,link,domain,name,original_name,extension,attach_size,create_user,deptid," +
"create_time,update_user,update_time,status,is_deleted,type,cardid";
if (noticeId != null) {
- s1 += ",notice_id";
+ s1 += ",notice_id"+")" +"values(" + "'" + attach.getId() + "'" + "," +
+ "'" + attach.getTenantId() + "'" + "," +
+ "'" + imgurl + "'" + "," +
+ "'" + ip + "'" + "," +
+ "'" + "f"+split[2] + "'" + "," +
+ "'" + attach.getOriginalName() + "'" + "," +
+ "'" + attach.getExtension() + "'" + "," +
+ "'" + attach.getAttachSize() + "'" + "," +
+ "'" + attach.getCreateUser() + "'" + "," +
+ "'" + attach.getDeptid() + "'" + "," +
+ "'" + 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 + "'";
} else {
s1 += ") " +
"values(" + "'" + attach.getId() + "'" + "," +
"'" + attach.getTenantId() + "'" + "," +
"'" + imgurl + "'" + "," +
"'" + ip + "'" + "," +
- "'" + split[2] + "'" + "," +
+ "'" + "f"+ split[2] + "'" + "," +
"'" + attach.getOriginalName() + "'" + "," +
"'" + attach.getExtension() + "'" + "," +
"'" + attach.getAttachSize() + "'" + "," +
@@ -653,11 +897,12 @@
"'" + cardid + "'";
}
if (noticeId != null) {
- s1 += "'" + noticeId + "'" + ")";
+ s1 += ","+"'" + noticeId + "'" + ")";
} else {
s1 += ")";
}
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
return attach.getId();
}
--
Gitblit v1.9.3