diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java index a3c7e3ea..5c02c9de 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java @@ -97,7 +97,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate { createFileConfig.setStylePath(stylePath); this.createProject(createFileConfig, projectPath, codeGenerateConfig); log.info(" ----- jero-boot ---- generate code success =======> 表名：" + this.tableVo.getTableName() + " "); - return this.list; + return this.messageList; } @Override @@ -111,7 +111,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate { } this.generateCodeFile(stylePath); - return this.list; + return this.messageList; } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java index 1cb57fa7..bd0fab4d 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java @@ -152,7 +152,7 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate createFileConfig.setStylePath(stylePath); this.createProject(createFileConfig, projectPath, configMap); log.info("----- jero-boot ---- generate code success =======> 主表名：" + this.mainTableVo.getTableName()); - return this.list; + return this.messageList; } @Override @@ -166,6 +166,6 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate } this.generateCodeFile(stylePath); - return this.list; + return this.messageList; } } \ No newline at end of file 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 0f4ce626..224732fe 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 @@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j; public class BaseCodeGenerate { protected static String characterSet = "UTF-8"; - protected List list = new ArrayList(); + protected List messageList = new ArrayList(); public BaseCodeGenerate() { } @@ -111,11 +111,11 @@ public class BaseCodeGenerate { File file = FileHelper.createFile(outputFilepath); log.info("[generate]\t template:" + templateFilePath + " ==> " + outputFilepath); FreemarkerHelper.fillDataIntoFileByTemplate(template, configMap, file, characterSet); - if (!this.a(file)) { - this.list.add("生成成功：" + outputFilepath); + if (!this.isStartWithIllegalStr(file)) { + this.messageList.add("生成成功：" + outputFilepath); } - if (this.a(file)) { + if (this.isStartWithIllegalStr(file)) { this.a(file, "#segment#"); } @@ -130,77 +130,83 @@ public class BaseCodeGenerate { protected Template getTemplate(String templateFilePath, CreateFileConfig createFileConfig) throws IOException { return FreemarkerHelper.getConfiguration(createFileConfig.listTemplateRootDirs(), characterSet, templateFilePath).getTemplate(templateFilePath); } - - protected boolean a(File var1) { - return var1.getName().startsWith("[1-n]"); + /** + * 是否以指定非法字符开头 + * @date 2021/4/2 17:18 + * @param file 文件 + * @return boolean + */ + protected boolean isStartWithIllegalStr(File file) { + return file.getName().startsWith("[1-n]"); } - protected void a(File var1, String var2) { - InputStreamReader var3 = null; - BufferedReader var4 = null; - ArrayList var5 = new ArrayList(); - boolean var20 = false; + protected void a(File file, String str) { + InputStreamReader isr = null; + BufferedReader bf = null; + ArrayList list = new ArrayList(); + boolean flag = false; - int var28; + int i; label341: { label342: { try { - var20 = true; - var3 = new InputStreamReader(new FileInputStream(var1), "UTF-8"); - var4 = new BufferedReader(var3); - boolean var7 = false; - OutputStreamWriter var8 = null; + flag = true; + isr = new InputStreamReader(new FileInputStream(file), characterSet); + bf = new BufferedReader(isr); + boolean b = false; + OutputStreamWriter osw = null; while(true) { - String var6; - while((var6 = var4.readLine()) != null) { - if (var6.trim().length() > 0 && var6.startsWith(var2)) { - String var9 = var6.substring(var2.length()); - String var10 = var1.getParentFile().getAbsolutePath(); - var9 = var10 + File.separator + var9; - log.info("[generate]\t split file:" + var1.getAbsolutePath() + " ==> " + var9); - var8 = new OutputStreamWriter(new FileOutputStream(var9), "UTF-8"); - var5.add(var8); - this.list.add("生成成功：" + var9); - var7 = true; - } else if (var7) { - var8.append(var6 + "\r\n"); + String s; + while((s = bf.readLine()) != null) { + // 若以指定str开头 + if (s.trim().length() > 0 && s.startsWith(str)) { + String substring = s.substring(str.length()); + String parentPath = file.getParentFile().getAbsolutePath(); + substring = parentPath + File.separator + substring; + log.info("[generate]\t split file:" + file.getAbsolutePath() + " ==> " + substring); + osw = new OutputStreamWriter(new FileOutputStream(substring), characterSet); + list.add(osw); + this.messageList.add("生成成功：" + substring); + b = true; + } else if (b) { + osw.append(s + "\r\n"); } } - for(int var29 = 0; var29 < var5.size(); ++var29) { - ((Writer)var5.get(var29)).close(); + for(int var29 = 0; var29 < list.size(); ++var29) { + ((Writer)list.get(var29)).close(); } - var4.close(); - var3.close(); - log.debug("[generate]\t delete file:" + var1.getAbsolutePath()); - b(var1); - var20 = false; + bf.close(); + isr.close(); + log.debug("[generate]\t delete file:" + file.getAbsolutePath()); + b(file); + flag = false; break label341; } } catch (FileNotFoundException var25) { var25.printStackTrace(); - var20 = false; + flag = false; break label342; } catch (IOException var26) { var26.printStackTrace(); - var20 = false; + flag = false; } finally { - if (var20) { + if (flag) { try { - if (var4 != null) { - var4.close(); + if (bf != null) { + bf.close(); } - if (var3 != null) { - var3.close(); + if (isr != null) { + isr.close(); } - if (var5.size() > 0) { - for(int var12 = 0; var12 < var5.size(); ++var12) { - if (var5.get(var12) != null) { - ((Writer)var5.get(var12)).close(); + if (list.size() > 0) { + for(int var12 = 0; var12 < list.size(); ++var12) { + if (list.get(var12) != null) { + ((Writer)list.get(var12)).close(); } } } @@ -212,18 +218,18 @@ public class BaseCodeGenerate { } try { - if (var4 != null) { - var4.close(); + if (bf != null) { + bf.close(); } - if (var3 != null) { - var3.close(); + if (isr != null) { + isr.close(); } - if (var5.size() > 0) { - for(var28 = 0; var28 < var5.size(); ++var28) { - if (var5.get(var28) != null) { - ((Writer)var5.get(var28)).close(); + if (list.size() > 0) { + for(i = 0; i < list.size(); ++i) { + if (list.get(i) != null) { + ((Writer)list.get(i)).close(); } } } @@ -235,18 +241,18 @@ public class BaseCodeGenerate { } try { - if (var4 != null) { - var4.close(); + if (bf != null) { + bf.close(); } - if (var3 != null) { - var3.close(); + if (isr != null) { + isr.close(); } - if (var5.size() > 0) { - for(var28 = 0; var28 < var5.size(); ++var28) { - if (var5.get(var28) != null) { - ((Writer)var5.get(var28)).close(); + if (list.size() > 0) { + for(i = 0; i < list.size(); ++i) { + if (list.get(i) != null) { + ((Writer)list.get(i)).close(); } } } @@ -258,18 +264,18 @@ public class BaseCodeGenerate { } try { - if (var4 != null) { - var4.close(); + if (bf != null) { + bf.close(); } - if (var3 != null) { - var3.close(); + if (isr != null) { + isr.close(); } - if (var5.size() > 0) { - for(var28 = 0; var28 < var5.size(); ++var28) { - if (var5.get(var28) != null) { - ((Writer)var5.get(var28)).close(); + if (list.size() > 0) { + for(i = 0; i < list.size(); ++i) { + if (list.get(i) != null) { + ((Writer)list.get(i)).close(); } } }