From f4e9276a83370d5ad8187d291617f2a33131bc75 Mon Sep 17 00:00:00 2001
From: caoshd <cao-shd@outlook.com>
Date: Sat, 30 Mar 2024 16:03:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=20=E6=98=AF=E5=90=A6=E5=B0=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=90=8D=E4=BD=9C=E4=B8=BA=E5=9F=BA=E7=A1=80=E5=8C=85?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/space/caoshd/otone/util/CfgConsts.java   |  1 +
 .../java/space/caoshd/otone/util/PathUtils.java   | 15 +++++++++++----
 src/test/resources/config/config.properties       |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/space/caoshd/otone/util/CfgConsts.java b/src/main/java/space/caoshd/otone/util/CfgConsts.java
index 8b44723..fe5ffe2 100644
--- a/src/main/java/space/caoshd/otone/util/CfgConsts.java
+++ b/src/main/java/space/caoshd/otone/util/CfgConsts.java
@@ -27,6 +27,7 @@ public class CfgConsts {
 
     // 模块配置
     public static final String MODULE_MULTIPLE = "module.multiple";
+    public static final String MODULE_NAME_AS_PACKAGE_BASE = "module.name.as_package_base";
     public static final String MODULE_NAME_CONTROLLER = "module.name.controller";
     public static final String MODULE_NAME_SERVICE = "module.name.service";
     public static final String MODULE_NAME_REPOSITORY = "module.name.repository";
diff --git a/src/main/java/space/caoshd/otone/util/PathUtils.java b/src/main/java/space/caoshd/otone/util/PathUtils.java
index 22ea802..8d010d1 100644
--- a/src/main/java/space/caoshd/otone/util/PathUtils.java
+++ b/src/main/java/space/caoshd/otone/util/PathUtils.java
@@ -31,6 +31,10 @@ public class PathUtils {
         return CONFIG.getBoolean(CfgConsts.MODULE_MULTIPLE);
     }
 
+    public static boolean moduleNameAsPackageBase() {
+        return CONFIG.getBoolean(CfgConsts.MODULE_NAME_AS_PACKAGE_BASE);
+    }
+
     public static String getJavaPath(String moduleName) {
         String basePath = getProjectPath(moduleName);
         String configPath = CONFIG.getString(CfgConsts.PROJECT_PATH_JAVA);
@@ -47,7 +51,11 @@ public class PathUtils {
         String javaPath = getJavaPath(moduleName);
         String packageName = CONFIG.getString(CfgConsts.PACKAGE_NAME_BASE);
         String packagePath = packageToPath(packageName);
-        return Paths.get(javaPath, packagePath, moduleName).toString();
+        if (moduleNameAsPackageBase()) {
+            return Paths.get(javaPath, packagePath, moduleName).toString();
+        } else {
+            return Paths.get(javaPath, packagePath).toString();
+        }
     }
 
     public static String getPathBasedPackage(
@@ -55,11 +63,10 @@ public class PathUtils {
     ) {
         String basePath = getPackageBasePath(moduleName);
         String packageName = StrUtils.defaultIfBlank(configName, defaultName);
-        String path = packageToPath(packageName);
-        return Paths.get(basePath, path).toString();
+        String packagePath = packageToPath(packageName);
+        return Paths.get(basePath, packagePath).toString();
     }
 
-
     public static String getModuleName(String configModuleName, String defaultModuleName) {
         return isMultiModule() ? StrUtils.defaultIfBlank(configModuleName, defaultModuleName) : "";
     }
diff --git a/src/test/resources/config/config.properties b/src/test/resources/config/config.properties
index e8463a8..fc6c2da 100644
--- a/src/test/resources/config/config.properties
+++ b/src/test/resources/config/config.properties
@@ -13,6 +13,7 @@ package.name.view=controller.view
 package.name.controller=controller
 
 module.multiple=true
+module.name.as_package_base=false
 module.name.controller=controller
 module.name.repository=data
 module.name.service=cmpt