修复内网处理的BUG

sync-in/src/main/java/com/jjt/in/service/impl/InProcessServiceImpl.java

@@ -86,22 +86,23 @@ public class InProcessServiceImpl extends InBaseService implements IInProcessSer
                 }
 
                 for (File file : files) {
-                    ObjectMapper mapper = new ObjectMapper();
-                    FileDesc desc = mapper.readValue(file, FileDesc.class);
                     //写入同步记录表
                     InSyncInfo syncInfo = new InSyncInfo();
-
-                    syncInfo.setSyncType(desc.getType().toString());
-                    syncInfo.setSyncFileName(desc.getName());
-                    File zipFile = new File(syncDir + desc.getName());
-                    String md5 = DigestUtils.md5Hex(Files.newInputStream(zipFile.toPath()));
-                    syncInfo.setSyncFileMd5(md5);
-                    syncInfo.setSyncFileSize(zipFile.length());
                     Date st = new Date();
-                    syncInfo.setCreateTime(st);
-                    if (md5.equals(desc.getMd5())) {
-                        syncInfo.setSyncValid("Y");
-                        try {
+
+                    try {
+                        ObjectMapper mapper = new ObjectMapper();
+                        FileDesc desc = mapper.readValue(file, FileDesc.class);
+                        syncInfo.setSyncType(desc.getType().toString());
+                        syncInfo.setSyncFileName(desc.getName());
+                        syncInfo.setCreateTime(st);
+
+                        File zipFile = new File(syncDir + desc.getName());
+                        String md5 = DigestUtils.md5Hex(Files.newInputStream(zipFile.toPath()));
+                        syncInfo.setSyncFileMd5(md5);
+                        syncInfo.setSyncFileSize(zipFile.length());
+                        if (md5.equals(desc.getMd5())) {
+                            syncInfo.setSyncValid("Y");
                             switch (desc.getType()) {
                                 case crontab:
                                     handleCrontabType(zipFile);
@@ -151,16 +152,16 @@ public class InProcessServiceImpl extends InBaseService implements IInProcessSer
                                     break;
                             }
                             syncInfo.setIsSucess("Y");
-                        } catch (Exception e) {
+                            //移动文件到备份目录
+                            Files.move(file.toPath(), Paths.get(bakDir + file.getName()), StandardCopyOption.REPLACE_EXISTING);
+                            Files.move(zipFile.toPath(), Paths.get(bakDir + zipFile.getName()), StandardCopyOption.REPLACE_EXISTING);
+                        } else {
+                            syncInfo.setSyncValid("N");
                             syncInfo.setIsSucess("N");
-                            syncInfo.setLogMsg(e.getMessage());
                         }
-                        //移动文件到备份目录
-                        Files.move(file.toPath(), Paths.get(bakDir + file.getName()), StandardCopyOption.REPLACE_EXISTING);
-                        Files.move(zipFile.toPath(), Paths.get(bakDir + zipFile.getName()), StandardCopyOption.REPLACE_EXISTING);
-                    } else {
-                        syncInfo.setSyncValid("N");
+                    } catch (Exception e) {
                         syncInfo.setIsSucess("N");
+                        syncInfo.setLogMsg(e.getMessage());
                     }
                     Date et = new Date();
                     syncInfo.setCostTime(et.getTime() - st.getTime());