oss方法优化

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

@@ -117,7 +117,7 @@ public class AliyunCloudStorageService extends AbstractCloudStorageService {
         OSSClient client = getOssClient(privacyType);
         try {
             client.deleteObject(props.getAliyunBucketName(), objectName);
-            client.shutdown();
+            //client.shutdown();
         } catch (Exception e){
             return false;
         }
@@ -178,7 +178,7 @@ public class AliyunCloudStorageService extends AbstractCloudStorageService {
             downloadRes.getObjectMetadata();
 
             // 关闭OSSClient。
-            client.shutdown();
+            //client.shutdown();
         } catch (Exception e){
             throw new RenException(ModuleErrorCode.OSS_UPLOAD_FILE_ERROR, e, "");
         } catch (Throwable throwable) {

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

@@ -232,18 +232,17 @@ public class OssController {
 			throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getCode()
 					, EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getMsg());
 		}
+		long size = file.getSize();
 		if (ModuleConstant.FILE_CONTENT_TYPE_PDF.equals(file.getContentType())) {
-			// 校验文件体积,不超过5m
+			// 校验文件大小,不超过5m
 			long maxSize = 5 * 1024 * 1024;
-			long size = file.getSize();
 			if (size > maxSize) {
 				throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode()
 						, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
 			}
 		} else {
-			// 校验文件体积,不超过2m
+			// 校验文件大小,不超过2m
 			long maxSize = 2 * 1024 * 1024;
-			long size = file.getSize();
 			if (size > maxSize) {
 				throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode()
 						, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());

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

@@ -74,8 +74,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 			url = storageService.uploadSuffix(file.getBytes(), extension, privacy);
 			ossDomain = storageService.getOssDomain(privacy);
 		} catch (IOException e) {
-			e.printStackTrace();
+			logger.error("图片上传异常", e);
-			logger.error("图片上传异常");
 			throw new RenException("图片上传异常");
 
 		}
@@ -134,8 +133,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		try {
 			url = OssFactory.build().uploadSuffix(file.getBytes(), extension, PrivacyType.INTERNAL);
 		} catch (IOException e) {
-			e.printStackTrace();
+			logger.error("文件上传异常", e);
-			logger.error("文件上传异常");
 			throw new RenException("文件上传异常");
 		}
 		//保存文件信息
@@ -165,8 +163,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		try {
 			url = OssFactory.build().uploadSuffix(file.getBytes(), extension, null);
 		} catch (IOException e) {
-			e.printStackTrace();
+			logger.error("语音上传异常", e);
-			logger.error("语音上传异常");
 			throw new RenException("语音上传异常");
 
 		}