JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【update】注释代码，重命名变量

Browse Source
This commit is contained in:
mzc5649
2021-04-02 17:38:44 +08:00
parent 3e53429faf
commit 5c92758bb0
3 changed files with 83 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java
+2 -2
View File
@@ -97,7 +97,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate {
createFileConfig.setStylePath(stylePath); createFileConfig.setStylePath(stylePath);
this.createProject(createFileConfig, projectPath, codeGenerateConfig); this.createProject(createFileConfig, projectPath, codeGenerateConfig);
log.info(" ----- jero-boot ---- generate code success =======> 表名：" + this.tableVo.getTableName() + " "); log.info(" ----- jero-boot ---- generate code success =======> 表名：" + this.tableVo.getTableName() + " ");
return this.list; return this.messageList;
} }
@Override @Override
@@ -111,7 +111,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate {
} }
this.generateCodeFile(stylePath); this.generateCodeFile(stylePath);
return this.list; return this.messageList;
} }
} }
jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java
+2 -2
View File
@@ -152,7 +152,7 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
createFileConfig.setStylePath(stylePath); createFileConfig.setStylePath(stylePath);
this.createProject(createFileConfig, projectPath, configMap); this.createProject(createFileConfig, projectPath, configMap);
log.info("----- jero-boot ---- generate code success =======> 主表名：" + this.mainTableVo.getTableName()); log.info("----- jero-boot ---- generate code success =======> 主表名：" + this.mainTableVo.getTableName());
return this.list; return this.messageList;
} }
@Override @Override
@@ -166,6 +166,6 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate
} }
this.generateCodeFile(stylePath); this.generateCodeFile(stylePath);
return this.list; return this.messageList;
} }
} }
jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/base/BaseCodeGenerate.java
+79 -73
View File
@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
public class BaseCodeGenerate { public class BaseCodeGenerate {
protected static String characterSet = "UTF-8"; protected static String characterSet = "UTF-8";
protected List<String> list = new ArrayList(); protected List<String> messageList = new ArrayList();
public BaseCodeGenerate() { public BaseCodeGenerate() {
} }
@@ -111,11 +111,11 @@ public class BaseCodeGenerate {
File file = FileHelper.createFile(outputFilepath); File file = FileHelper.createFile(outputFilepath);
log.info("[generate]\t template:" + templateFilePath + " ==> " + outputFilepath); log.info("[generate]\t template:" + templateFilePath + " ==> " + outputFilepath);
FreemarkerHelper.fillDataIntoFileByTemplate(template, configMap, file, characterSet); FreemarkerHelper.fillDataIntoFileByTemplate(template, configMap, file, characterSet);
if (!this.a(file)) { if (!this.isStartWithIllegalStr(file)) {
this.list.add("生成成功：" + outputFilepath); this.messageList.add("生成成功：" + outputFilepath);
} }
if (this.a(file)) { if (this.isStartWithIllegalStr(file)) {
this.a(file, "#segment#"); this.a(file, "#segment#");
} }
@@ -130,77 +130,83 @@ public class BaseCodeGenerate {
protected Template getTemplate(String templateFilePath, CreateFileConfig createFileConfig) throws IOException { protected Template getTemplate(String templateFilePath, CreateFileConfig createFileConfig) throws IOException {
return FreemarkerHelper.getConfiguration(createFileConfig.listTemplateRootDirs(), characterSet, templateFilePath).getTemplate(templateFilePath); 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) { protected void a(File file, String str) {
InputStreamReader var3 = null; InputStreamReader isr = null;
BufferedReader var4 = null; BufferedReader bf = null;
ArrayList var5 = new ArrayList(); ArrayList list = new ArrayList();
boolean var20 = false; boolean flag = false;
int var28; int i;
label341: { label341: {
label342: { label342: {
try { try {
var20 = true; flag = true;
var3 = new InputStreamReader(new FileInputStream(var1), "UTF-8"); isr = new InputStreamReader(new FileInputStream(file), characterSet);
var4 = new BufferedReader(var3); bf = new BufferedReader(isr);
boolean var7 = false; boolean b = false;
OutputStreamWriter var8 = null; OutputStreamWriter osw = null;
while(true) { while(true) {
String var6; String s;
while((var6 = var4.readLine()) != null) { while((s = bf.readLine()) != null) {
if (var6.trim().length() > 0 && var6.startsWith(var2)) { // 若以指定str开头
String var9 = var6.substring(var2.length()); if (s.trim().length() > 0 && s.startsWith(str)) {
String var10 = var1.getParentFile().getAbsolutePath(); String substring = s.substring(str.length());
var9 = var10 + File.separator + var9; String parentPath = file.getParentFile().getAbsolutePath();
log.info("[generate]\t split file:" + var1.getAbsolutePath() + " ==> " + var9); substring = parentPath + File.separator + substring;
var8 = new OutputStreamWriter(new FileOutputStream(var9), "UTF-8"); log.info("[generate]\t split file:" + file.getAbsolutePath() + " ==> " + substring);
var5.add(var8); osw = new OutputStreamWriter(new FileOutputStream(substring), characterSet);
this.list.add("生成成功：" + var9); list.add(osw);
var7 = true; this.messageList.add("生成成功：" + substring);
} else if (var7) { b = true;
var8.append(var6 + "\r\n"); } else if (b) {
osw.append(s + "\r\n");
} }
} }
for(int var29 = 0; var29 < var5.size(); ++var29) { for(int var29 = 0; var29 < list.size(); ++var29) {
((Writer)var5.get(var29)).close(); ((Writer)list.get(var29)).close();
} }
var4.close(); bf.close();
var3.close(); isr.close();
log.debug("[generate]\t delete file:" + var1.getAbsolutePath()); log.debug("[generate]\t delete file:" + file.getAbsolutePath());
b(var1); b(file);
var20 = false; flag = false;
break label341; break label341;
} }
} catch (FileNotFoundException var25) { } catch (FileNotFoundException var25) {
var25.printStackTrace(); var25.printStackTrace();
var20 = false; flag = false;
break label342; break label342;
} catch (IOException var26) { } catch (IOException var26) {
var26.printStackTrace(); var26.printStackTrace();
var20 = false; flag = false;
} finally { } finally {
if (var20) { if (flag) {
try { try {
if (var4 != null) { if (bf != null) {
var4.close(); bf.close();
} }
if (var3 != null) { if (isr != null) {
var3.close(); isr.close();
} }
if (var5.size() > 0) { if (list.size() > 0) {
for(int var12 = 0; var12 < var5.size(); ++var12) { for(int var12 = 0; var12 < list.size(); ++var12) {
if (var5.get(var12) != null) { if (list.get(var12) != null) {
((Writer)var5.get(var12)).close(); ((Writer)list.get(var12)).close();
} }
} }
} }
@@ -212,18 +218,18 @@ public class BaseCodeGenerate {
} }
try { try {
if (var4 != null) { if (bf != null) {
var4.close(); bf.close();
} }
if (var3 != null) { if (isr != null) {
var3.close(); isr.close();
} }
if (var5.size() > 0) { if (list.size() > 0) {
for(var28 = 0; var28 < var5.size(); ++var28) { for(i = 0; i < list.size(); ++i) {
if (var5.get(var28) != null) { if (list.get(i) != null) {
((Writer)var5.get(var28)).close(); ((Writer)list.get(i)).close();
} }
} }
} }
@@ -235,18 +241,18 @@ public class BaseCodeGenerate {
} }
try { try {
if (var4 != null) { if (bf != null) {
var4.close(); bf.close();
} }
if (var3 != null) { if (isr != null) {
var3.close(); isr.close();
} }
if (var5.size() > 0) { if (list.size() > 0) {
for(var28 = 0; var28 < var5.size(); ++var28) { for(i = 0; i < list.size(); ++i) {
if (var5.get(var28) != null) { if (list.get(i) != null) {
((Writer)var5.get(var28)).close(); ((Writer)list.get(i)).close();
} }
} }
} }
@@ -258,18 +264,18 @@ public class BaseCodeGenerate {
} }
try { try {
if (var4 != null) { if (bf != null) {
var4.close(); bf.close();
} }
if (var3 != null) { if (isr != null) {
var3.close(); isr.close();
} }
if (var5.size() > 0) { if (list.size() > 0) {
for(var28 = 0; var28 < var5.size(); ++var28) { for(i = 0; i < list.size(); ++i) {
if (var5.get(var28) != null) { if (list.get(i) != null) {
((Writer)var5.get(var28)).close(); ((Writer)list.get(i)).close();
} }
} }
} }