图片鉴定psd处理;截取帧数判断类型

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AlOssController.java

@@ -166,16 +166,18 @@ public class AlOssController {
             PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, uploadPath, fileNew);
             ossClient.putObject(putObjectRequest);
 
-            if (1 == buckType && !shumeiUtil.checkImage(IDGenerator.nextSnowId(), imgUrl.concat(uploadPath))) {
-                ossClient.deleteObject(bucketName, uploadPath);
-                return null;
+            if (contentType.contains("image") && !contentType.equals("image/vnd.adobe.photoshop")) {
+                if (!shumeiUtil.checkImage(IDGenerator.nextSnowId(), imgUrl.concat(uploadPath))) {
+                    ossClient.deleteObject(bucketName, uploadPath);
+                    return null;
+                }
             }
 
             if (resize > 0) { // 裁切
                 this.ossFileResize(resize, uploadPath, bucketName, ossClient);
             }
 
-            if (isCutFrame > 0) { // 截取帧数
+            if (isCutFrame > 0 && contentType.contains("video")) { // 截取帧数
                 ossFileVideoImg = this.ossFileCutFrame(uploadPath, pathName, buckType);
             }