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 4f940735..44ee93f1 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 @@ -180,117 +180,61 @@ public class BaseCodeGenerate { */ protected void splitFileAndGenerate(File file, String str) { ArrayList list = new ArrayList<>(); - boolean flag = false; - - int i; - label341: { - label342: { - try (InputStreamReader isr = new InputStreamReader(new FileInputStream(file), characterSet); - BufferedReader bf = new BufferedReader(isr);){ - flag = true; - - boolean b = false; - OutputStreamWriter osw = null; - - while(true) { - String s; - while((s = bf.readLine()) != null) { - // 若以指定str开头,长度大于0 - if (s.trim().length() > 0 && s.startsWith(str)) { - // 截取指定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).append("\r\n"); - } - } - - for(int j = 0; j < list.size(); ++j) { - ((Writer)list.get(j)).close(); - } - log.debug("[generate]\t delete file:" + file.getAbsolutePath()); - // 删除文件 - delFile(file); - flag = false; - break label341; - } - } catch (FileNotFoundException e) { - e.printStackTrace(); - flag = false; - break label342; - } catch (IOException e) { - e.printStackTrace(); - flag = false; - } finally { - if (flag) { - try { - if (!list.isEmpty()) { - for(int var12 = 0; var12 < list.size(); ++var12) { - if (list.get(var12) != null) { - ((Writer)list.get(var12)).close(); - } - } - } - } catch (IOException e) { - e.printStackTrace(); - } + try (InputStreamReader isr = new InputStreamReader(new FileInputStream(file), characterSet); + BufferedReader bf = new BufferedReader(isr);){ + boolean b = false; + OutputStreamWriter osw = null; + while(true) { + String s; + while((s = bf.readLine()) != null) { + // 若以指定str开头,长度大于0 + if (s.trim().length() > 0 && s.startsWith(str)) { + // 截取指定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).append("\r\n"); } } - try { - - if (!list.isEmpty()) { - for(i = 0; i < list.size(); ++i) { - if (list.get(i) != null) { - ((Writer)list.get(i)).close(); - } - } - } - } catch (IOException var22) { - var22.printStackTrace(); + for(int j = 0; j < list.size(); ++j) { + ((Writer)list.get(j)).close(); } - - return; + log.debug("[generate]\t delete file:" + file.getAbsolutePath()); + // 删除文件 + delFile(file); + break; } - - try { - - if (!list.isEmpty()) { - for(i = 0; i < list.size(); ++i) { - if (list.get(i) != null) { - ((Writer)list.get(i)).close(); - } - } - } - } catch (IOException var23) { - var23.printStackTrace(); - } - - return; + } catch (IOException e) { + e.printStackTrace(); + } finally { + closeList(list); } + } + private void closeList(ArrayList list) { try { if (!list.isEmpty()) { - for(i = 0; i < list.size(); ++i) { - if (list.get(i) != null) { - ((Writer)list.get(i)).close(); + for(int var12 = 0; var12 < list.size(); ++var12) { + if (list.get(var12) != null) { + ((Writer)list.get(var12)).close(); } } } - } catch (IOException var24) { - var24.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); } - } + /** * 获取生成文件的项目路径 * @date 2021/4/2 16:28