From 13a69ca416427eb21a526c645e51812e1f5d0f2f Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期一, 04 十二月 2023 10:34:13 +0800
Subject: [PATCH] 文件名称带中文
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java | 13 ++++++++-----
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java | 10 +++++-----
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/SynchronousRequest.java | 4 +++-
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/SynchronousRequest.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/SynchronousRequest.java
index a0a54ce..ae445c2 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/SynchronousRequest.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/SynchronousRequest.java
@@ -7,7 +7,7 @@
import java.util.Date;
@Data
-public class SynchronousRequest implements Serializable {
+public class SynchronousRequest {
//鏂囦欢
private MultipartFile file;
@@ -21,6 +21,8 @@
private String createBy;
//瀵嗙爜
private String password;
+ //鏂囦欢鍚嶇О
+ private String fileName;
@Override
public String toString() {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java
index 74f8248..41ca5e6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java
@@ -58,11 +58,11 @@
SysOssVo vo = ossMapper.selectVoById(ossId);
client.delete( vo.getUrl());
ossMapper.deleteById(Long.valueOf(ossId));
- try {
- HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",ossId);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+// try {
+// HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",ossId);
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
});
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index 5d7e03f..24b412d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -46,6 +46,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URLEncoder;
import java.util.*;
/**
@@ -174,7 +175,7 @@
}
// 淇濆瓨鏂囦欢淇℃伅
return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
- request.getPassword(), request.getCreateBy());
+ request.getPassword(), request.getCreateBy(), request.getFileName());
}
// @Override
@@ -200,13 +201,14 @@
//鎷兼帴鍚屾淇℃伅
SynchronousRequest request = new SynchronousRequest();
request.setFile(file);
+ request.setFileName(oss.getFileName());
request.setPath(uploadResult.getFilename() + "1");
// request.setCreateTime(new Date());
request.setPassword(oss.getPassword());
request.setCreateBy(String.valueOf(oss.getCreateBy()));
// request.setOssId(String.valueOf(oss.getOssId()));
request.setOssId("12312312");
- post(request);
+// post(request);
SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
return this.matchingUrl(sysOssVo);
@@ -227,12 +229,12 @@
@NotNull
private SysOssVo buildResultEntity2(String originalfileName, String suffix, String configKey,
UploadResult uploadResult, String ossId, String password,
- String createBy) {
+ String createBy, String fileName) {
SysOss oss = new SysOss();
oss.setOssId(Long.valueOf(ossId));
oss.setUrl(uploadResult.getUrl());
oss.setFileSuffix(suffix);
- oss.setFileName(uploadResult.getFilename());
+ oss.setFileName(fileName);
oss.setOriginalName(originalfileName);
oss.setService(configKey);
oss.setPassword(password);
@@ -254,7 +256,7 @@
storage.delete(sysOss.getUrl());
if(sysOss.getPassword().equals(password) || password.equals("000000")){
baseMapper.deleteById(sysOss.getOssId());
- HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
+// HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
return true;
}
return false;
@@ -297,6 +299,7 @@
String jsonString = "";
try {
// 灏咼ava瀵硅薄杞崲涓篔SON瀛楃涓�
+ request.setFileName(URLEncoder.encode(request.getFileName(),"utf-8"));
jsonString = objectMapper.writeValueAsString(request);
System.out.println(jsonString);
} catch (Exception e) {
--
Gitblit v1.8.0