From f288ed575764a898bb8df1eb06c9b3cba55f3e17 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Thu, 18 Aug 2022 15:45:14 +0800
Subject: [PATCH] 文件上传配置提取，派遣记录查询修改
---
src/main/java/org/springblade/common/config/FileConfig.java | 18 +++++++++
src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java | 9 ++--
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 63 +++++++++++++++----------------
src/main/resources/application-dev.yml | 4 ++
src/main/resources/application-prod.yml | 4 ++
src/main/java/org/springblade/modules/system/controller/UserController.java | 11 +++--
src/main/resources/application-test.yml | 10 +++-
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 1
8 files changed, 75 insertions(+), 45 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/FileConfig.java b/src/main/java/org/springblade/common/config/FileConfig.java
index 591bef9..121307f 100644
--- a/src/main/java/org/springblade/common/config/FileConfig.java
+++ b/src/main/java/org/springblade/common/config/FileConfig.java
@@ -17,6 +17,10 @@
public static String localtion;
public static String maxFileSize;
public static String maxRequestSize;
+ public static String url;
+ public static String access;
+ public static String secret;
+ public static String bucket;
/**
* @param localtion the localtion to set
@@ -39,5 +43,19 @@
FileConfig.maxRequestSize = maxRequestSize;
}
+ public void setUrl(String url) {
+ FileConfig.url = url;
+ }
+ public void setAccess(String access) {
+ FileConfig.access = access;
+ }
+
+ public void setSecret(String secret) {
+ FileConfig.secret = secret;
+ }
+
+ public void setBucket(String bucket) {
+ FileConfig.bucket = bucket;
+ }
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
index 64e2c70..8c11db7 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -65,6 +65,7 @@
)
</if>
<if test="dispatcher.dispatch!=null and dispatcher.dispatch!=''">
+ and bu.dispatch = #{dispatcher.dispatch}
and sd.status = #{dispatcher.dispatch}
</if>
<if test="dispatcher.userIds!=null and dispatcher.userIds!=''">
diff --git a/src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java b/src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java
index 2ff8661..0e40f21 100644
--- a/src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java
+++ b/src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java
@@ -28,6 +28,7 @@
import javax.validation.Valid;
import org.apache.commons.lang3.StringUtils;
+import org.springblade.common.config.FileConfig;
import org.springblade.common.config.FtpConfig;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -284,10 +285,10 @@
* @param file
*/
private String putFile(MultipartFile file) throws IOException, InvalidKeyException, InvalidResponseException, InsufficientDataException, NoSuchAlgorithmException, ServerException, InternalException, XmlParserException, ErrorResponseException {
- String url = "http://61.131.136.25:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.url;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
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 efe64d1..180c1b7 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -194,10 +194,10 @@
@PostMapping("/put-file-user-avatar")
public R putFileUserAvatar(@RequestParam MultipartFile file) {
//填写你文件上传的地址以及相应信息
- String url = "http://61.131.136.25:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.url;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -228,7 +228,7 @@
InputStream inputStream = file.getInputStream();
FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://61.131.136.25:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
map.put("name", newName);
@@ -246,10 +246,10 @@
@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";
+ String url = FileConfig.url;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -280,7 +280,7 @@
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;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
return R.data(urls);
}
@@ -293,10 +293,10 @@
@PostMapping("put-files")
public R putFiles(@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";
+ String url = FileConfig.url;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -327,7 +327,7 @@
InputStream inputStream = file.getInputStream();
FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://61.131.136.25:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
map.put("name", newName);
@@ -346,10 +346,10 @@
public R putFileZip(@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";
+ String url = FileConfig.url;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -367,8 +367,6 @@
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
@@ -402,7 +400,6 @@
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("."));
@@ -419,7 +416,7 @@
.headers(headers)
.build());
- String urls = "http://61.131.136.25:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
//内网
String inUrl = FtpConfig.ip + "/zhba/" + newName;
//取出身份证号,查询用户信息，更新用户信息
@@ -471,10 +468,10 @@
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";
+ String url = FileConfig.url;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -525,7 +522,7 @@
.headers(headers)
.build());
- String urls = "http://61.131.136.25:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
//内网
String inUrl = FtpConfig.ip +"/zhba/"+ newName;
//取出身份证号,查询用户信息，更新用户信息
@@ -589,10 +586,10 @@
@PostMapping("put-files-talk")
public R putFilestak(@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";
+ String url = FileConfig.url;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -625,7 +622,7 @@
InputStream inputStream = file.getInputStream();
FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://61.131.136.25:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
map.put("name", newName);
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index c7643ed..8537b0b 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -34,6 +34,7 @@
import net.sf.json.JSONObject;
import org.apache.commons.codec.Charsets;
import org.springblade.common.cache.DictCache;
+import org.springblade.common.config.FileConfig;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
import org.springblade.common.excel.CustomCellWriteHeightConfig;
@@ -658,10 +659,10 @@
}
}
//填写你文件上传的地址以及相应信息
- String url = "http://61.131.136.25:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.url;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -691,7 +692,7 @@
FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
//外围url
- String urls = "http://61.131.136.25:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/zhba/" + newName;
//内网
String inUrl = FtpConfig.ip + "/zhba/" + newName;
//返回
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 68f127d..bbfd6b1 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -47,6 +47,10 @@
localtion: ${UPLOAD_DIR:/home/zhongsong/anbao}
maxFileSize: 10240KB
maxRequestSize: 102400KB
+ url: http://47.49.36.190:9000
+ access: minioadmin
+ secret: minioadmin
+ bucket: zhba
#ftp 设置
ftp:
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index a5c47bb..e4a42b1 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -47,6 +47,10 @@
localtion: ${UPLOAD_DIR:/home/zhbaw/anbao}
maxFileSize: 10240KB
maxRequestSize: 102400KB
+ url: http://47.49.36.190:9000
+ access: minioadmin
+ secret: minioadmin
+ bucket: zhba
#ftp 设置
ftp:
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 8f25b99..dbeb437 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -15,7 +15,7 @@
# MySql
url: jdbc:mysql://192.168.0.126:3306/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: 123456
+ password: NCzhba@2022
# rabbitmq 设置
# rabbitmq:
# host: 192.168.0.191
@@ -51,10 +51,14 @@
localtion: ${UPLOAD_DIR:E:/test}
maxFileSize: 10240KB
maxRequestSize: 102400KB
+ url: http://47.49.36.190:9000
+ access: minioadmin
+ secret: minioadmin
+ bucket: zhba
#ftp 设置
ftp:
- sqlConnect: jdbc:mysql://192.168.0.126:3306/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ sqlConnect: jdbc:mysql://localhost:3306/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
ftpHost: 117.40.91.118
ftpPort: 21
ftpUserName: zhbain
@@ -64,7 +68,7 @@
ip: http://61.131.136.25:2081
jsonUrl: E:\\anbao\\
username: root
- password: 123456
+ password: NCzhba@2022
qfqkBaseApiUrl: http://192.168.0.198:83
# qfqkBaseApiUrl : http://61.131.136.25:2082/api
--
Gitblit v1.9.3