qirong
2023-12-04 13a69ca416427eb21a526c645e51812e1f5d0f2f
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,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.*;
/**
@@ -56,6 +58,7 @@
@Service
public class SysOssServiceImpl implements ISysOssService, OssService {
    private final Boundary boundary;
    private final SysOssMapper baseMapper;
    @Override
@@ -172,7 +175,7 @@
        }
        // 保存文件信息
        return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
            request.getPassword(), request.getCreateBy());
            request.getPassword(), request.getCreateBy(), request.getFileName());
    }
//    @Override
@@ -198,12 +201,14 @@
        //拼接同步信息
        SynchronousRequest request = new SynchronousRequest();
        request.setFile(file);
        request.setPath(uploadResult.getFilename() + "123");
        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()));
        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,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.substring(0,ossId.length()-3) + "000"));
        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);
@@ -251,7 +256,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 +294,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 {
            // 将Java对象转换为JSON字符串
            request.setFileName(URLEncoder.encode(request.getFileName(),"utf-8"));
            jsonString = objectMapper.writeValueAsString(request);
            System.out.println(jsonString);
        } catch (Exception e) {