From 45b2c6ae95e8969f8f86de06b47db12b1be3896d Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 31 Dec 2021 12:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=89=8D=E7=AB=AF=E7=94=9F=E6=88=90=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E8=B7=AF=E5=BE=84=E5=B9=B6=E7=AE=80=E5=8C=96=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/modules/gen/module/bin/deploy.bat.xml    |  2 +-
 .../templates/modules/gen/module/bin/deploy.sh.xml     |  2 +-
 .../templates/modules/gen/module/bin/package.bat.xml   |  2 +-
 .../templates/modules/gen/module/bin/package.sh.xml    |  2 +-
 .../resources/templates/modules/gen/module/db/erm.xml  | 10 +++++-----
 .../resources/templates/modules/gen/module/pom.xml     |  6 +++---
 .../modules/gen/module/src/main/java/package.xml       |  2 +-
 .../gen/module/src/main/resources/config/jeesite.xml   |  6 +++---
 .../gen/module/src/main/resources/db/versions.xml      |  2 +-
 .../gen/module/src/main/resources/static/static.xml    |  2 +-
 .../modules/gen/module_cloud/client/bin/deploy.bat.xml |  2 +-
 .../modules/gen/module_cloud/client/bin/deploy.sh.xml  |  2 +-
 .../gen/module_cloud/client/bin/package.bat.xml        |  2 +-
 .../modules/gen/module_cloud/client/bin/package.sh.xml |  2 +-
 .../templates/modules/gen/module_cloud/client/pom.xml  |  6 +++---
 .../gen/module_cloud/client/src/main/java/package.xml  |  2 +-
 .../gen/module_cloud/web/bin/docker-bulid.bat.xml      |  2 +-
 .../gen/module_cloud/web/bin/docker-bulid.sh.xml       |  2 +-
 .../gen/module_cloud/web/bin/docker/Dockerfile.xml     |  4 ++--
 .../modules/gen/module_cloud/web/bin/docker/app.xml    |  2 +-
 .../modules/gen/module_cloud/web/bin/package.bat.xml   |  2 +-
 .../modules/gen/module_cloud/web/bin/package.sh.xml    |  2 +-
 .../gen/module_cloud/web/bin/run-tomcat.bat.xml        |  2 +-
 .../modules/gen/module_cloud/web/bin/run-tomcat.sh.xml |  2 +-
 .../modules/gen/module_cloud/web/bin/run-web.bat.xml   |  2 +-
 .../modules/gen/module_cloud/web/bin/run-web.sh.xml    |  2 +-
 .../templates/modules/gen/module_cloud/web/db/erm.xml  | 10 +++++-----
 .../templates/modules/gen/module_cloud/web/pom.xml     | 10 +++++-----
 .../gen/module_cloud/web/src/main/java/package.xml     |  2 +-
 .../gen/module_cloud/web/src/main/java/startClass.xml  |  2 +-
 .../web/src/main/resources/config/bootstrap.xml        |  4 ++--
 .../web/src/main/resources/config/logback-spring.xml   |  2 +-
 .../web/src/main/resources/static/static.xml           |  2 +-
 33 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml
index d952b4ab..8b30aab4 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/bin</filePath>
 	<fileName>deploy.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml
index 5c15e681..f5e67600 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/bin</filePath>
 	<fileName>deploy.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml
index 4631c947..a80dea3b 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/bin</filePath>
 	<fileName>package.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml
index 2a6e3931..bec0f9a0 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/bin</filePath>
 	<fileName>package.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml b/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
index be8061f8..7c240af3 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
@@ -3,8 +3,8 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>erm</name>
-	<filePath>${module.moduleCode}/db</filePath>
-	<fileName>${module.moduleCode}.erm</fileName>
+	<filePath>${baseDir}/${moduleCode}/db</filePath>
+	<fileName>${moduleCode}.erm</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <diagram>
 	<page_setting>
@@ -48,7 +48,7 @@
 		<suspend_validator>false</suspend_validator>
 		<export_setting>
 			<export_ddl_setting>
-				<output_path>db${'\\'}${module.moduleCode}.sql</output_path>
+				<output_path>db${'\\'}${moduleCode}.sql</output_path>
 				<encoding>UTF-8</encoding>
 				<line_feed>CR+LF</line_feed>
 				<is_open_after_saved>false</is_open_after_saved>
@@ -80,7 +80,7 @@
 			</export_ddl_setting>
 			<export_excel_setting>
 				<category_id>null</category_id>
-				<output_path>db${'\\'}${module.moduleCode}.xls</output_path>
+				<output_path>db${'\\'}${moduleCode}.xls</output_path>
 				<template></template>
 				<template_path></template_path>
 				<used_default_template_lang>en</used_default_template_lang>
@@ -96,7 +96,7 @@
 				<is_open_after_saved>true</is_open_after_saved>
 			</export_html_setting>
 			<export_image_setting>
-				<output_file_path>db${'\\'}${module.moduleCode}.png</output_file_path>
+				<output_file_path>db${'\\'}${moduleCode}.png</output_file_path>
 				<category_dir_path></category_dir_path>
 				<with_category_image>true</with_category_image>
 				<is_open_after_saved>true</is_open_after_saved>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module/pom.xml
index d0806b2b..553109ed 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/pom.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>pom</name>
-	<filePath>${module.moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}</filePath>
 	<fileName>pom.xml</fileName>
 	<charset></charset>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
@@ -18,10 +18,10 @@
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
-	<artifactId>jeesite-module-${module.moduleCode}</artifactId>
+	<artifactId>jeesite-module-${moduleCode}</artifactId>
 	<packaging>jar</packaging>
 	
-	<name>JeeSite Module ${module.moduleName}</name>
+	<name>JeeSite Module ${moduleName}</name>
 	<url>http://jeesite.com</url>
 	<inceptionYear>2013-Now</inceptionYear>
 	
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 6ed66546..cc9f98c3 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>${module.moduleCode}/src/main/java/com/jeesite/modules/${module.moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/src/main/java/com/jeesite/modules/${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 4efd41b4..d6b8a0fc 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
@@ -3,12 +3,12 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>jeesite</name>
-	<filePath>${module.moduleCode}/src/main/resources/config</filePath>
-	<fileName>jeesite-${module.moduleCode}.yml</fileName>
+	<filePath>${baseDir}/${moduleCode}/src/main/resources/config</filePath>
+	<fileName>jeesite-${moduleCode}.yml</fileName>
 	<content><![CDATA[
 # 温馨提示：不建议直接修改此文件，为了平台升级方便，建议将需要修改的参数值，复制到application.yml里进行覆盖该参数值。
 
-#${module.moduleCode}:
+#${moduleCode}:
 #  enabled: true
 
 ]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml
index cb127818..bd704c6f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>versions</name>
-	<filePath>${module.moduleCode}/src/main/resources/db/upgrade/${module.moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/src/main/resources/db/upgrade/${moduleCode}</filePath>
 	<fileName>versions</fileName>
 	<content><![CDATA[${module.currentVersion}]]>
 	</content>
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 f47d0e39..2aad66bb 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>${module.moduleCode}/src/main/resources/static/modules/${module.moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/src/main/resources/static/modules/${moduleCode}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml
index 79767a00..cd0054d4 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
 	<fileName>deploy.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml
index 5a11d05a..47fdee97 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
 	<fileName>deploy.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml
index d8d8961b..5a493058 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
 	<fileName>package.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml
index d6df737c..1775991f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
 	<fileName>package.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml
index 3f33a7e6..3ec25ee4 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>pom</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}-client</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client</filePath>
 	<fileName>pom.xml</fileName>
 	<charset></charset>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
@@ -18,10 +18,10 @@
 		<relativePath>../../../parent/pom.xml</relativePath>
 	</parent>
 	
-	<artifactId>jeesite-cloud-module-${module.moduleCode}-client</artifactId>
+	<artifactId>jeesite-cloud-module-${moduleCode}-client</artifactId>
 	<packaging>jar</packaging>
 	
-	<name>JeeSite Cloud Module ${module.moduleName} Client</name>
+	<name>JeeSite Cloud Module ${moduleName} Client</name>
 	<url>http://jeesite.com</url>
 	<inceptionYear>2013-Now</inceptionYear>
 	
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 c0b60d81..6c634e0c 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>${module.moduleCode}/${module.moduleCode}-client/src/main/java/com/jeesite/modules/${module.moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/src/main/java/com/jeesite/modules/${moduleCode}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-bulid.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-bulid.bat.xml
index 9b79f752..9d9af9b6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-bulid.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-bulid.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>docker-bulid</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
 	<fileName>docker-bulid.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-bulid.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-bulid.sh.xml
index b7bc5292..15b60484 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-bulid.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-bulid.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>docker-bulid</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
 	<fileName>docker-bulid.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
index da550150..6d54e245 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>Dockerfile</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/bin/docker</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin/docker</filePath>
 	<fileName>Dockerfile</fileName>
 	<content><![CDATA[FROM frolvlad/alpine-java:jdk8-slim
 MAINTAINER ThinkGem@163.com
@@ -28,7 +28,7 @@ ENTRYPOINT java $JAVA_OPTS -cp /app $JAVA_OPTS org.springframework.boot.loader.W
 
 EXPOSE 8983
 
-#docker run -p 8983:8983 com.jeesite/jeesite-cloud-module-${module.moduleCode}:4.2
+#docker run -p 8983:8983 com.jeesite/jeesite-cloud-module-${moduleCode}:4.2
 ]]>
 	</content>
 </template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml
index e17f1a20..715117e7 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>app</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/bin/docker</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin/docker</filePath>
 	<fileName>app</fileName>
 	<content><![CDATA[    
 #======================================#
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml
index b4d30959..1650f472 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
 	<fileName>package.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml
index ae61d5b2..1c3d94a3 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
 	<fileName>package.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml
index ddd2bedd..6aaa4c60 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-tomcat</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
 	<fileName>run-tomcat.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml
index c645ed60..4ea38171 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-tomcat</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
 	<fileName>run-tomcat.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml
index e2433034..74b193a2 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-web</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
 	<fileName>run-web.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
index dbfdda54..0b6dbf72 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-web</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
 	<fileName>run-web.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
index bb95540e..16554ecc 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
@@ -3,8 +3,8 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>erm</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/db</filePath>
-	<fileName>${module.moduleCode}.erm</fileName>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/db</filePath>
+	<fileName>${moduleCode}.erm</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <diagram>
 	<page_setting>
@@ -48,7 +48,7 @@
 		<suspend_validator>false</suspend_validator>
 		<export_setting>
 			<export_ddl_setting>
-				<output_path>db${'\\'}${module.moduleCode}.sql</output_path>
+				<output_path>db${'\\'}${moduleCode}.sql</output_path>
 				<encoding>UTF-8</encoding>
 				<line_feed>CR+LF</line_feed>
 				<is_open_after_saved>false</is_open_after_saved>
@@ -80,7 +80,7 @@
 			</export_ddl_setting>
 			<export_excel_setting>
 				<category_id>null</category_id>
-				<output_path>db${'\\'}${module.moduleCode}.xls</output_path>
+				<output_path>db${'\\'}${moduleCode}.xls</output_path>
 				<template></template>
 				<template_path></template_path>
 				<used_default_template_lang>en</used_default_template_lang>
@@ -96,7 +96,7 @@
 				<is_open_after_saved>true</is_open_after_saved>
 			</export_html_setting>
 			<export_image_setting>
-				<output_file_path>db${'\\'}${module.moduleCode}.png</output_file_path>
+				<output_file_path>db${'\\'}${moduleCode}.png</output_file_path>
 				<category_dir_path></category_dir_path>
 				<with_category_image>true</with_category_image>
 				<is_open_after_saved>true</is_open_after_saved>
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 12045e98..7f43586c 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
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>pom</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}</filePath>
 	<fileName>pom.xml</fileName>
 	<charset></charset>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
@@ -18,10 +18,10 @@
 		<relativePath>../../../parent/web/pom.xml</relativePath>
 	</parent>
 	
-	<artifactId>jeesite-cloud-module-${module.moduleCode}</artifactId>
+	<artifactId>jeesite-cloud-module-${moduleCode}</artifactId>
 	<packaging>war</packaging>
 	
-	<name>JeeSite Cloud Module ${module.moduleName}</name>
+	<name>JeeSite Cloud Module ${moduleName}</name>
 	<url>http://jeesite.com</url>
 	<inceptionYear>2013-Now</inceptionYear>
 	
@@ -48,10 +48,10 @@
 			<version>\${project.parent.version}</version>
 		</dependency>
 		
-		<!-- ${module.moduleName}模块 -->
+		<!-- ${moduleName}模块 -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
-			<artifactId>jeesite-cloud-module-${module.moduleCode}-client</artifactId>
+			<artifactId>jeesite-cloud-module-${moduleCode}-client</artifactId>
 			<version>\${project.parent.version}</version>
 		</dependency>
 		
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 c96cf439..34bd9413 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>${module.moduleCode}/${module.moduleCode}/src/main/java/com/jeesite/modules/${module.moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/java/com/jeesite/modules/${moduleCode}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
index 76e68f4c..58c2f9b1 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>start-class</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/src/main/java/com/jeesite/modules</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/java/com/jeesite/modules</filePath>
 	<fileName>${@StringUtils.cap(module.moduleCode)}Application.java</fileName>
 	<content><![CDATA[/**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml
index 9ea8ea32..f4675c1c 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/bootstrap.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>bootstrap</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>bootstrap.yml</fileName>
 	<content><![CDATA[
 #======================================#
@@ -41,7 +41,7 @@ spring:
   
   # 应用程序名称
   application:
-    name: jeesite-cloud-module-${module.moduleCode}
+    name: jeesite-cloud-module-${moduleCode}
 
   # 当前环境名称（注意：不可设置为 test 它是单元测试专用的名称）
   profiles:
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
index 27db5fa6..cb1f0552 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>logback-spring</name>
-	<filePath>${module.moduleCode}/${module.moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>logback-spring.xml</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
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 ac08c4fe..7910a000 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>${module.moduleCode}/${module.moduleCode}/src/main/resources/static/modules/${module.moduleCode}</filePath>
+	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/static/modules/${moduleCode}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[