From f6e87ad38aa01d70df9da3eedefa436fe88fa100 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 24 Sep 2021 19:14:52 +0800
Subject: [PATCH] 1.用户
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 0cf1cd8..153f172 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -346,7 +346,7 @@
String urls = "http://223.82.109.183:2081/zhba/" + newName;
//内网
- String inUrl = ip + newName;
+ String inUrl = 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})";
@@ -446,7 +446,7 @@
String urls = "http://223.82.109.183:2081/zhba/" + newName;
//内网
- String inUrl = ip + newName;
+ String inUrl = 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 +458,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,13 +473,13 @@
//数据推送
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);
//文件推送
@@ -537,6 +538,8 @@
in, in.available(), -1)
.headers(headers)
.build());
+
+ //文件推送
InputStream inputStream = file.getInputStream();
FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
--
Gitblit v1.9.3