diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/config/CreateFileConfig.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/config/CreateFileConfig.java index da830a54..ce3c4d5b 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/config/CreateFileConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/config/CreateFileConfig.java @@ -19,7 +19,7 @@ public class CreateFileConfig { this.templatePath = templatePath; } - private void a(File file) { + private void setFileList(File file) { this.convertArrToList(file); } @@ -31,27 +31,28 @@ public class CreateFileConfig { return this.stylePath; } - public void setStylePath(String var1) { - this.stylePath = var1; + public void setStylePath(String stylePath) { + this.stylePath = stylePath; } - public List b() { - String var1 = this.getClass().getResource(this.templatePath).getFile(); - var1 = var1.replaceAll("%20", " "); - log.debug("-------classpath-------" + var1); - if (var1.indexOf("/BOOT-INF/classes!") != -1 || var1.indexOf("/BOOT-INF/lib/") != -1) { - var1 = System.getProperty("user.dir") + File.separator + "config/jero/code-template-online/".replace("/", File.separator); - log.debug("---JAR--config--classpath-------" + var1); + public List listFile() { + String file = this.getClass().getResource(this.templatePath).getFile(); + file = file.replaceAll("%20", " "); + log.debug("-------classpath-------" + file); + if (file.indexOf("/BOOT-INF/classes!") != -1 || file.indexOf("/BOOT-INF/lib/") != -1) { + file = System.getProperty("user.dir") + File.separator + "config/jero/code-template-online/".replace("/", File.separator); + log.debug("---JAR--config--classpath-------" + file); } - this.a(new File(var1)); + this.setFileList(new File(file)); return this.fileList; } - public void a(List var1) { - this.fileList = var1; + public void setFileList(List files) { + this.fileList = files; } + @Override public String toString() { StringBuilder var1 = new StringBuilder(); var1.append("{\"templateRootDirs\":\""); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/base/BaseCodeGenerate.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/base/BaseCodeGenerate.java index acf5701d..cc60d9ef 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/base/BaseCodeGenerate.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/base/BaseCodeGenerate.java @@ -32,8 +32,8 @@ public class BaseCodeGenerate { protected void a(CreateFileConfig var1, String var2, Map var3) throws Exception { log.debug("--------generate----projectPath--------" + var2); - for(int var4 = 0; var4 < var1.b().size(); ++var4) { - File var5 = (File)var1.b().get(var4); + for(int var4 = 0; var4 < var1.listFile().size(); ++var4) { + File var5 = (File)var1.listFile().get(var4); this.a(var2, var5, var3, var1); } @@ -110,7 +110,7 @@ public class BaseCodeGenerate { } protected Template a(String var1, CreateFileConfig var2) throws IOException { - return FreemarkerHelper.a(var2.b(), c, var1).getTemplate(var1); + return FreemarkerHelper.a(var2.listFile(), c, var1).getTemplate(var1); } protected boolean a(File var1) { @@ -280,7 +280,7 @@ public class BaseCodeGenerate { } } - Configuration var10 = FreemarkerHelper.a(var2.b(), c, "/"); + Configuration var10 = FreemarkerHelper.a(var2.listFile(), c, "/"); var3 = FreemarkerHelper.a(var3, var0, var10); String var11 = var2.getStylePath(); if (var11 != null && var11 != "") {