附件加密处理7

code/base/nckd-jimin-base-helper/src/main/java/nckd/base/helper/CusFileServiceExt.java

@@ -17,26 +17,35 @@ public class CusFileServiceExt extends FilePathService implements FileServiceExt
     public InputStream encode(String originalPath, InputStream in) {
         logger.info("--------------SEC 附件加密 "+originalPath+"----------------");
 
-        long filesize = FileSECUtils.getFileSizeByPath(originalPath);
-        InputStream inForSEC = FileSECUtils.decodeFileForSEC(filesize,in);
-        if(inForSEC == null){
-            return in;
+        InputStream inForSEC = null;
+        int isEncryption = FileSECUtils.checkFileIsEncryptionRest(in);
+        if(isEncryption != 1){
+
+            long filesize = FileSECUtils.getFileSizeByPath(originalPath);
+            inForSEC = FileSECUtils.decodeFileForSEC(filesize,in);
+            if(inForSEC != null){
+                return inForSEC;
+            }
+        }else{
+            logger.info("--------------SEC 附件已加密 "+originalPath+"----------------");
         }
-        return inForSEC;
+        return in;
     }
 
     @Override
     public InputStream decode(String originalPath, InputStream in) {
         logger.info("--------------SEC 附件解密 "+originalPath+"----------------");
 
-        long filesize = FileSECUtils.getFileSizeByPath(originalPath);
-        InputStream inForSEC = FileSECUtils.decodeFileForSEC(filesize,in);
-
-        if(inForSEC == null){
-            return in;
+        InputStream inForSEC = null;
+        int isEncryption = FileSECUtils.checkFileIsEncryptionRest(in);
+        if(isEncryption == 1) {
+            long filesize = FileSECUtils.getFileSizeByPath(originalPath);
+            inForSEC = FileSECUtils.decodeFileForSEC(filesize, in);
+            if (inForSEC != null) {
+                return inForSEC;
+            }
         }
-
-        return inForSEC;
+        return in;
     }