diff --git a/build.gradle b/build.gradle index 33a3e18..93e719a 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,7 @@ dependencies { // testImplementation 'org.springframework.boot:spring-boot-starter-test' // implementation 'com.baomidou:mybatis-plus-boot-starter:3.4.2' // implementation 'com.baomidou:mybatis-plus-generator:3.4.1' + implementation 'cn.hutool:hutool-all:5.8.11' } test { diff --git a/src/main/java/cn/rainss/codegenerator/utils/GeneratorUtil.java b/src/main/java/cn/rainss/codegenerator/utils/GeneratorUtil.java index 235d2f2..ba49406 100644 --- a/src/main/java/cn/rainss/codegenerator/utils/GeneratorUtil.java +++ b/src/main/java/cn/rainss/codegenerator/utils/GeneratorUtil.java @@ -1,10 +1,13 @@ package cn.rainss.codegenerator.utils; +import cn.hutool.core.io.FileUtil; import cn.rainss.codegenerator.config.Config; +import freemarker.cache.ClassTemplateLoader; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; -import freemarker.template.utility.CollectionUtils; +import freemarker.template.TemplateExceptionHandler; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.Setter; @@ -12,13 +15,15 @@ import org.apache.commons.lang3.StringUtils; import java.io.File; import java.io.FileNotFoundException; -import java.io.FileWriter; import java.io.IOException; -import java.lang.reflect.Type; +import java.io.OutputStreamWriter; +import java.nio.charset.StandardCharsets; +import java.nio.file.*; import java.sql.SQLException; -import java.util.HashMap; +import java.text.MessageFormat; +import java.util.ArrayList; import java.util.List; -import java.util.Map; +import java.util.Objects; /** * 工具类 @@ -107,6 +112,10 @@ public class GeneratorUtil { System.out.println("=== initialization Generator ==="); DatabaseUtil instance = DatabaseUtil.getInstance(); List table = instance.getTable(); + if (table.size() == 0) { + System.out.print("没有需要生成的数据表"); + return; + } table.forEach(t -> { System.out.printf("<<<<< Generate code from table: %s >>>>>%n", t); try { @@ -116,7 +125,8 @@ public class GeneratorUtil { e.printStackTrace(); } }); - + // 生成构建文件 + generateBaseFile(); } /** @@ -150,6 +160,7 @@ public class GeneratorUtil { public static void generatorByTemplate(List columnList, String table, TypeEnum type) { // 文件模板路径 String templatePath = String.format("src/main/resources/template/%s.ftl", type.getTemplate()); + String ftlTemplate = String.format("%s.ftl", type.getTemplate()); String basePackage = CONFIG.getBasePackage(); // 去除前缀 String className = formatTableName(table); @@ -182,9 +193,15 @@ public class GeneratorUtil { file.createNewFile(); } System.out.println(String.format("模板文件路径:%s 目标文件路径:%s", templatePath, destPath)); - Configuration freemarker = new Configuration(Configuration.VERSION_2_3_0); - Template template = freemarker.getTemplate(templatePath); - template.process(tableInfo, new FileWriter(file)); + //Configuration freemarker = new Configuration(Configuration.VERSION_2_3_0); + //Template template = freemarker.getTemplate(templatePath); + //template.process(tableInfo, new FileWriter(file)); + + Configuration configuration = getFreemarkerConfiguration(); + // 获取模板输出文件 + Template template = configuration.getTemplate(ftlTemplate); + OutputStreamWriter outputStreamWriter = new OutputStreamWriter(Files.newOutputStream(file.toPath()), StandardCharsets.UTF_8); + template.process(tableInfo, outputStreamWriter); } catch (IOException | TemplateException e) { System.out.println("文件操作失败！"); @@ -194,6 +211,20 @@ public class GeneratorUtil { //System.out.println(String.format("模板文件路径:%s 目标文件路径:%s", templatePath, destPath)); } + /** + * freemaker configuration + * + * @return + */ + private static Configuration getFreemarkerConfiguration() { + Configuration configuration = new Configuration(Configuration.VERSION_2_3_31); + ClassTemplateLoader loader = new ClassTemplateLoader(GeneratorUtil.class, "/template"); + configuration.setTemplateLoader(loader); + configuration.setDefaultEncoding("UTF-8"); + configuration.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); + return configuration; + } + private static void setTableInfo(List columnList, TableModelInfo tableInfo) { tableInfo.setHasBigDecimal(Boolean.FALSE); tableInfo.setHasLocalDate(Boolean.FALSE); @@ -225,7 +256,8 @@ public class GeneratorUtil { */ private static String getDestFilePath(String className, TypeEnum type) { if (TypeEnum.MAPPER_XML.equals(type)) { - return String.format("%s-%s/src/main/resources/mapper/%s%s.xml", + return String.format("%s/%s-%s/src/main/resources/mapper/%s%s.xml", + CONFIG.getProjectName(), CONFIG.getProjectName(), type.getModule(), className, @@ -264,8 +296,10 @@ public class GeneratorUtil { default: System.out.println("没有匹配的类型"); } - return String.format("%s-%s/src/main/java/%s/%s/%s%s.java", - CONFIG.getProjectName(), type.getModule(), + return String.format("%s/%s-%s/src/main/java/%s/%s/%s%s.java", + CONFIG.getProjectName(), + CONFIG.getProjectName(), + type.getModule(), package2Path(CONFIG.getBasePackage()), package2Path(packageLocation), className, toUpperCaseFist(type.getTemplate()) @@ -324,10 +358,54 @@ public class GeneratorUtil { return table; } + /** + * 生成基础构建文件 gradle + */ + public static void generateBaseFile() { + Configuration configuration = getFreemarkerConfiguration(); + try { + List list = new ArrayList() {{ + add(new BaseBuildFile(configuration.getTemplate("build.gradle.ftl"), MessageFormat.format("{0}/build.gradle", CONFIG.getProjectName()))); + add(new BaseBuildFile(configuration.getTemplate("settings.gradle.ftl"), MessageFormat.format("{0}/settings.gradle", CONFIG.getProjectName()))); + add(new BaseBuildFile(configuration.getTemplate("gitignore.ftl"), MessageFormat.format("{0}/.gitignore", CONFIG.getProjectName()))); + add(new BaseBuildFile(configuration.getTemplate("dto.gradle.ftl"), MessageFormat.format("{0}/{0}-dto/build.gradle", CONFIG.getProjectName()))); + add(new BaseBuildFile(configuration.getTemplate("facade.gradle.ftl"), MessageFormat.format("{0}/{0}-facade/build.gradle", CONFIG.getProjectName()))); + add(new BaseBuildFile(configuration.getTemplate("server.gradle.ftl"), MessageFormat.format("{0}/{0}-server/build.gradle", CONFIG.getProjectName()))); + }}; + // 模板参数设置 + TableModelInfo info = TableModelInfo.builder() + .configuration(CONFIG) + .build(); + for (BaseBuildFile baseBuildFile : list) { + baseBuildFile.getTemplate().process(info, new OutputStreamWriter(Files.newOutputStream(Paths.get(baseBuildFile.getOutputPath())), StandardCharsets.UTF_8)); + } + String wrapperJarPath = Objects.requireNonNull(GeneratorUtil.class.getClassLoader().getResource("template/gradle/wrapper/gradle-wrapper.jar")).getPath(); + String wrapperConfigPath = Objects.requireNonNull(GeneratorUtil.class.getClassLoader().getResource("template/gradle/wrapper/gradle-wrapper.properties")).getPath(); + String gradlewPath = Objects.requireNonNull(GeneratorUtil.class.getClassLoader().getResource("template/gradlew")).getPath(); + String gradlewBatPath = Objects.requireNonNull(GeneratorUtil.class.getClassLoader().getResource("template/gradlew.bat")).getPath(); + // 复制文件 + //Files.copy(Paths.get(path),Paths.get(MessageFormat.format("{0}/gradle", CONFIG.getProjectName())), StandardCopyOption.REPLACE_EXISTING); + Path rootPath = new File(MessageFormat.format("{0}/", CONFIG.getProjectName())).toPath(); + File gradleWrapperPath = new File(MessageFormat.format("{0}/gradle/wrapper/", CONFIG.getProjectName())); + if (!gradleWrapperPath.exists()){ + gradleWrapperPath.mkdirs(); + } + Path gradlePath = gradleWrapperPath.toPath(); + FileUtil.copy(new File(wrapperJarPath).toPath(), gradlePath, StandardCopyOption.REPLACE_EXISTING); + FileUtil.copy(new File(wrapperConfigPath).toPath(), gradlePath, StandardCopyOption.REPLACE_EXISTING); + FileUtil.copy(new File(gradlewPath).toPath(), rootPath, StandardCopyOption.REPLACE_EXISTING); + FileUtil.copy(new File(gradlewBatPath).toPath(), rootPath, StandardCopyOption.REPLACE_EXISTING); + + } catch (TemplateException | IOException e) { + throw new RuntimeException(e); + } + } + @Getter @Setter @Builder public static class TableModelInfo { + private Boolean hasLocalDate; private Boolean hasLocalTime; @@ -346,4 +424,20 @@ public class GeneratorUtil { private String tableName; } + + @Setter + @Getter + @Builder + @AllArgsConstructor + public static class BaseBuildFile { + /** + * 模板 + */ + private Template template; + + /** + * 文件输出路径 + */ + private String outputPath; + } } diff --git a/src/main/resources/mapper/timemail/TmUserMapper.xml b/src/main/resources/mapper/timemail/TmUserMapper.xml deleted file mode 100644 index 138f094..0000000 --- a/src/main/resources/mapper/timemail/TmUserMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/timemail/UserMapper.xml b/src/main/resources/mapper/timemail/UserMapper.xml deleted file mode 100644 index dd1fcfa..0000000 --- a/src/main/resources/mapper/timemail/UserMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/template/build.gradle.ftl b/src/main/resources/template/build.gradle.ftl new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/template/dto.gradle.ftl b/src/main/resources/template/dto.gradle.ftl new file mode 100644 index 0000000..571b417 --- /dev/null +++ b/src/main/resources/template/dto.gradle.ftl @@ -0,0 +1,2 @@ +dependencies { +} \ No newline at end of file diff --git a/src/main/resources/template/entity.ftl b/src/main/resources/template/entity.ftl index a1abfc2..02cc8e7 100644 --- a/src/main/resources/template/entity.ftl +++ b/src/main/resources/template/entity.ftl @@ -16,7 +16,7 @@ import java.time.LocalDate; import java.time.LocalTime; <#if hasLocalDateTime> - import java.time.LocalDateTime; +import java.time.LocalDateTime; /** @@ -33,7 +33,7 @@ public class ${className} implements Serializable { <#list columns as column> /** - * ${column.remarks!'// Todo Add comments'} + * ${column.remarks!'Todo Add comments'} ${column.columnType} */ private ${column.javaType} ${column.columnName}; diff --git a/src/main/resources/template/facade.gradle.ftl b/src/main/resources/template/facade.gradle.ftl new file mode 100644 index 0000000..571b417 --- /dev/null +++ b/src/main/resources/template/facade.gradle.ftl @@ -0,0 +1,2 @@ +dependencies { +} \ No newline at end of file diff --git a/src/main/resources/template/gitignore.ftl b/src/main/resources/template/gitignore.ftl new file mode 100644 index 0000000..d2e3ce3 --- /dev/null +++ b/src/main/resources/template/gitignore.ftl @@ -0,0 +1,7 @@ +*.lock +*.bin +.gradle +.idea +${configuration.projectName}-server/build +${configuration.projectName}-facade/build +${configuration.projectName}-dto/build diff --git a/src/main/resources/template/gradle/wrapper/gradle-wrapper.jar b/src/main/resources/template/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/src/main/resources/template/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/main/resources/template/gradle/wrapper/gradle-wrapper.properties b/src/main/resources/template/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..f371643 --- /dev/null +++ b/src/main/resources/template/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/main/resources/template/gradlew b/src/main/resources/template/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/src/main/resources/template/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/src/main/resources/template/gradlew.bat b/src/main/resources/template/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/src/main/resources/template/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/resources/template/po.ftl b/src/main/resources/template/po.ftl index e046764..66441c9 100644 --- a/src/main/resources/template/po.ftl +++ b/src/main/resources/template/po.ftl @@ -7,16 +7,16 @@ import lombok.NoArgsConstructor; import java.io.Serializable; <#if hasBigDecimal> - import java.math.BigDecimal; +import java.math.BigDecimal; <#if hasLocalDate> - import java.time.LocalDate; +import java.time.LocalDate; <#if hasLocalTime> - import java.time.LocalTime; +import java.time.LocalTime; <#if hasLocalDateTime> - import java.time.LocalDateTime; +import java.time.LocalDateTime; /** @@ -33,7 +33,7 @@ public class ${className} implements Serializable { <#list columns as column> /** - * ${column.remarks!'Todo Add comments'} + * ${column.remarks!'Todo Add comments'} ${column.columnType} */ private ${column.javaType} ${column.columnName}; diff --git a/src/main/resources/template/reqDto.ftl b/src/main/resources/template/reqDto.ftl index e05b93e..7252fed 100644 --- a/src/main/resources/template/reqDto.ftl +++ b/src/main/resources/template/reqDto.ftl @@ -7,16 +7,16 @@ import lombok.NoArgsConstructor; import java.io.Serializable; <#if hasBigDecimal> - import java.math.BigDecimal; +import java.math.BigDecimal; <#if hasLocalDate> - import java.time.LocalDate; +import java.time.LocalDate; <#if hasLocalTime> - import java.time.LocalTime; +import java.time.LocalTime; <#if hasLocalDateTime> - import java.time.LocalDateTime; +import java.time.LocalDateTime; /** @@ -33,7 +33,7 @@ public class ${className} implements Serializable { <#list columns as column> /** - * ${column.remarks!'Todo Add comments'} + * ${column.remarks!'Todo Add comments'} ${column.columnType} */ private ${column.javaType} ${column.columnName}; diff --git a/src/main/resources/template/resDto.ftl b/src/main/resources/template/resDto.ftl index e05b93e..7252fed 100644 --- a/src/main/resources/template/resDto.ftl +++ b/src/main/resources/template/resDto.ftl @@ -7,16 +7,16 @@ import lombok.NoArgsConstructor; import java.io.Serializable; <#if hasBigDecimal> - import java.math.BigDecimal; +import java.math.BigDecimal; <#if hasLocalDate> - import java.time.LocalDate; +import java.time.LocalDate; <#if hasLocalTime> - import java.time.LocalTime; +import java.time.LocalTime; <#if hasLocalDateTime> - import java.time.LocalDateTime; +import java.time.LocalDateTime; /** @@ -33,7 +33,7 @@ public class ${className} implements Serializable { <#list columns as column> /** - * ${column.remarks!'Todo Add comments'} + * ${column.remarks!'Todo Add comments'} ${column.columnType} */ private ${column.javaType} ${column.columnName}; diff --git a/src/main/resources/template/server.gradle.ftl b/src/main/resources/template/server.gradle.ftl new file mode 100644 index 0000000..571b417 --- /dev/null +++ b/src/main/resources/template/server.gradle.ftl @@ -0,0 +1,2 @@ +dependencies { +} \ No newline at end of file diff --git a/src/main/resources/template/settings.gradle.ftl b/src/main/resources/template/settings.gradle.ftl new file mode 100644 index 0000000..0059439 --- /dev/null +++ b/src/main/resources/template/settings.gradle.ftl @@ -0,0 +1,4 @@ +rootProject.name = '${configuration.projectName}' +include '${configuration.projectName}-dto' +include '${configuration.projectName}-server' +include '${configuration.projectName}-facade' \ No newline at end of file