Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3a8afd4

Browse files
author
杨利兵
committed
将Common Sheet中内容移到Infos.java中
1 parent 9d3f349 commit 3a8afd4

File tree

5 files changed

+30
-16
lines changed

5 files changed

+30
-16
lines changed

‎src/com/yanglb/utilitys/codegen/core/reader/ISettingReader.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@
2222

2323
public interface ISettingReader extends IReader<HashMap<String, String>> {
2424
/**
25-
* 读取common配置项目
25+
* 读取配置项目
2626
* @return
2727
* @throws CodeGenException
2828
*/
2929
public HashMap<String, String> settingReader() throws CodeGenException;
3030

3131
/**
32-
* 读取一个配置项目(会另外添加common Sheet的内容)
32+
* 读取一个配置项目(会将Infos内容添加到结果集中,且属性添加generator前缀)
3333
* @param settingSheet
3434
* @return
3535
* @throws CodeGenException
3636
*/
3737
public HashMap<String, String> settingReader(String settingSheet) throws CodeGenException;
3838

3939
/**
40-
* 读取多个配置项目(会另外添加common Sheet的内容)
40+
* 读取多个配置项目(会将Infos内容添加到结果集中,且属性添加generator前缀)
4141
* @param settingSheets
4242
* @return
4343
* @throws CodeGenException

‎src/com/yanglb/utilitys/codegen/core/reader/impl/SettingReaderImpl.java‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121

2222
import com.yanglb.utilitys.codegen.core.reader.ISettingReader;
2323
import com.yanglb.utilitys.codegen.exceptions.CodeGenException;
24+
import com.yanglb.utilitys.codegen.utility.Infos;
2425

2526
public class SettingReaderImpl extends HashMapReaderImpl implements ISettingReader {
26-
private static final String COMMON_SHEET = "common";
27-
2827
public SettingReaderImpl() {
2928
this.excelFile = "jar:/conf/CodeGenerator.xlsx";
3029
this.startRowNo = 3;
@@ -41,7 +40,7 @@ public HashMap<String, String> settingReader() throws CodeGenException {
4140
}
4241

4342
/**
44-
* 读取一个配置项目(会另外添加common Sheet的内容)
43+
* 读取一个配置项目(会将Infos内容添加到结果集中,且属性添加generator前缀)
4544
* @param settingSheet
4645
* @return
4746
* @throws CodeGenException
@@ -51,26 +50,30 @@ public HashMap<String, String> settingReader(String settingSheet) throws CodeGen
5150
}
5251

5352
/**
54-
* 读取多个配置项目(会另外添加common Sheet的内容)
53+
* 读取多个配置项目(会将Infos内容添加到结果集中,且属性添加generator前缀)
5554
* @param settingSheets
5655
* @return
5756
* @throws CodeGenException
5857
*/
5958
public HashMap<String, String> settingReader(String[] settingSheets) throws CodeGenException {
60-
boolean hasCommon = false;
6159
List<String> list = new ArrayList<String>();
6260
for(String itm:settingSheets) {
6361
list.add(itm);
64-
if(SettingReaderImpl.COMMON_SHEET.equals(itm)) {
65-
hasCommon = true;
66-
}
67-
}
68-
if(!hasCommon) {
69-
list.add(SettingReaderImpl.COMMON_SHEET);
7062
}
63+
7164
settingSheets = list.toArray(new String[0]);
7265
this.reader(this.excelFile, settingSheets);
7366

67+
// static info
68+
HashMap<String, String> infos = new HashMap<String, String>();
69+
infos.put("generatorName", Infos.Name);
70+
infos.put("generatorVersion", Infos.Version);
71+
infos.put("generatorCopyright", Infos.Copyright);
72+
infos.put("generatorAuthor", Infos.Author);
73+
infos.put("generatorWebsite", Infos.Website);
74+
infos.put("generatorRepository", Infos.Repository);
75+
this.results.add(infos);
76+
7477
// 返回合并后的结果
7578
return this.mergeResult(this.results);
7679
}

‎src/com/yanglb/utilitys/codegen/shell/CodeGenShell.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.yanglb.utilitys.codegen.exceptions.ParamaCheckException;
2626
import com.yanglb.utilitys.codegen.support.SupportLang;
2727
import com.yanglb.utilitys.codegen.support.SupportType;
28+
import com.yanglb.utilitys.codegen.utility.Infos;
2829
import com.yanglb.utilitys.codegen.utility.StringUtility;
2930

3031
public class CodeGenShell {
@@ -81,8 +82,8 @@ public boolean invoke(String[] args) {
8182
* 显示帮助信息
8283
*/
8384
private void showHelp() {
84-
System.out.println("代码生成器 v3.0.0 使用说明");
85-
System.out.println("Copyright 2015-2020 yanglb.com All Rights Reserved.");
85+
System.out.println(String.format("代码生成器 v%s 使用说明", Infos.Version));
86+
System.out.println(Infos.Copyright);
8687
System.out.println();
8788
System.out.println("用法:");
8889
System.out.println("cg -type 生成类型 -lang 生成语言 -in 输入文件 [-sheets 要生成的Sheet名1[,2]] [-out 输出目录]");
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.yanglb.utilitys.codegen.utility;
2+
3+
public class Infos {
4+
public static final String Name = "Code Generator";
5+
public static final String Version = "3.0.1";
6+
public static final String Copyright = "Copyright 2015-2020 yanglb.com All Rights Reserved.";
7+
public static final String Author = "me@yanglb.com";
8+
public static final String Website = "https://yanglb.com";
9+
public static final String Repository = "https://github.com/excel-code-generator/code-generator";
10+
}

‎src/conf/CodeGenerator.xlsx‎

-2.3 KB
Binary file not shown.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /