From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 17 ++++++++++++-----
1 files changed, 12 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 39a45b1..7ddbf07 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -30,6 +30,7 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
+import org.springblade.common.constant.FtpConstant;
import org.springblade.common.utils.arg;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.oss.model.BladeFile;
@@ -207,6 +208,7 @@
String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
+ fileName.substring(fileName.lastIndexOf("."));
InputStream in = file.getInputStream();
+ String[] split = newName.split("/");
//创建头部信息
Map<String, String> headers = new HashMap<>(1 << 2);
//添加自定义内容类型
@@ -217,6 +219,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();
String urls = "http://223.82.109.183:2081/zhba/" + newName;
return R.data(urls);
@@ -251,6 +255,7 @@
String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
+ fileName.substring(fileName.lastIndexOf("."));
InputStream in = file.getInputStream();
+ String[] split = newName.split("/");
//创建头部信息
Map<String, String> headers = new HashMap<>(1 << 2);
//添加自定义内容类型
@@ -261,6 +266,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();
String urls = "http://223.82.109.183:2081/zhba/" + newName;
//数据封装
@@ -311,7 +318,8 @@
in, in.available(), -1)
.headers(headers)
.build());
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
+ InputStream inputStream = file.getInputStream();
+ FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
String urls = "http://223.82.109.183:2081/zhba/" + newName;
//数据封装
@@ -395,7 +403,7 @@
}
attachService.save(attach);
String[] split = bladeFile.getName().split("/");
- String ip = "http://192.168.0.108/zhba/picture/";
+ String ip = FtpConstant.ip+"/zhba/picture/";
String imgurl = ip + split[2];
FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
//数据同步
@@ -426,9 +434,8 @@
}
if (noticeId != null) {
s1 += "'" + noticeId + "'" + ")";
- }
- else {
- s1+=")";
+ } else {
+ s1 += ")";
}
FtpUtil.sqlFileUpload(s1);
return attach.getId();
--
Gitblit v1.9.3