Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -249,7 +249,6 @@ public class OssController {
 			}
 		}
 		Result<UploadImgResultDTO> result = ossService.uploadImg(file, null);
-		long start = System.currentTimeMillis();
 		if (result != null && result.success() ){
 			UploadImgResultDTO data = result.getData();
 			if ( data!= null && StringUtils.isNotBlank(data.getUrl())){
@@ -261,7 +260,6 @@ public class OssController {
 				redisUtils.set(RedisKeys.getOssFileKey(fileName),path,RedisUtils.MINUTE_THIRTY_EXPIRE);
 			}
 		}
-		log.info("service setRedis:{}",System.currentTimeMillis()-start);
 		return result;
 	}
 

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

@@ -69,14 +69,10 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		String extension = FilenameUtils.getExtension(file.getOriginalFilename());
 		String url = null;
 		String ossDomain = null;
-		long start = System.currentTimeMillis();
 		try {
 
 			AbstractCloudStorageService storageService = OssFactory.build();
-			logger.info("build service:{}",System.currentTimeMillis()-start);
-			start = System.currentTimeMillis();
 			url = storageService.uploadSuffix(file.getBytes(), extension, privacy);
-			logger.info("service uploadSuffix:{}",System.currentTimeMillis()-start);
 			ossDomain = storageService.getOssDomain(privacy);
 		} catch (IOException e) {
 			logger.error("图片上传异常", e);
@@ -87,9 +83,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		OssEntity ossEntity = new OssEntity();
 		ossEntity.setUrl(url);
 
-		start = System.currentTimeMillis();
 		baseDao.insert(ossEntity);
-		logger.info("service insert:{}",System.currentTimeMillis()-start);
 		//文件信息
 		UploadImgResultDTO dto = new UploadImgResultDTO();
 		dto.setUrl(url);