From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 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..1a8be40 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -19,11 +19,10 @@
import io.minio.*;
import io.minio.errors.*;
import io.swagger.annotations.Api;
-import javafx.scene.Parent;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
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.oss.model.BladeFile;
@@ -55,8 +54,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Pattern;
-
-import static org.springblade.common.constant.FtpConstant.*;
+import static org.springblade.common.config.FtpConfig.*;
/**
* 对象存储端点
@@ -222,7 +220,7 @@
.headers(headers)
.build());
InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
String urls = "http://223.82.109.183:2081/zhba/" + newName;
return R.data(urls);
@@ -269,7 +267,7 @@
.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;
//数据封装
@@ -346,7 +344,7 @@
String urls = "http://223.82.109.183: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})";
@@ -367,7 +365,7 @@
//文件推送
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();
}
}
@@ -446,7 +444,7 @@
String urls = "http://223.82.109.183: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})";
@@ -458,6 +456,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 +471,18 @@
//数据推送
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() + "'" + ")";
+ "," + "'" + examPayment.getPaymentStatus() + "'" +
+ "," +"'" + inUrl + "'" + ")";
FtpUtil.sqlFileUpload(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();
}
}
@@ -537,8 +536,10 @@
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;
//数据封装
@@ -623,15 +624,31 @@
}
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, "/", 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 + "'" + "," +
+ "'" + 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() + "'" + "," +
@@ -653,7 +670,7 @@
"'" + cardid + "'";
}
if (noticeId != null) {
- s1 += "'" + noticeId + "'" + ")";
+ s1 += ","+"'" + noticeId + "'" + ")";
} else {
s1 += ")";
}
--
Gitblit v1.9.3