From c5d9ce9a0e30612c6a834eb04489bf0f876e2a85 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 06 Jun 2022 17:59:10 +0800
Subject: [PATCH] ftp 文件读取名称修改
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 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 d786a15..d866716 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -45,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;
@@ -88,6 +89,7 @@
private final ExamPaperService examPaperService;
private final ExamPaymentService examPaymentService;
+ private final MyAsyncService myAsyncService;
/**
* 创建存储桶
@@ -192,7 +194,7 @@
@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";
@@ -224,9 +226,9 @@
.headers(headers)
.build());
InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", "f"+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);
@@ -244,7 +246,7 @@
@PostMapping("put-file-app")
public R putFileApp(@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";
@@ -276,9 +278,9 @@
.headers(headers)
.build());
InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/","f"+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;
return R.data(urls);
}
@@ -291,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";
@@ -323,9 +325,9 @@
.headers(headers)
.build());
InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", "f"+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);
@@ -344,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";
@@ -417,7 +419,7 @@
.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 = FtpConfig.ip + "/zhba/" + newName;
//取出身份证号,查询用户信息，更新用户信息
@@ -429,18 +431,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(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", "f"+split[2], inputStream);
in.close();
}
}
@@ -468,7 +472,7 @@
public R putFileExamPaymentZip(@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";
@@ -522,7 +526,7 @@
.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 = FtpConfig.ip +"/zhba/"+ newName;
//取出身份证号,查询用户信息，更新用户信息
@@ -558,11 +562,12 @@
"," + "'" + examPayment.getWorkerId() + "'" +
"," + "'" + examPayment.getPaymentStatus() + "'" +
"," +"'" + inUrl + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
//文件推送
InputStream inputStream = multipartFile.getInputStream();
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", "f"+split[2], inputStream);
in.close();
}
}
@@ -585,7 +590,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";
@@ -619,9 +624,9 @@
//文件推送
InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", "f"+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);
@@ -706,7 +711,7 @@
String[] split = bladeFile.getName().split("/");
String ip = FtpConfig.ip+"/zhba/upload/picture/";
String imgurl = ip + split[2];
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.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," +
@@ -754,7 +759,8 @@
} else {
s1 += ")";
}
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
return attach.getId();
}
--
Gitblit v1.9.3