qirong
2023-11-22 762167f3b4248055fc020277af1bd5724e29fec0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -139,7 +139,7 @@
    }
    @Override
    public SysOssVo upload(MultipartFile file) {
    public SysOssVo upload(MultipartFile file) throws IOException {
        String originalfileName = file.getOriginalFilename();
        String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
        OssClient storage = OssFactory.instance();
@@ -172,7 +172,7 @@
        }
        // 保存文件信息
        return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
            request.getPassword(), request.getCreateTime(), request.getCreateBy());
            request.getPassword(), request.getCreateBy());
    }
//    @Override
@@ -186,7 +186,7 @@
//    }
    @NotNull
    private SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult, MultipartFile file) {
    private SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult, MultipartFile file) throws IOException {
        SysOss oss = new SysOss();
        oss.setUrl(uploadResult.getUrl());
        oss.setFileSuffix(suffix);
@@ -199,11 +199,11 @@
        SynchronousRequest request = new SynchronousRequest();
        request.setFile(file);
        request.setPath(uploadResult.getFilename() + "123");
        request.setCreateTime(oss.getCreateTime());
//        request.setCreateTime(new Date());
        request.setPassword(oss.getPassword());
        request.setCreateBy(String.valueOf(oss.getCreateBy()));
        request.setOssId(String.valueOf(oss.getOssId()));
//        post(request);
        post(request);
        SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
        return this.matchingUrl(sysOssVo);
@@ -217,14 +217,14 @@
     * @param uploadResult
     * @param ossId
     * @param password
     * @param createTime
//     * @param createTime
     * @param createBy
     * @return
     */
    @NotNull
    private SysOssVo buildResultEntity2(String originalfileName, String suffix, String configKey,
                                        UploadResult uploadResult, String ossId, String password,
                                        Date createTime, String createBy) {
                                         String createBy) {
        SysOss oss = new SysOss();
        oss.setOssId(Long.valueOf(ossId));
        oss.setUrl(uploadResult.getUrl());
@@ -233,7 +233,7 @@
        oss.setOriginalName(originalfileName);
        oss.setService(configKey);
        oss.setPassword(password);
        oss.setCreateTime(createTime);
        oss.setCreateTime(new Date());
        oss.setCreateBy(Long.valueOf(createBy));
        baseMapper.insert(oss);
        SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
@@ -241,7 +241,7 @@
    }
    @Override
    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid, String password) {
    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid, String password) throws Exception {
        if (isValid) {
            // 做一些业务上的校验,判断是否需要校验
        }
@@ -251,6 +251,7 @@
            storage.delete(sysOss.getUrl());
            if(sysOss.getPassword().equals(password)){
                baseMapper.deleteById(sysOss.getOssId());
                HttpUtils.sendDeleteRequest("http://192.168.3.43/resource/oss",String.valueOf(sysOss.getOssId()));
                return true;
            }
            return false;
@@ -286,7 +287,7 @@
        return oss;
    }
    private String post(SynchronousRequest request){
    private String post(SynchronousRequest request) throws IOException {
        HashMap<String, String> headers = new HashMap<>(3);
        String requestUrl = "http://192.168.3.43:8080/resource/oss/synchronization";
        ObjectMapper objectMapper = new ObjectMapper();
@@ -300,7 +301,7 @@
        }
        headers.put("content-type", "application/json");
        // 发送post请求
        String resultData = HttpUtils.sendPostWithJson(requestUrl, jsonString,headers);
        String resultData = HttpUtils.sendPostRequest(requestUrl, request);
        // 并接收返回结果
        System.out.println(resultData);
        return resultData;