From 534d0f8f9bccbbd31f2c25a9ff2fb352db8990ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=B6=E8=AE=AD?=
 <zhangjiaxun-xf@bestpay.com.cn>
Date: Mon, 8 Jun 2026 17:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E5=88=86=E5=8C=85?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workutils/{tool => }/ConsoleHelper.java        |  2 +-
 .../example/workutils/WorkUtilsApplication.java    |  6 +++---
 .../example/workutils/biz/git/menu/GitMenu.java    |  2 +-
 .../biz/mybatis/export/MyBatisExportService.java   |  2 +-
 .../biz/mybatis/menu/MyBatisGeneratorMenu.java     |  2 +-
 .../workutils/biz/mybatis/menu/MyBatisMenu.java    |  2 +-
 .../workutils/biz/output/OutputService.java        |  2 +-
 .../workutils/biz/output/menu/BatchMenu.java       |  2 +-
 .../workutils/biz/scanner/menu/ScanMenu.java       |  2 +-
 .../biz/scanner/service/FileOperationService.java  |  2 +-
 .../workutils/biz/scanner/service/ScanService.java |  2 +-
 .../{ => system}/config/WorkUtilsProperties.java   |  2 +-
 .../{menu/api => system/menu}/MenuRunner.java      |  8 ++++----
 .../workutils/{ => system}/tool/AbstractTool.java  |  3 ++-
 .../example/workutils/{ => system}/tool/Tool.java  |  2 +-
 .../workutils/{ => system}/tool/ToolRegistry.java  |  4 ++--
 src/main/resources/application.yml                 | 14 --------------
 17 files changed, 23 insertions(+), 36 deletions(-)
 rename src/main/java/com/example/workutils/{tool => }/ConsoleHelper.java (96%)
 rename src/main/java/com/example/workutils/{ => system}/config/WorkUtilsProperties.java (98%)
 rename src/main/java/com/example/workutils/{menu/api => system/menu}/MenuRunner.java (91%)
 rename src/main/java/com/example/workutils/{ => system}/tool/AbstractTool.java (96%)
 rename src/main/java/com/example/workutils/{ => system}/tool/Tool.java (96%)
 rename src/main/java/com/example/workutils/{ => system}/tool/ToolRegistry.java (97%)

diff --git a/src/main/java/com/example/workutils/tool/ConsoleHelper.java b/src/main/java/com/example/workutils/ConsoleHelper.java
similarity index 96%
rename from src/main/java/com/example/workutils/tool/ConsoleHelper.java
rename to src/main/java/com/example/workutils/ConsoleHelper.java
index fd8a902..330013e 100644
--- a/src/main/java/com/example/workutils/tool/ConsoleHelper.java
+++ b/src/main/java/com/example/workutils/ConsoleHelper.java
@@ -1,4 +1,4 @@
-package com.example.workutils.tool;
+package com.example.workutils;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/com/example/workutils/WorkUtilsApplication.java b/src/main/java/com/example/workutils/WorkUtilsApplication.java
index b24bd0b..a642777 100644
--- a/src/main/java/com/example/workutils/WorkUtilsApplication.java
+++ b/src/main/java/com/example/workutils/WorkUtilsApplication.java
@@ -1,8 +1,8 @@
 package com.example.workutils;
 
-import com.example.workutils.menu.api.MenuRunner;
-import com.example.workutils.tool.Tool;
-import com.example.workutils.tool.ToolRegistry;
+import com.example.workutils.system.menu.MenuRunner;
+import com.example.workutils.system.tool.Tool;
+import com.example.workutils.system.tool.ToolRegistry;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
diff --git a/src/main/java/com/example/workutils/biz/git/menu/GitMenu.java b/src/main/java/com/example/workutils/biz/git/menu/GitMenu.java
index 951b864..4ca5f9c 100644
--- a/src/main/java/com/example/workutils/biz/git/menu/GitMenu.java
+++ b/src/main/java/com/example/workutils/biz/git/menu/GitMenu.java
@@ -2,7 +2,7 @@ package com.example.workutils.biz.git.menu;
 
 import com.example.workutils.biz.git.service.GitService;
 import com.example.workutils.biz.git.util.GitCommandExecutor;
-import com.example.workutils.tool.AbstractTool;
+import com.example.workutils.system.tool.AbstractTool;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/example/workutils/biz/mybatis/export/MyBatisExportService.java b/src/main/java/com/example/workutils/biz/mybatis/export/MyBatisExportService.java
index faaf957..4a41536 100644
--- a/src/main/java/com/example/workutils/biz/mybatis/export/MyBatisExportService.java
+++ b/src/main/java/com/example/workutils/biz/mybatis/export/MyBatisExportService.java
@@ -1,7 +1,7 @@
 package com.example.workutils.biz.mybatis.export;
 
 import com.example.workutils.biz.scanner.config.ScanConfigBO;
-import com.example.workutils.config.WorkUtilsProperties;
+import com.example.workutils.system.config.WorkUtilsProperties;
 import com.example.workutils.biz.mybatis.model.MybatisTagBO;
 import com.example.workutils.biz.output.OutputService;
 import com.example.workutils.biz.scanner.service.FileOperationService;
diff --git a/src/main/java/com/example/workutils/biz/mybatis/menu/MyBatisGeneratorMenu.java b/src/main/java/com/example/workutils/biz/mybatis/menu/MyBatisGeneratorMenu.java
index 2010d76..da2a8ed 100644
--- a/src/main/java/com/example/workutils/biz/mybatis/menu/MyBatisGeneratorMenu.java
+++ b/src/main/java/com/example/workutils/biz/mybatis/menu/MyBatisGeneratorMenu.java
@@ -1,7 +1,7 @@
 package com.example.workutils.biz.mybatis.menu;
 
 import com.example.workutils.biz.mybatis.generator.MyBatisGeneratorService;
-import com.example.workutils.tool.AbstractTool;
+import com.example.workutils.system.tool.AbstractTool;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/example/workutils/biz/mybatis/menu/MyBatisMenu.java b/src/main/java/com/example/workutils/biz/mybatis/menu/MyBatisMenu.java
index d4ecf3c..79c1aca 100644
--- a/src/main/java/com/example/workutils/biz/mybatis/menu/MyBatisMenu.java
+++ b/src/main/java/com/example/workutils/biz/mybatis/menu/MyBatisMenu.java
@@ -1,7 +1,7 @@
 package com.example.workutils.biz.mybatis.menu;
 
 import com.example.workutils.biz.mybatis.export.MyBatisExportService;
-import com.example.workutils.tool.AbstractTool;
+import com.example.workutils.system.tool.AbstractTool;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/example/workutils/biz/output/OutputService.java b/src/main/java/com/example/workutils/biz/output/OutputService.java
index e9f8463..5f5b752 100644
--- a/src/main/java/com/example/workutils/biz/output/OutputService.java
+++ b/src/main/java/com/example/workutils/biz/output/OutputService.java
@@ -3,7 +3,7 @@ package com.example.workutils.biz.output;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
-import com.example.workutils.config.WorkUtilsProperties;
+import com.example.workutils.system.config.WorkUtilsProperties;
 import com.example.workutils.biz.scanner.service.FileOperationService;
 import com.opencsv.CSVWriter;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/example/workutils/biz/output/menu/BatchMenu.java b/src/main/java/com/example/workutils/biz/output/menu/BatchMenu.java
index 78c93a5..8580bfb 100644
--- a/src/main/java/com/example/workutils/biz/output/menu/BatchMenu.java
+++ b/src/main/java/com/example/workutils/biz/output/menu/BatchMenu.java
@@ -2,7 +2,7 @@ package com.example.workutils.biz.output.menu;
 
 import com.example.workutils.biz.mybatis.export.MyBatisExportService;
 import com.example.workutils.biz.scanner.service.ScanService;
-import com.example.workutils.tool.AbstractTool;
+import com.example.workutils.system.tool.AbstractTool;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/example/workutils/biz/scanner/menu/ScanMenu.java b/src/main/java/com/example/workutils/biz/scanner/menu/ScanMenu.java
index 08c3d4b..98b6917 100644
--- a/src/main/java/com/example/workutils/biz/scanner/menu/ScanMenu.java
+++ b/src/main/java/com/example/workutils/biz/scanner/menu/ScanMenu.java
@@ -1,7 +1,7 @@
 package com.example.workutils.biz.scanner.menu;
 
 import com.example.workutils.biz.scanner.service.ScanService;
-import com.example.workutils.tool.AbstractTool;
+import com.example.workutils.system.tool.AbstractTool;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/example/workutils/biz/scanner/service/FileOperationService.java b/src/main/java/com/example/workutils/biz/scanner/service/FileOperationService.java
index 351e8a2..ea0abba 100644
--- a/src/main/java/com/example/workutils/biz/scanner/service/FileOperationService.java
+++ b/src/main/java/com/example/workutils/biz/scanner/service/FileOperationService.java
@@ -1,7 +1,7 @@
 package com.example.workutils.biz.scanner.service;
 
 import com.example.workutils.biz.scanner.config.ScanConfigBO;
-import com.example.workutils.config.WorkUtilsProperties;
+import com.example.workutils.system.config.WorkUtilsProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/example/workutils/biz/scanner/service/ScanService.java b/src/main/java/com/example/workutils/biz/scanner/service/ScanService.java
index c30764b..a4a561b 100644
--- a/src/main/java/com/example/workutils/biz/scanner/service/ScanService.java
+++ b/src/main/java/com/example/workutils/biz/scanner/service/ScanService.java
@@ -1,7 +1,7 @@
 package com.example.workutils.biz.scanner.service;
 
 import com.example.workutils.biz.scanner.config.ScanConfigBO;
-import com.example.workutils.config.WorkUtilsProperties;
+import com.example.workutils.system.config.WorkUtilsProperties;
 import com.example.workutils.biz.output.OutputService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/example/workutils/config/WorkUtilsProperties.java b/src/main/java/com/example/workutils/system/config/WorkUtilsProperties.java
similarity index 98%
rename from src/main/java/com/example/workutils/config/WorkUtilsProperties.java
rename to src/main/java/com/example/workutils/system/config/WorkUtilsProperties.java
index 2fcf418..bf452a8 100644
--- a/src/main/java/com/example/workutils/config/WorkUtilsProperties.java
+++ b/src/main/java/com/example/workutils/system/config/WorkUtilsProperties.java
@@ -1,4 +1,4 @@
-package com.example.workutils.config;
+package com.example.workutils.system.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/src/main/java/com/example/workutils/menu/api/MenuRunner.java b/src/main/java/com/example/workutils/system/menu/MenuRunner.java
similarity index 91%
rename from src/main/java/com/example/workutils/menu/api/MenuRunner.java
rename to src/main/java/com/example/workutils/system/menu/MenuRunner.java
index d8b419a..56464e7 100644
--- a/src/main/java/com/example/workutils/menu/api/MenuRunner.java
+++ b/src/main/java/com/example/workutils/system/menu/MenuRunner.java
@@ -1,8 +1,8 @@
-package com.example.workutils.menu.api;
+package com.example.workutils.system.menu;
 
-import com.example.workutils.tool.ConsoleHelper;
-import com.example.workutils.tool.Tool;
-import com.example.workutils.tool.ToolRegistry;
+import com.example.workutils.ConsoleHelper;
+import com.example.workutils.system.tool.Tool;
+import com.example.workutils.system.tool.ToolRegistry;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/com/example/workutils/tool/AbstractTool.java b/src/main/java/com/example/workutils/system/tool/AbstractTool.java
similarity index 96%
rename from src/main/java/com/example/workutils/tool/AbstractTool.java
rename to src/main/java/com/example/workutils/system/tool/AbstractTool.java
index 7f8d219..3888bf0 100644
--- a/src/main/java/com/example/workutils/tool/AbstractTool.java
+++ b/src/main/java/com/example/workutils/system/tool/AbstractTool.java
@@ -1,5 +1,6 @@
-package com.example.workutils.tool;
+package com.example.workutils.system.tool;
 
+import com.example.workutils.ConsoleHelper;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Scanner;
diff --git a/src/main/java/com/example/workutils/tool/Tool.java b/src/main/java/com/example/workutils/system/tool/Tool.java
similarity index 96%
rename from src/main/java/com/example/workutils/tool/Tool.java
rename to src/main/java/com/example/workutils/system/tool/Tool.java
index 951bb9d..ba875af 100644
--- a/src/main/java/com/example/workutils/tool/Tool.java
+++ b/src/main/java/com/example/workutils/system/tool/Tool.java
@@ -1,4 +1,4 @@
-package com.example.workutils.tool;
+package com.example.workutils.system.tool;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/com/example/workutils/tool/ToolRegistry.java b/src/main/java/com/example/workutils/system/tool/ToolRegistry.java
similarity index 97%
rename from src/main/java/com/example/workutils/tool/ToolRegistry.java
rename to src/main/java/com/example/workutils/system/tool/ToolRegistry.java
index 5726b47..c216982 100644
--- a/src/main/java/com/example/workutils/tool/ToolRegistry.java
+++ b/src/main/java/com/example/workutils/system/tool/ToolRegistry.java
@@ -1,6 +1,6 @@
-package com.example.workutils.tool;
+package com.example.workutils.system.tool;
 
-import com.example.workutils.config.WorkUtilsProperties;
+import com.example.workutils.system.config.WorkUtilsProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ea5b702..e7a77cb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,20 +7,6 @@ workutils:
   config-directory: "src/main/resources/config"
   export-directory: "D:/workspace/workutils/export"
   project-paths-file: "代码仓库项目路径.txt"
-  # Tool enable/disable config
-  # Option 1: whitelist - only these tools are enabled
-  # tools:
-  #   enabled:
-  #     - scan
-  #     - mybatis
-  #     - batch
-  #     - git-health
-  #     - mybatis-generator
-  # Option 2: blacklist - exclude these tools
-  # tools:
-  #   disabled:
-  #     - mybatis-generator
-  # Default: all tools enabled
 
 logging:
   level: