优化代码

xwintop · xwintop · commit 8634146d9aca · 2020-01-08T14:56:14.000+08:00
diff --git a/src/main/java/com/xwintop/xJavaFxTool/services/littleTools/FileMergeToolService.java b/src/main/java/com/xwintop/xJavaFxTool/services/littleTools/FileMergeToolService.java
@@ -161,25 +161,27 @@ public void mergeCsv(List<File> fileList, String newFilePath) throws Exception {
 
     public void mergeFile(List<File> fileList, String newFilePath) throws Exception {
         File resultFile = new File(newFilePath);
-        FileChannel resultFileChannel = null;
+        FileOutputStream fileOutputStream = null;
         try {
-            resultFileChannel = new FileOutputStream(resultFile, true).getChannel();
+            fileOutputStream = new FileOutputStream(resultFile, true);
+            FileChannel resultFileChannel = fileOutputStream.getChannel();
             for (File file : fileList) {
-                FileChannel blk = null;
+                FileInputStream fileInputStream = null;
                 try {
-                    blk = new FileInputStream(file).getChannel();
+                    fileInputStream = new FileInputStream(file);
+                    FileChannel blk = fileInputStream.getChannel();
                     resultFileChannel.transferFrom(blk, resultFileChannel.size(), blk.size());
                 } finally {
-                    if (blk != null) {
-                        blk.close();
+                    if (fileInputStream != null) {
+                        fileInputStream.close();
                     }
                 }
             }
         } catch (Exception e) {
             log.error("合并文件失败：", e);
         } finally {
-            if (resultFileChannel != null) {
-                resultFileChannel.close();
+            if (fileOutputStream != null) {
+                fileOutputStream.close();
             }
         }
     }
diff --git a/src/main/java/com/xwintop/xTransfer/messaging/IMessage.java b/src/main/java/com/xwintop/xTransfer/messaging/IMessage.java
@@ -54,8 +54,6 @@ public interface IMessage extends Cloneable, Serializable {
 
     void setVersion(String var1);
 
-    Object clone() throws CloneNotSupportedException;
-
     void addFileNameFilterRegexGroup(String fileNameFilterRegexGroup);
 
     boolean checkFileNameFilterRegexGroup(String fileNameFilterRegexGroup);
diff --git a/src/main/resources/com/xwintop/xJavaFxTool/web/javaFxTools/ShowSystemInfo/diskInfohCharts.html b/src/main/resources/com/xwintop/xJavaFxTool/web/javaFxTools/ShowSystemInfo/diskInfohCharts.html
@@ -2,7 +2,6 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <!--<meta http-equiv="Access-Control-Allow-Origin" content="*">-->
     <title>硬盘存储展示</title>
     <script src="../../libs/highcharts.js"></script>
     <script src="../../libs/modules/sunburst.js"></script>
diff --git a/src/main/resources/com/xwintop/xJavaFxTool/web/littleTools/cron表达式详解.html b/src/main/resources/com/xwintop/xJavaFxTool/web/littleTools/cron表达式详解.html
@@ -3,6 +3,7 @@
 <html lang="zh-cn">
 <head>
     <meta charset="utf-8" />
+	<title>cron表达式详解</title>
 </head>
 <body>
 <div id="main">
diff --git a/src/main/resources/com/xwintop/xJavaFxTool/web/littleTools/正则表达式教程.html b/src/main/resources/com/xwintop/xJavaFxTool/web/littleTools/正则表达式教程.html
@@ -3,6 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta http-equiv="Content-Language" content="zh-CN"/>
+    <title>正则表达式教程</title>
     <style type="text/css">
         body {
             font-size: 100%;
diff --git a/src/main/resources/web/littleTools/cron/Cron/cron.js b/src/main/resources/web/littleTools/cron/Cron/cron.js
@@ -108,14 +108,14 @@ $(function() {
 
 		});
         //当前选中项之前的如果为*，则都设置成0
-		for (var i = currentIndex; i >= 1; i--) {
+		for (let i = currentIndex; i >= 1; i--) {
 		    if (item[i] != "*" && item[i - 1] == "*") {
 		        item[i - 1] = "0";
 		    }
 		}
 	    //当前选中项之后的如果不为*则都设置成*
 		if (item[currentIndex] == "*") {
-		    for (var i = currentIndex + 1; i < item.length; i++) {
+		    for (let i = currentIndex + 1; i < item.length; i++) {
 		        if (i == 5) {
 		            item[i] = "?";
 		        } else {
