Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/FastDFSCloudStorageService.java

@@ -70,12 +70,13 @@ public class FastDFSCloudStorageService extends AbstractCloudStorageService {
      * 文件删除
      *
      * @param objectName
+     * @param privacyType
      * @return boolean
      * @author zhaoqifeng
      * @date 2021/3/30 11:05
      */
     @Override
-    public boolean delete(String objectName) {
+    public boolean delete(String objectName, String privacyType) {
         return false;
     }
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/LocalCloudStorageService.java

@@ -63,12 +63,13 @@ public class LocalCloudStorageService extends AbstractCloudStorageService {
      * 文件删除
      *
      * @param objectName
+     * @param privacyType
      * @return boolean
      * @author zhaoqifeng
      * @date 2021/3/30 11:05
      */
     @Override
-    public boolean delete(String objectName) {
+    public boolean delete(String objectName, String privacyType) {
         return false;
     }
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QcloudCloudStorageService.java

@@ -93,12 +93,13 @@ public class QcloudCloudStorageService extends AbstractCloudStorageService {
      * 文件删除
      *
      * @param objectName
+     * @param privacyType
      * @return boolean
      * @author zhaoqifeng
      * @date 2021/3/30 11:05
      */
     @Override
-    public boolean delete(String objectName) {
+    public boolean delete(String objectName, String privacyType) {
         return false;
     }
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QiniuCloudStorageService.java

@@ -87,12 +87,13 @@ public class QiniuCloudStorageService extends AbstractCloudStorageService {
      * 文件删除
      *
      * @param objectName
+     * @param privacyType
      * @return boolean
      * @author zhaoqifeng
      * @date 2021/3/30 11:05
      */
     @Override
-    public boolean delete(String objectName) {
+    public boolean delete(String objectName, String privacyType) {
         return false;
     }
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java

@@ -8,6 +8,7 @@
 
 package com.epmet.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.cloud.AbstractCloudStorageService;
@@ -192,6 +193,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 	 */
 	@Override
 	public boolean articleRemoveFile(RemoveFileFormDTO formDTO) {
+		logger.info("articleRemoveFile param:{}", JSON.toJSONString(formDTO));
 		String[] strings =  formDTO.getUrl().split(StrConstant.SEPARATOR);
 		String fileName = strings[strings.length - 1];
 		OssEntity entity = baseDao.selectByUrl(formDTO.getUrl());
@@ -206,6 +208,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		fileName =  StrConstant.SEPARATOR + dateStr + StrConstant.SEPARATOR + fileName;
 		String key = RedisKeys.getOssFileKey(formDTO.getUrl());
 		redisUtils.delete(key);
+		logger.info("articleRemoveFile oss delete fileName:{}", JSON.toJSONString(fileName));
 		return Objects.requireNonNull(OssFactory.build()).delete(fileName,null);
 	}