From 61136265a19abbdd1eaaa9ee46c6da8d05eb25be Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期一, 04 十二月 2023 09:44:16 +0800
Subject: [PATCH] 对接边界
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 c698890..5d7e03f 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;
@@ -56,6 +57,7 @@
@Service
public class SysOssServiceImpl implements ISysOssService, OssService {
+ private final Boundary boundary;
private final SysOssMapper baseMapper;
@Override
@@ -198,11 +200,12 @@
//鎷兼帴鍚屾淇℃伅
SynchronousRequest request = new SynchronousRequest();
request.setFile(file);
- request.setPath(uploadResult.getFilename() + "123");
+ 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(String.valueOf(oss.getOssId()));
+ request.setOssId("12312312");
post(request);
SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
@@ -226,7 +229,7 @@
UploadResult uploadResult, String ossId, String password,
String createBy) {
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());
@@ -251,7 +254,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/delete",String.valueOf(sysOss.getOssId()));
+ HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
return true;
}
return false;
@@ -289,7 +292,7 @@
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 {
--
Gitblit v1.8.0