From 6d381b31dae176b3543376adc4d0da9d7cfbf1ce Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 8 Oct 2024 14:07:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=B8=A6=E5=87=8F=E5=8F=B7=E7=9A=84=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=90=8D=E7=94=9F=E6=88=90=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=92=8C=E5=BE=AE=E6=9C=8D=E5=8A=A1=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/modules/gen/module/src/main/java/package.xml  | 2 +-
 .../gen/module/src/main/resources/config/jeesite.xml        | 2 +-
 .../modules/gen/module/src/main/resources/static/static.xml | 2 +-
 .../gen/module_cloud/client/src/main/java/package.xml       | 2 +-
 .../templates/modules/gen/module_cloud/web/pom.xml          | 6 +++---
 .../modules/gen/module_cloud/web/src/main/java/package.xml  | 2 +-
 .../module_cloud/web/src/main/resources/static/static.xml   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml
index cc9f98c3..fce4f31d 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/src/main/java/com/jeesite/modules/${moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml
index d6b8a0fc..2476a20e 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml
@@ -8,7 +8,7 @@
 	<content><![CDATA[
 # 温馨提示：不建议直接修改此文件，为了平台升级方便，建议将需要修改的参数值，复制到application.yml里进行覆盖该参数值。
 
-#${moduleCode}:
+#${@StringUtils.camelCase(moduleCode)}:
 #  enabled: true
 
 ]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml
index 2aad66bb..94362aea 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>static</name>
-	<filePath>${baseDir}/${moduleCode}/src/main/resources/static/modules/${moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/src/main/resources/static/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml
index 6c634e0c..3311713a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/src/main/java/com/jeesite/modules/${moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
index 652681fd..a19315a6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
@@ -21,15 +21,15 @@
 	<artifactId>jeesite-cloud-module-${moduleCode}-web</artifactId>
 	<packaging>war</packaging>
 	
-	<name>JeeSite Cloud Module ${moduleName} Web</name>
+	<name>JeeSite Cloud Module ${@StringUtils.capCamelCase(moduleCode)} Web</name>
 	<url>http://jeesite.com</url>
 	<inceptionYear>2013-Now</inceptionYear>
 	
 	<properties>
 		
 		<finalName>web</finalName><!-- war包的名称 -->
-		<start-class>com.jeesite.modules.${@StringUtils.cap(module.moduleCode)}Application</start-class>
-		
+		<start-class>com.jeesite.modules.${@StringUtils.capCamelCase(moduleCode)}Application</start-class>
+
 		<!-- docker setting -->
 		<docker.run.port>8989:8989</docker.run.port>
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/package.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/package.xml
index 34bd9413..be5207c6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/package.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/package.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/java/com/jeesite/modules/${moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml
index 7910a000..d46ba518 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>static</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/static/modules/${moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/static/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[