diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java index be8513438e..8a52849edf 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java @@ -257,7 +257,8 @@ public class OssController { if (path.startsWith(StrConstant.SEPARATOR)){ path = path.replaceFirst(StrConstant.SEPARATOR,StrConstant.EPMETY_STR); } - redisUtils.set(RedisKeys.getOssFileKey(path),path,RedisUtils.MINUTE_THIRTY_EXPIRE); + String fileName = data.getUrl().substring(data.getUrl().lastIndexOf(StrConstant.SEPARATOR)); + redisUtils.set(RedisKeys.getOssFileKey(fileName),path,RedisUtils.MINUTE_THIRTY_EXPIRE); } } return ossService.uploadImg(file, null); diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java index 83eeb2949d..21c82039e4 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.entity.OssEntity; import com.epmet.exception.ModuleErrorCode; import com.epmet.service.OssService; import org.apache.commons.io.FilenameUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -191,17 +192,23 @@ public class OssServiceImpl extends BaseServiceImpl implement @Override public boolean articleRemoveFile(RemoveFileFormDTO formDTO) { logger.info("articleRemoveFile param:{}", JSON.toJSONString(formDTO)); + if (StringUtils.isBlank(formDTO.getUrl())){ + logger.warn("articleRemoveFile param is empty"); + return false; + } + String key = RedisKeys.getOssFileKey(formDTO.getUrl().substring(formDTO.getUrl().lastIndexOf(StrConstant.SEPARATOR))); + Object o = redisUtils.get(key); + if (o == null){ + return false; + } + redisUtils.delete(key); AbstractCloudStorageService build = OssFactory.build(); String ossDomain = build.getOssDomain(null); String fileName = formDTO.getUrl().replace(ossDomain, StrConstant.EPMETY_STR); if (fileName.startsWith(StrConstant.SEPARATOR)){ fileName = fileName.replaceFirst(StrConstant.SEPARATOR,StrConstant.EPMETY_STR); } - String key = RedisKeys.getOssFileKey(fileName); - Object o = redisUtils.get(key); - if (o == null){ - //return false; - } + logger.info("articleRemoveFile oss delete fileName:{}", fileName); OssFactory.build().delete(fileName,null); OssEntity entity = baseDao.selectByUrl(formDTO.getUrl());