修复代码5

ipfcst-common/ipfcst-common-core/src/main/java/com/jiayue/ipfcst/common/core/util/CommonUtil.java

@@ -21,7 +21,6 @@ import java.util.zip.ZipOutputStream;
 public abstract class CommonUtil {
 
     private static final int BUFFER_SIZE = 2 * 1024;
-    public static Properties props = System.getProperties();
 
     /**
      * 获取随机数
@@ -90,28 +89,15 @@ public abstract class CommonUtil {
      * @throws RuntimeException 压缩失败会抛出运行时异常
      */
     public static void toZip(String srcDir, OutputStream out, boolean KeepDirStructure)
-            throws RuntimeException {
+            throws Exception {
 
         long start = System.currentTimeMillis();
-        ZipOutputStream zos = null;
-        try {
-            zos = new ZipOutputStream(out);
+        try(ZipOutputStream zos = new ZipOutputStream(out);){
             File sourceFile = new File(srcDir);
             compress(sourceFile, zos, sourceFile.getName(), KeepDirStructure);
             long end = System.currentTimeMillis();
-            System.out.println("压缩完成，耗时：" + (end - start) + " ms");
-        } catch (Exception e) {
-            throw new RuntimeException("zip error from ZipUtils", e);
-        } finally {
-            if (zos != null) {
-                try {
-                    zos.close();
-                } catch (IOException e) {
-                    log.error("系统错误", e);
-                }
-            }
+            log.info("压缩完成，耗时：" + (end - start) + " ms");
         }
-
     }
 
     /**
@@ -132,19 +118,11 @@ public abstract class CommonUtil {
             zos.putNextEntry(new ZipEntry(name));
             // copy文件到zip输出流中
             int len;
-            FileInputStream in = null;
-            try {
-                in = new FileInputStream(sourceFile);
+            try(FileInputStream in = new FileInputStream(sourceFile);){
                 while ((len = in.read(buf)) != -1) {
                     zos.write(buf, 0, len);
                 }
                 zos.closeEntry();
-            } catch (Exception e) {
-                e.printStackTrace();
-            } finally {
-                if (in != null) {
-                    in.close();
-                }
             }
         } else {
             File[] listFiles = sourceFile.listFiles();

ipfcst-common/ipfcst-common-security/src/main/java/com/jiayue/ipfcst/common/security/util/JwtTokenUtil.java

@@ -49,8 +49,7 @@ public class JwtTokenUtil {
         try {
             claims = Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody();
         } catch (Exception e) {
-            e.printStackTrace();
-            claims = null;
+            return null;
         }
         return claims;
     }

ipfcst-console/src/main/java/com/jiayue/ipfcst/ConsoleApplication.java

@@ -38,9 +38,9 @@ import java.util.Properties;
 public class ConsoleApplication {
 
     private final Environment environment;
-    @Qualifier("dataSource")
-    @Autowired
-    private DataSource dataSource;
+//    @Qualifier("dataSource")
+//    @Autowired
+//    private DataSource dataSource;
 
     @Autowired
     public ConsoleApplication(Environment environment) {
@@ -66,7 +66,7 @@ public class ConsoleApplication {
     @Bean
     public SchedulerFactoryBean schedulerFactoryBean(
             PlatformTransactionManager transactionManager, ApplicationContext applicationContext,
-            QuartzJobFactory quartzJobFactory) throws Exception {
+            QuartzJobFactory quartzJobFactory,DataSource dataSource) throws Exception {
         SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean();
         schedulerFactoryBean.setDataSource(dataSource);
         schedulerFactoryBean.setTransactionManager(transactionManager);

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadFileLogController.java

@@ -23,6 +23,8 @@ public class UploadFileLogController {
 
   private final UploadFileLogService uploadFileLogService;
 
+  static String MESSAGE = "message";
+
   @Autowired
   public UploadFileLogController(UploadFileLogService uploadFileLogService) {
     this.uploadFileLogService = uploadFileLogService;
@@ -50,7 +52,7 @@ public class UploadFileLogController {
     for (FileStatusEnum fileStatusEnum : FileStatusEnum.values()) {
       Map<String, String> map = new HashMap<>();
       map.put("name", fileStatusEnum.name());
-      map.put("message", fileStatusEnum.getMessage());
+      map.put(MESSAGE, fileStatusEnum.getMessage());
       list.add(map);
     }
     return ResponseVO.success(list);
@@ -62,7 +64,7 @@ public class UploadFileLogController {
     for (UploadProtocolEnum uploadProtocolEnum : UploadProtocolEnum.values()) {
       Map<String, String> map = new HashMap<>();
       map.put("name", uploadProtocolEnum.name());
-      map.put("message", uploadProtocolEnum.getMessage());
+      map.put(MESSAGE, uploadProtocolEnum.getMessage());
       list.add(map);
     }
     return ResponseVO.success(list);
@@ -74,7 +76,7 @@ public class UploadFileLogController {
     for (FileTypeEnum fileTypeEnum : FileTypeEnum.values()) {
       Map<String, String> map = new HashMap<>();
       map.put("name", fileTypeEnum.name());
-      map.put("message", fileTypeEnum.getMessage());
+      map.put(MESSAGE, fileTypeEnum.getMessage());
       list.add(map);
     }
     return ResponseVO.success(list);

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/FtpUploadTransactionService.java

@@ -34,8 +34,6 @@ import java.util.stream.Collectors;
 @Service
 public class FtpUploadTransactionService extends BaseUploadFileService {
   @Autowired
-  UploadFileLogRepository uploadFileLogRepository;
-  @Autowired
   UploadFileLogDetailRepository uploadFileLogDetailRepository;