恢复到以前

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

@@ -695,7 +695,7 @@ public class CommonService {
                 fileName,
                 destPath,
                 strategyStr,
-                finalEdFileInfo.getFileName() + "." + suffix);
+                Optional.ofNullable(finalEdFileInfo).map(EdFileInfo::getFileName).orElse("") + "." + suffix);
         return ElectromagneticResultUtil.success(Optional.ofNullable(finalEdFileInfo).map(EdFileInfo::getId).orElse(""));
     }
 

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

@@ -299,7 +299,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         String fileSysPath = commonService.getFileSysPath(id);
         String dbPath = commonService.getDbPath(fileInfo.getFilePath());
         try {
-            Assert.isTrue(FileUtil.exist(fileSysPath), "下载文件不存在，路径为 {}", dbPath);
+            Assert.isTrue(FileUtil.exist(fileSysPath), "下载文件不存在");
             FileSystemResource fileSystemResource = new FileSystemResource(fileSysPath);
             fileName = fileSystemResource.getFilename();
             HttpHeaders headers = new HttpHeaders();
@@ -1351,7 +1351,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         } catch (Exception e) {
             String info = StrFormatter.format("文件预览错误，文件id是--->{}，错误信息--->{}", id, e.getMessage());
             log.error(info, e);
-            throw new BizException(info);
+            throw new BizException("文件预览错误，文件id是 " + id);
         } finally {
             FileUtil.del(fileSaveTmpPath);
         }

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

@@ -94,7 +94,7 @@ public class FileTagRelationServiceImpl extends ServiceImpl<FileTagRelationMappe
 
             EdFileInfo fileInfo = edFileInfoMapper.selectById(fileId);
             String dbPath = commonService.getDbPath(fileInfo.getFilePath());
-            UserThreadLocal.setSuccessInfo(Optional.ofNullable(fileInfo).map(EdFileInfo::getParentId).orElse(""), fileId, "添加了标签 {} 到文件 {}", tags, dbPath);
+            UserThreadLocal.setSuccessInfo(Optional.of(fileInfo).map(EdFileInfo::getParentId).orElse(""), fileId, "添加了标签 {} 到文件 {}", tags, dbPath);
         }
         return isSuccess;
     }

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

@@ -155,11 +155,7 @@ public class PermissionServiceImpl implements PermissionService {
             allCodes = FilePermission.getAllCodesExcludeView();
         }
         for (String code : allCodes) {
-            if (permissionCodes.contains(code)) {
-                result.put(code, true);
-            } else {
-                result.put(code, false);
-            }
+            result.put(code, permissionCodes.contains(code));
         }
         return result;
     }

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java

@@ -245,7 +245,7 @@ public class BackupTask {
             }
 
             DateTime dateTime = DateUtil.offsetDay(DateUtil.date(), -1);
-            List<File> files = FileUtil.loopFiles(sqlScript, file -> file.lastModified() < dateTime.getTime());
+            List<File> files = FileUtil.loopFiles(elePropertyConfig.getSqlDirs(), file -> file.lastModified() < dateTime.getTime());
             files.forEach(file -> {
                 boolean deleteSuccess = file.delete();
                 String success = deleteSuccess ? "success" : "fail";
@@ -253,7 +253,6 @@ public class BackupTask {
                 log.info(msg);
             });
 
-
         } catch (Exception e) {
             log.warn("导出MySQL数据异常，原因 {}", e.getMessage(), e);
         }

electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java

@@ -98,7 +98,7 @@ public final class EleCommonUtil {
                 aes.decrypt(inputStream, outputStream, true);
             }
         } catch (Exception e) {
-            String info = "文件加密失败";
+            String info = "文件加/解密失败";
             log.error(info, e);
             throw new BizException(info);
         } finally {