From 38d775fa2ccd433c727a5b7cec8bed02493df1ec Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Thu, 18 Aug 2022 09:00:40 +0800
Subject: [PATCH] mq 相关配置去除，启动配置修改
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 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..efe64d1 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";
@@ -226,7 +228,7 @@
InputStream inputStream = file.getInputStream();
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);
@@ -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";
@@ -278,7 +280,7 @@
InputStream inputStream = file.getInputStream();
FtpUtil.uploadFile(ftpHost, ftpPort, 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;
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";
@@ -325,7 +327,7 @@
InputStream inputStream = file.getInputStream();
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);
@@ -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;
//取出身份证号,查询用户信息，更新用户信息
@@ -436,7 +438,8 @@
//内网数据推送
//数据推送
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();
@@ -468,7 +471,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 +525,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,7 +561,8 @@
"," + "'" + examPayment.getWorkerId() + "'" +
"," + "'" + examPayment.getPaymentStatus() + "'" +
"," +"'" + inUrl + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
//文件推送
InputStream inputStream = multipartFile.getInputStream();
@@ -585,7 +589,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";
@@ -621,7 +625,7 @@
InputStream inputStream = file.getInputStream();
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);
@@ -754,7 +758,8 @@
} else {
s1 += ")";
}
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
return attach.getId();
}
--
Gitblit v1.9.3