diff --git a/src/main/java/com/example/workutils/biz/batch/BatchTool.java b/src/main/java/com/example/workutils/biz/batch/BatchTool.java index 5c7ebfb..1f94049 100644 --- a/src/main/java/com/example/workutils/biz/batch/BatchTool.java +++ b/src/main/java/com/example/workutils/biz/batch/BatchTool.java @@ -1,7 +1,7 @@ package com.example.workutils.biz.batch; -import com.example.workutils.biz.mybatis.MyBatisExportService; -import com.example.workutils.biz.scanner.ScannerService; +import com.example.workutils.biz.mybatis.service.MyBatisExportService; +import com.example.workutils.biz.scanner.service.ScannerService; import com.example.workutils.system.tool.Tool; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/git/GitTool.java b/src/main/java/com/example/workutils/biz/git/GitTool.java index ec47d25..a799be0 100644 --- a/src/main/java/com/example/workutils/biz/git/GitTool.java +++ b/src/main/java/com/example/workutils/biz/git/GitTool.java @@ -1,6 +1,7 @@ package com.example.workutils.biz.git; -import com.example.workutils.biz.git.internal.GitCommandExecutor; +import com.example.workutils.biz.git.service.GitService; +import com.example.workutils.biz.git.service.internal.GitCommandExecutor; import com.example.workutils.system.tool.Tool; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/git/GitService.java b/src/main/java/com/example/workutils/biz/git/service/GitService.java similarity index 80% rename from src/main/java/com/example/workutils/biz/git/GitService.java rename to src/main/java/com/example/workutils/biz/git/service/GitService.java index 848623f..98c7f21 100644 --- a/src/main/java/com/example/workutils/biz/git/GitService.java +++ b/src/main/java/com/example/workutils/biz/git/service/GitService.java @@ -1,6 +1,6 @@ -package com.example.workutils.biz.git; +package com.example.workutils.biz.git.service; -import com.example.workutils.biz.git.internal.GitCommandExecutor; +import com.example.workutils.biz.git.service.internal.GitCommandExecutor; import java.util.List; import java.util.Scanner; diff --git a/src/main/java/com/example/workutils/biz/git/GitServiceImpl.java b/src/main/java/com/example/workutils/biz/git/service/GitServiceImpl.java similarity index 95% rename from src/main/java/com/example/workutils/biz/git/GitServiceImpl.java rename to src/main/java/com/example/workutils/biz/git/service/GitServiceImpl.java index 7492441..1b5f578 100644 --- a/src/main/java/com/example/workutils/biz/git/GitServiceImpl.java +++ b/src/main/java/com/example/workutils/biz/git/service/GitServiceImpl.java @@ -1,8 +1,8 @@ -package com.example.workutils.biz.git; +package com.example.workutils.biz.git.service; -import com.example.workutils.biz.git.internal.GitCommandExecutor; -import com.example.workutils.biz.git.internal.strategy.GitStrategyFactory; -import com.example.workutils.biz.git.model.GitCommand; +import com.example.workutils.biz.git.service.internal.GitCommandExecutor; +import com.example.workutils.biz.git.service.internal.strategy.GitStrategyFactory; +import com.example.workutils.biz.git.service.model.GitCommand; import com.example.workutils.system.support.FileOperationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/git/config/GitOptimizationConfig.java b/src/main/java/com/example/workutils/biz/git/service/config/GitOptimizationConfig.java similarity index 99% rename from src/main/java/com/example/workutils/biz/git/config/GitOptimizationConfig.java rename to src/main/java/com/example/workutils/biz/git/service/config/GitOptimizationConfig.java index cf893a1..ccd382a 100644 --- a/src/main/java/com/example/workutils/biz/git/config/GitOptimizationConfig.java +++ b/src/main/java/com/example/workutils/biz/git/service/config/GitOptimizationConfig.java @@ -1,4 +1,4 @@ -package com.example.workutils.biz.git.config; +package com.example.workutils.biz.git.service.config; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/git/internal/GitCommandController.java b/src/main/java/com/example/workutils/biz/git/service/internal/GitCommandController.java similarity index 99% rename from src/main/java/com/example/workutils/biz/git/internal/GitCommandController.java rename to src/main/java/com/example/workutils/biz/git/service/internal/GitCommandController.java index 95027bf..2634cc5 100644 --- a/src/main/java/com/example/workutils/biz/git/internal/GitCommandController.java +++ b/src/main/java/com/example/workutils/biz/git/service/internal/GitCommandController.java @@ -1,4 +1,4 @@ -package com.example.workutils.biz.git.internal; +package com.example.workutils.biz.git.service.internal; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/git/internal/GitCommandExecutor.java b/src/main/java/com/example/workutils/biz/git/service/internal/GitCommandExecutor.java similarity index 99% rename from src/main/java/com/example/workutils/biz/git/internal/GitCommandExecutor.java rename to src/main/java/com/example/workutils/biz/git/service/internal/GitCommandExecutor.java index 5bbfc21..74f6713 100644 --- a/src/main/java/com/example/workutils/biz/git/internal/GitCommandExecutor.java +++ b/src/main/java/com/example/workutils/biz/git/service/internal/GitCommandExecutor.java @@ -1,4 +1,4 @@ -package com.example.workutils.biz.git.internal; +package com.example.workutils.biz.git.service.internal; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/git/internal/GitRepositoryManager.java b/src/main/java/com/example/workutils/biz/git/service/internal/GitRepositoryManager.java similarity index 99% rename from src/main/java/com/example/workutils/biz/git/internal/GitRepositoryManager.java rename to src/main/java/com/example/workutils/biz/git/service/internal/GitRepositoryManager.java index fc8f016..5e8e3d8 100644 --- a/src/main/java/com/example/workutils/biz/git/internal/GitRepositoryManager.java +++ b/src/main/java/com/example/workutils/biz/git/service/internal/GitRepositoryManager.java @@ -1,4 +1,4 @@ -package com.example.workutils.biz.git.internal; +package com.example.workutils.biz.git.service.internal; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/git/internal/GitResultCache.java b/src/main/java/com/example/workutils/biz/git/service/internal/GitResultCache.java similarity index 99% rename from src/main/java/com/example/workutils/biz/git/internal/GitResultCache.java rename to src/main/java/com/example/workutils/biz/git/service/internal/GitResultCache.java index e71d219..b8438a6 100644 --- a/src/main/java/com/example/workutils/biz/git/internal/GitResultCache.java +++ b/src/main/java/com/example/workutils/biz/git/service/internal/GitResultCache.java @@ -1,4 +1,4 @@ -package com.example.workutils.biz.git.internal; +package com.example.workutils.biz.git.service.internal; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/git/internal/strategy/CheckBranchChangesStrategy.java b/src/main/java/com/example/workutils/biz/git/service/internal/strategy/CheckBranchChangesStrategy.java similarity index 94% rename from src/main/java/com/example/workutils/biz/git/internal/strategy/CheckBranchChangesStrategy.java rename to src/main/java/com/example/workutils/biz/git/service/internal/strategy/CheckBranchChangesStrategy.java index 10a2605..8f633eb 100644 --- a/src/main/java/com/example/workutils/biz/git/internal/strategy/CheckBranchChangesStrategy.java +++ b/src/main/java/com/example/workutils/biz/git/service/internal/strategy/CheckBranchChangesStrategy.java @@ -1,8 +1,8 @@ -package com.example.workutils.biz.git.internal.strategy; +package com.example.workutils.biz.git.service.internal.strategy; -import com.example.workutils.biz.git.internal.GitCommandExecutor; -import com.example.workutils.biz.git.internal.GitRepositoryManager; -import com.example.workutils.biz.git.model.GitCommand; +import com.example.workutils.biz.git.service.internal.GitCommandExecutor; +import com.example.workutils.biz.git.service.internal.GitRepositoryManager; +import com.example.workutils.biz.git.service.model.GitCommand; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/example/workutils/biz/git/internal/strategy/CheckoutAndPullStrategy.java b/src/main/java/com/example/workutils/biz/git/service/internal/strategy/CheckoutAndPullStrategy.java similarity index 95% rename from src/main/java/com/example/workutils/biz/git/internal/strategy/CheckoutAndPullStrategy.java rename to src/main/java/com/example/workutils/biz/git/service/internal/strategy/CheckoutAndPullStrategy.java index acf3bee..a04190a 100644 --- a/src/main/java/com/example/workutils/biz/git/internal/strategy/CheckoutAndPullStrategy.java +++ b/src/main/java/com/example/workutils/biz/git/service/internal/strategy/CheckoutAndPullStrategy.java @@ -1,8 +1,8 @@ -package com.example.workutils.biz.git.internal.strategy; +package com.example.workutils.biz.git.service.internal.strategy; -import com.example.workutils.biz.git.internal.GitCommandExecutor; -import com.example.workutils.biz.git.internal.GitRepositoryManager; -import com.example.workutils.biz.git.model.GitCommand; +import com.example.workutils.biz.git.service.internal.GitCommandExecutor; +import com.example.workutils.biz.git.service.internal.GitRepositoryManager; +import com.example.workutils.biz.git.service.model.GitCommand; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/example/workutils/biz/git/internal/strategy/GitCommandStrategy.java b/src/main/java/com/example/workutils/biz/git/service/internal/strategy/GitCommandStrategy.java similarity index 58% rename from src/main/java/com/example/workutils/biz/git/internal/strategy/GitCommandStrategy.java rename to src/main/java/com/example/workutils/biz/git/service/internal/strategy/GitCommandStrategy.java index e7b065b..b581150 100644 --- a/src/main/java/com/example/workutils/biz/git/internal/strategy/GitCommandStrategy.java +++ b/src/main/java/com/example/workutils/biz/git/service/internal/strategy/GitCommandStrategy.java @@ -1,6 +1,6 @@ -package com.example.workutils.biz.git.internal.strategy; +package com.example.workutils.biz.git.service.internal.strategy; -import com.example.workutils.biz.git.model.GitCommand; +import com.example.workutils.biz.git.service.model.GitCommand; /** * Git 命令策略接口 diff --git a/src/main/java/com/example/workutils/biz/git/internal/strategy/GitStrategyFactory.java b/src/main/java/com/example/workutils/biz/git/service/internal/strategy/GitStrategyFactory.java similarity index 92% rename from src/main/java/com/example/workutils/biz/git/internal/strategy/GitStrategyFactory.java rename to src/main/java/com/example/workutils/biz/git/service/internal/strategy/GitStrategyFactory.java index a1121af..888dbc4 100644 --- a/src/main/java/com/example/workutils/biz/git/internal/strategy/GitStrategyFactory.java +++ b/src/main/java/com/example/workutils/biz/git/service/internal/strategy/GitStrategyFactory.java @@ -1,6 +1,6 @@ -package com.example.workutils.biz.git.internal.strategy; +package com.example.workutils.biz.git.service.internal.strategy; -import com.example.workutils.biz.git.model.GitCommand; +import com.example.workutils.biz.git.service.model.GitCommand; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/example/workutils/biz/git/model/GitCommand.java b/src/main/java/com/example/workutils/biz/git/service/model/GitCommand.java similarity index 97% rename from src/main/java/com/example/workutils/biz/git/model/GitCommand.java rename to src/main/java/com/example/workutils/biz/git/service/model/GitCommand.java index a001ddb..42aa8b2 100644 --- a/src/main/java/com/example/workutils/biz/git/model/GitCommand.java +++ b/src/main/java/com/example/workutils/biz/git/service/model/GitCommand.java @@ -1,4 +1,4 @@ -package com.example.workutils.biz.git.model; +package com.example.workutils.biz.git.service.model; import lombok.Data; diff --git a/src/main/java/com/example/workutils/biz/mybatis/MyBatisExportTool.java b/src/main/java/com/example/workutils/biz/mybatis/MyBatisExportTool.java index 8cba9df..17b5fb9 100644 --- a/src/main/java/com/example/workutils/biz/mybatis/MyBatisExportTool.java +++ b/src/main/java/com/example/workutils/biz/mybatis/MyBatisExportTool.java @@ -1,5 +1,6 @@ package com.example.workutils.biz.mybatis; +import com.example.workutils.biz.mybatis.service.MyBatisExportService; import com.example.workutils.system.tool.Tool; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/mybatis/MyBatisGeneratorTool.java b/src/main/java/com/example/workutils/biz/mybatis/MyBatisGeneratorTool.java index 685cfb6..567cd17 100644 --- a/src/main/java/com/example/workutils/biz/mybatis/MyBatisGeneratorTool.java +++ b/src/main/java/com/example/workutils/biz/mybatis/MyBatisGeneratorTool.java @@ -1,6 +1,6 @@ package com.example.workutils.biz.mybatis; -import com.example.workutils.biz.mybatis.generator.MyBatisGeneratorService; +import com.example.workutils.biz.mybatis.service.generator.MyBatisGeneratorService; import com.example.workutils.system.tool.Tool; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/mybatis/MyBatisExportService.java b/src/main/java/com/example/workutils/biz/mybatis/service/MyBatisExportService.java similarity index 98% rename from src/main/java/com/example/workutils/biz/mybatis/MyBatisExportService.java rename to src/main/java/com/example/workutils/biz/mybatis/service/MyBatisExportService.java index f78fece..4fc822b 100644 --- a/src/main/java/com/example/workutils/biz/mybatis/MyBatisExportService.java +++ b/src/main/java/com/example/workutils/biz/mybatis/service/MyBatisExportService.java @@ -1,7 +1,7 @@ -package com.example.workutils.biz.mybatis; +package com.example.workutils.biz.mybatis.service; -import com.example.workutils.biz.mybatis.model.MybatisTag; -import com.example.workutils.biz.scanner.config.ScanConfig; +import com.example.workutils.biz.mybatis.service.model.MybatisTag; +import com.example.workutils.biz.scanner.service.config.ScanConfig; import com.example.workutils.system.support.FileOperationService; import com.example.workutils.system.support.OutputService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/mybatis/generator/CustomCommentGenerator.java b/src/main/java/com/example/workutils/biz/mybatis/service/generator/CustomCommentGenerator.java similarity index 99% rename from src/main/java/com/example/workutils/biz/mybatis/generator/CustomCommentGenerator.java rename to src/main/java/com/example/workutils/biz/mybatis/service/generator/CustomCommentGenerator.java index 8f5a5d2..be93162 100644 --- a/src/main/java/com/example/workutils/biz/mybatis/generator/CustomCommentGenerator.java +++ b/src/main/java/com/example/workutils/biz/mybatis/service/generator/CustomCommentGenerator.java @@ -1,4 +1,4 @@ -package com.example.workutils.biz.mybatis.generator; +package com.example.workutils.biz.mybatis.service.generator; import org.mybatis.generator.api.CommentGenerator; import org.mybatis.generator.api.IntrospectedColumn; diff --git a/src/main/java/com/example/workutils/biz/mybatis/generator/LombokPlugin.java b/src/main/java/com/example/workutils/biz/mybatis/service/generator/LombokPlugin.java similarity index 94% rename from src/main/java/com/example/workutils/biz/mybatis/generator/LombokPlugin.java rename to src/main/java/com/example/workutils/biz/mybatis/service/generator/LombokPlugin.java index 884d9d7..6826af5 100644 --- a/src/main/java/com/example/workutils/biz/mybatis/generator/LombokPlugin.java +++ b/src/main/java/com/example/workutils/biz/mybatis/service/generator/LombokPlugin.java @@ -1,10 +1,9 @@ -package com.example.workutils.biz.mybatis.generator; +package com.example.workutils.biz.mybatis.service.generator; import org.mybatis.generator.api.IntrospectedColumn; import org.mybatis.generator.api.IntrospectedTable; import org.mybatis.generator.api.PluginAdapter; import org.mybatis.generator.api.dom.java.FullyQualifiedJavaType; -import org.mybatis.generator.api.dom.java.Interface; import org.mybatis.generator.api.dom.java.Method; import org.mybatis.generator.api.dom.java.TopLevelClass; diff --git a/src/main/java/com/example/workutils/biz/mybatis/generator/MyBatisGeneratorService.java b/src/main/java/com/example/workutils/biz/mybatis/service/generator/MyBatisGeneratorService.java similarity index 99% rename from src/main/java/com/example/workutils/biz/mybatis/generator/MyBatisGeneratorService.java rename to src/main/java/com/example/workutils/biz/mybatis/service/generator/MyBatisGeneratorService.java index 8dae10b..c036cd7 100644 --- a/src/main/java/com/example/workutils/biz/mybatis/generator/MyBatisGeneratorService.java +++ b/src/main/java/com/example/workutils/biz/mybatis/service/generator/MyBatisGeneratorService.java @@ -1,4 +1,4 @@ -package com.example.workutils.biz.mybatis.generator; +package com.example.workutils.biz.mybatis.service.generator; import lombok.extern.slf4j.Slf4j; import org.mybatis.generator.api.MyBatisGenerator; @@ -13,7 +13,6 @@ import java.sql.*; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import java.util.regex.Pattern; /** * MyBatis逆向工程服务 diff --git a/src/main/java/com/example/workutils/biz/mybatis/generator/SelectiveOnlyPlugin.java b/src/main/java/com/example/workutils/biz/mybatis/service/generator/SelectiveOnlyPlugin.java similarity index 97% rename from src/main/java/com/example/workutils/biz/mybatis/generator/SelectiveOnlyPlugin.java rename to src/main/java/com/example/workutils/biz/mybatis/service/generator/SelectiveOnlyPlugin.java index d54728d..0737d9f 100644 --- a/src/main/java/com/example/workutils/biz/mybatis/generator/SelectiveOnlyPlugin.java +++ b/src/main/java/com/example/workutils/biz/mybatis/service/generator/SelectiveOnlyPlugin.java @@ -1,4 +1,4 @@ -package com.example.workutils.biz.mybatis.generator; +package com.example.workutils.biz.mybatis.service.generator; import org.mybatis.generator.api.IntrospectedTable; import org.mybatis.generator.api.PluginAdapter; diff --git a/src/main/java/com/example/workutils/biz/mybatis/model/MybatisTag.java b/src/main/java/com/example/workutils/biz/mybatis/service/model/MybatisTag.java similarity index 86% rename from src/main/java/com/example/workutils/biz/mybatis/model/MybatisTag.java rename to src/main/java/com/example/workutils/biz/mybatis/service/model/MybatisTag.java index 93d4f90..cdb5476 100644 --- a/src/main/java/com/example/workutils/biz/mybatis/model/MybatisTag.java +++ b/src/main/java/com/example/workutils/biz/mybatis/service/model/MybatisTag.java @@ -1,4 +1,4 @@ -package com.example.workutils.biz.mybatis.model; +package com.example.workutils.biz.mybatis.service.model; import lombok.Data; diff --git a/src/main/java/com/example/workutils/biz/scanner/ScannerTool.java b/src/main/java/com/example/workutils/biz/scanner/ScannerTool.java index a9aa8b0..4588b24 100644 --- a/src/main/java/com/example/workutils/biz/scanner/ScannerTool.java +++ b/src/main/java/com/example/workutils/biz/scanner/ScannerTool.java @@ -1,5 +1,6 @@ package com.example.workutils.biz.scanner; +import com.example.workutils.biz.scanner.service.ScannerService; import com.example.workutils.system.tool.Tool; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/workutils/biz/scanner/ScannerService.java b/src/main/java/com/example/workutils/biz/scanner/service/ScannerService.java similarity index 98% rename from src/main/java/com/example/workutils/biz/scanner/ScannerService.java rename to src/main/java/com/example/workutils/biz/scanner/service/ScannerService.java index 0ea3e6f..93e4951 100644 --- a/src/main/java/com/example/workutils/biz/scanner/ScannerService.java +++ b/src/main/java/com/example/workutils/biz/scanner/service/ScannerService.java @@ -1,6 +1,6 @@ -package com.example.workutils.biz.scanner; +package com.example.workutils.biz.scanner.service; -import com.example.workutils.biz.scanner.config.ScanConfig; +import com.example.workutils.biz.scanner.service.config.ScanConfig; import com.example.workutils.system.config.WorkUtilsProperties; import com.example.workutils.system.support.FileOperationService; import com.example.workutils.system.support.OutputService; diff --git a/src/main/java/com/example/workutils/biz/scanner/config/ScanConfig.java b/src/main/java/com/example/workutils/biz/scanner/service/config/ScanConfig.java similarity index 94% rename from src/main/java/com/example/workutils/biz/scanner/config/ScanConfig.java rename to src/main/java/com/example/workutils/biz/scanner/service/config/ScanConfig.java index eb89812..9750fc5 100644 --- a/src/main/java/com/example/workutils/biz/scanner/config/ScanConfig.java +++ b/src/main/java/com/example/workutils/biz/scanner/service/config/ScanConfig.java @@ -1,4 +1,4 @@ -package com.example.workutils.biz.scanner.config; +package com.example.workutils.biz.scanner.service.config; import lombok.Data; diff --git a/src/main/java/com/example/workutils/system/support/FileOperationService.java b/src/main/java/com/example/workutils/system/support/FileOperationService.java index f7aaa9b..fe62257 100644 --- a/src/main/java/com/example/workutils/system/support/FileOperationService.java +++ b/src/main/java/com/example/workutils/system/support/FileOperationService.java @@ -1,6 +1,6 @@ package com.example.workutils.system.support; -import com.example.workutils.biz.scanner.config.ScanConfig; +import com.example.workutils.biz.scanner.service.config.ScanConfig; import com.example.workutils.system.config.WorkUtilsProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/resources/mybatis-generator.xml b/src/main/resources/mybatis-generator.xml index a2ca490..41de758 100644 --- a/src/main/resources/mybatis-generator.xml +++ b/src/main/resources/mybatis-generator.xml @@ -12,11 +12,11 @@ - + - + - +