Merge branch 'test' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into test

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java

@@ -40,7 +40,7 @@ public class EdFileInfoController {
         return edFileInfoService.delete(id);
     }
 
-//    @RequiredPermission(value = FilePermission.VIEW)
+    @RequiredPermission(value = FilePermission.VIEW)
     @RequestMapping("info")
     public ElectromagneticResult<?> info(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
         return edFileInfoService.queryEdFileInfo(fileInfoQueryDTO);

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java

@@ -412,7 +412,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         AES aes = SecureUtil.aes(FILE_SEC_PASSWD.getBytes());
         try (
                 InputStream inputStream = Files.newInputStream(Paths.get(destColibPath));
-                OutputStream outputStream = Files.newOutputStream(Paths.get(zipDirPath));
+                OutputStream outputStream = Files.newOutputStream(Paths.get(zipDirPath))
         ) {
             aes.decrypt(inputStream, outputStream, true);
         } catch (Exception e) {