diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/FreeMarkerManager.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/FreeMarkerManager.java index 5999143b..74237147 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/FreeMarkerManager.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/FreeMarkerManager.java @@ -7,6 +7,8 @@ import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; import freemarker.template.TemplateExceptionHandler; +import freemarker.template.TemplateMethodModelEx; +import freemarker.template.TemplateModelException; import org.springframework.util.ClassUtils; import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer; @@ -15,6 +17,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; +import java.util.List; public class FreeMarkerManager { private FreeMarkerConfigurer freeMarkerConfigurer; @@ -26,6 +29,7 @@ public class FreeMarkerManager { cfg.setDefaultEncoding("UTF-8"); cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); cfg.setNumberFormat("0.##"); + cfg.setSharedVariable("print", new Print()); MultiTemplateLoader multiTemplateLoader = new MultiTemplateLoader(new TemplateLoader[]{ new ClassTemplateLoader(ClassUtils.getDefaultClassLoader(), "/modules"), @@ -59,4 +63,18 @@ public class FreeMarkerManager { e.printStackTrace(); } } + + private class Print implements TemplateMethodModelEx { + + @Override + public Object exec(List list) throws TemplateModelException { + if (list.size() == 1) { + return list.get(0); + } else if (list.size() > 1) { + return String.join(",", list); + } + return ""; + } + } + } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java index ed24dd9b..60b80cf9 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java @@ -376,10 +376,6 @@ public class SpringBootCallable implements Callable { ctx.put("author", md.getProjectAuthor()); ctx.put("date", new Date()); - if (md.getModuleName().equals("api")) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "ApiExampleRequest" + ".java"), "SpringBoot/java/module/req/ApiExampleRequest.java", ctx); - } - for (Table table : md.getTables()) { ctx.put("table", table); diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java index f41cea4d..26f6edf7 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java @@ -510,6 +510,10 @@ public class Tool { return false; } + public static String out(String out) { + return out; + } + /** * 替换路径分割符号 * diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ResMapper.xml index 6595ce21..c458fb56 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ResMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ResMapper.xml @@ -31,57 +31,6 @@ - - diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml index 88b66bcc..097674c3 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml @@ -11,21 +11,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -133,25 +138,25 @@ ) VALUES - - ( - ${r"#"}{item.id}, - ${r"#"}{item.resCode,jdbcType=VARCHAR}, - ${r"#"}{item.resName,jdbcType=VARCHAR}, - ${r"#"}{item.resType,jdbcType=VARCHAR}, - ${r"#"}{item.resValue,jdbcType=VARCHAR}, - ${r"#"}{item.supCode,jdbcType=VARCHAR}, - ${r"#"}{item.supName,jdbcType=VARCHAR}, - ${r"#"}{item.free,jdbcType=BIT}, - ${r"#"}{item.valid,jdbcType=BIT}, - 0, - 0, - ${r"#"}{token.userId,jdbcType=NUMERIC}, - datetime('now','localtime'), - NULL, - NULL - ) - + + ( + ${r"#"}{item.id}, + ${r"#"}{item.resCode,jdbcType=VARCHAR}, + ${r"#"}{item.resName,jdbcType=VARCHAR}, + ${r"#"}{item.resType,jdbcType=VARCHAR}, + ${r"#"}{item.resValue,jdbcType=VARCHAR}, + ${r"#"}{item.supCode,jdbcType=VARCHAR}, + ${r"#"}{item.supName,jdbcType=VARCHAR}, + ${r"#"}{item.free,jdbcType=BIT}, + ${r"#"}{item.valid,jdbcType=BIT}, + 0, + 0, + ${r"#"}{token.userId,jdbcType=NUMERIC}, + datetime('now','localtime'), + NULL, + NULL + ) + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/rsp/ResLoadResponse.java b/src/main/resources/modules/SpringBoot/java/module/system/rsp/ResLoadResponse.java index 76f339ee..6ddb276f 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/rsp/ResLoadResponse.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/rsp/ResLoadResponse.java @@ -1,7 +1,7 @@ -package xyz.wbsite.module.system.rsp; +package ${basePackage}.module.system.rsp; -import xyz.wbsite.frame.base.BaseFindResponse; -import xyz.wbsite.module.system.ent.Res; +import ${basePackage}.frame.base.BaseFindResponse; +import ${basePackage}.module.system.ent.Res; /** * ResLoadResponse - 资源 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl index ef8509d2..7178d454 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl @@ -21,6 +21,7 @@ text-color="#d6d6d6" active-text-color="#ffd04b"> <#if sysMD> + ${print('<#if token.hasRes("DEV")>')}