上传备份

src/main/java/xyz/wbsite/jmacro/JMacro.java

@@ -153,7 +153,7 @@ public abstract class JMacro {
      * @param region 区域
      */
     public void mouseLeftClick(Region region) {
-        Mouse.move(new Location(region.getX(), region.getY()));
+        Mouse.move(region.getCenter());
         Mouse.at().click();
     }
 

src/main/java/xyz/wbsite/jmacro/JMainService.java

@@ -121,9 +121,9 @@ public class JMainService {
                 try {
                     macro.start();
                     if (index >= timesValue - 1) {
-                        Logger.info("第{}/{}次执行结束", index, timesValue);
+                        Logger.info("第{}/{}次执行结束", index + 1, timesValue);
                     } else {
-                        Logger.info("第{}/{}次执行结束，休眠{}秒", index, timesValue, intervalValue);
+                        Logger.info("第{}/{}次执行结束，休眠{}秒", index + 1, timesValue, intervalValue);
                         ThreadUtil.sleep(intervalValue * 1000L);
                     }
                 } catch (Exception e) {

src/main/java/xyz/wbsite/jmacro/JProp.java

@@ -1,7 +1,6 @@
 package xyz.wbsite.jmacro;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.json.JSONUtil;
 import cn.hutool.setting.dialect.Props;
 
 import java.io.File;

src/main/java/xyz/wbsite/jmacro/tool/PickLegend.java

@@ -21,7 +21,6 @@ import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.prefs.Preferences;
 
 /**

src/main/java/xyz/wbsite/jmacro/tool/PickRect.java

@@ -9,10 +9,19 @@ import xyz.wbsite.jmacro.util.Logger;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.*;
+import java.util.Map;
 
 /**
  * 采集区域

src/main/java/xyz/wbsite/jmacro/ui/FXMLUtil.java

@@ -1,7 +1,7 @@
 package xyz.wbsite.jmacro.ui;
 
-import xyz.wbsite.jmacro.util.ResourceUtil;
 import javafx.fxml.FXMLLoader;
+import xyz.wbsite.jmacro.util.ResourceUtil;
 
 import java.io.IOException;
 import java.net.URL;

src/main/java/xyz/wbsite/jmacro/util/DialogUtil.java

@@ -1,7 +1,6 @@
 package xyz.wbsite.jmacro.util;
 
 import cn.hutool.core.util.ClassUtil;
-import xyz.wbsite.jmacro.JMainApplication;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.application.Platform;
@@ -26,6 +25,7 @@ import javafx.scene.text.Font;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.util.Duration;
+import xyz.wbsite.jmacro.JMainApplication;
 
 import java.io.File;
 import java.util.Optional;

src/main/java/xyz/wbsite/jmacro/util/Logger.java

@@ -6,7 +6,6 @@ import cn.hutool.core.lang.caller.CallerUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.log.level.Level;
 import xyz.wbsite.jmacro.JMainApplication;
-import xyz.wbsite.jmacro.ex.MacroErrorException;
 
 /**
  * 日志记录器

src/main/java/xyz/wbsite/jmacro/util/TaskUtil.java

@@ -7,7 +7,16 @@ import cn.hutool.cron.CronUtil;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionService;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 /**
  * 任务/定时任务工具