qirong
2023-12-04 13a69ca416427eb21a526c645e51812e1f5d0f2f
文件名称带中文
3个文件已修改
27 ■■■■■ 已修改文件
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/SynchronousRequest.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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() {
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);
//            }
        });
    }
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 {
            // 将Java对象转换为JSON字符串
            request.setFileName(URLEncoder.encode(request.getFileName(),"utf-8"));
            jsonString = objectMapper.writeValueAsString(request);
            System.out.println(jsonString);
        } catch (Exception e) {