From 9f6f07f1649f01258aaad541d9fa1dfca63641c0 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期一, 04 十二月 2023 11:59:58 +0800
Subject: [PATCH] 日期
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
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 f4ba4b7..9fb83c1 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
@@ -29,6 +29,7 @@
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.system.domain.SysOss;
import org.dromara.system.domain.bo.SysOssBo;
+import org.dromara.system.domain.properties.Boundary;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.mapper.SysOssMapper;
import org.dromara.system.service.ISysOssService;
@@ -45,6 +46,8 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -56,6 +59,7 @@
@Service
public class SysOssServiceImpl implements ISysOssService, OssService {
+ private final Boundary boundary;
private final SysOssMapper baseMapper;
@Override
@@ -172,7 +176,7 @@
}
// 淇濆瓨鏂囦欢淇℃伅
return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
- request.getPassword(), request.getCreateBy());
+ request.getPassword(), request.getCreateBy(), request.getFileName());
}
// @Override
@@ -197,13 +201,16 @@
baseMapper.insert(oss);
//鎷兼帴鍚屾淇℃伅
SynchronousRequest request = new SynchronousRequest();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
request.setFile(file);
- request.setPath(uploadResult.getFilename() + "123");
-// request.setCreateTime(new Date());
+ request.setFileName(oss.getOriginalName());
+ request.setPath(uploadResult.getFilename() + "1");
+ request.setCreateTime(format.format(oss.getCreateTime()));
request.setPassword(oss.getPassword());
request.setCreateBy(String.valueOf(oss.getCreateBy()));
- request.setOssId(String.valueOf(oss.getOssId()));
- post(request);
+// request.setOssId(String.valueOf(oss.getOssId()));
+ request.setOssId("12312312");
+// post(request);
SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
return this.matchingUrl(sysOssVo);
@@ -224,13 +231,13 @@
@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.substring(0,ossId.length()-3) + "000"));
+ oss.setOssId(Long.valueOf(ossId));
oss.setUrl(uploadResult.getUrl());
oss.setFileSuffix(suffix);
oss.setFileName(uploadResult.getFilename());
- oss.setOriginalName(originalfileName);
+ oss.setOriginalName(fileName);
oss.setService(configKey);
oss.setPassword(password);
oss.setCreateTime(new Date());
@@ -251,7 +258,7 @@
storage.delete(sysOss.getUrl());
if(sysOss.getPassword().equals(password) || password.equals("000000")){
baseMapper.deleteById(sysOss.getOssId());
- HttpUtils.sendDeleteRequest("http://192.168.3.43/resource/synchronization",String.valueOf(sysOss.getOssId()));
+// HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
return true;
}
return false;
@@ -289,11 +296,12 @@
private String post(SynchronousRequest request) throws IOException {
HashMap<String, String> headers = new HashMap<>(3);
- String requestUrl = "http://192.168.3.43:8080/resource/synchronization/upload";
+ String requestUrl = boundary.getLocalhost() + "/resource/synchronization/upload";
ObjectMapper objectMapper = new ObjectMapper();
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