From 7327c2b113573bccaeef5b3fc5c82011abc00cd8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 15:58:03 +0800
Subject: [PATCH] 设备，车辆接口修改
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..4997f72 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;
@@ -251,6 +252,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 +263,7 @@
in, in.available(), -1)
.headers(headers)
.build());
+ FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
in.close();
String urls = "http://223.82.109.183:2081/zhba/" + newName;
//数据封装
@@ -395,7 +398,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 +429,8 @@
}
if (noticeId != null) {
s1 += "'" + noticeId + "'" + ")";
- }
- else {
- s1+=")";
+ } else {
+ s1 += ")";
}
FtpUtil.sqlFileUpload(s1);
return attach.getId();
--
Gitblit v1.9.3