将Common Sheet中内容移到Infos.java中

Author: 杨利兵

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

@@ -22,22 +22,22 @@
 
 public interface ISettingReader extends IReader<HashMap<String, String>> {
 	/**
-	 * 读取common配置项目
+	 * 读取配置项目
 	 * @return
 	 * @throws CodeGenException
 	 */
 	public HashMap<String, String> settingReader() throws CodeGenException;
 
 	/**
-	 * 读取一个配置项目（会另外添加common Sheet的内容）
+	 * 读取一个配置项目（会将Infos内容添加到结果集中，且属性添加generator前缀）
 	 * @param settingSheet
 	 * @return
 	 * @throws CodeGenException
 	 */
 	public HashMap<String, String> settingReader(String settingSheet) throws CodeGenException;
 
 	/**
-	 * 读取多个配置项目（会另外添加common Sheet的内容）
+	 * 读取多个配置项目（会将Infos内容添加到结果集中，且属性添加generator前缀）
 	 * @param settingSheets
 	 * @return
 	 * @throws CodeGenException

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

@@ -21,10 +21,9 @@
 
 import com.yanglb.utilitys.codegen.core.reader.ISettingReader;
 import com.yanglb.utilitys.codegen.exceptions.CodeGenException;
+import com.yanglb.utilitys.codegen.utility.Infos;
 
 public class SettingReaderImpl extends HashMapReaderImpl implements ISettingReader {
-	private static final String COMMON_SHEET = "common"; 
-	
 	public SettingReaderImpl() {
 		this.excelFile = "jar:/conf/CodeGenerator.xlsx";
 		this.startRowNo = 3;
@@ -41,7 +40,7 @@ public HashMap<String, String> settingReader() throws CodeGenException {
 	}
 
 	/**
-	 * 读取一个配置项目（会另外添加common Sheet的内容）
+	 * 读取一个配置项目（会将Infos内容添加到结果集中，且属性添加generator前缀）
 	 * @param settingSheet
 	 * @return
 	 * @throws CodeGenException
@@ -51,26 +50,30 @@ public HashMap<String, String> settingReader(String settingSheet) throws CodeGen
 	}
 
 	/**
-	 * 读取多个配置项目（会另外添加common Sheet的内容）
+	 * 读取多个配置项目（会将Infos内容添加到结果集中，且属性添加generator前缀）
 	 * @param settingSheets
 	 * @return
 	 * @throws CodeGenException
 	 */
 	public HashMap<String, String> settingReader(String[] settingSheets) throws CodeGenException {
-		boolean hasCommon = false;
 		List<String> list = new ArrayList<String>();
 		for(String itm:settingSheets) {
 			list.add(itm);
-			if(SettingReaderImpl.COMMON_SHEET.equals(itm)) {
-				hasCommon = true;
-			}
-		}
-		if(!hasCommon) {
-			list.add(SettingReaderImpl.COMMON_SHEET);
 		}
+
 		settingSheets = list.toArray(new String[0]);
 		this.reader(this.excelFile, settingSheets);
 
+		// static info
+		HashMap<String, String> infos = new HashMap<String, String>();
+		infos.put("generatorName", Infos.Name);
+		infos.put("generatorVersion", Infos.Version);
+		infos.put("generatorCopyright", Infos.Copyright);
+		infos.put("generatorAuthor", Infos.Author);
+		infos.put("generatorWebsite", Infos.Website);
+		infos.put("generatorRepository", Infos.Repository);
+		this.results.add(infos);
+		
 		// 返回合并后的结果
 		return this.mergeResult(this.results);
 	}

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

@@ -25,6 +25,7 @@
 import com.yanglb.utilitys.codegen.exceptions.ParamaCheckException;
 import com.yanglb.utilitys.codegen.support.SupportLang;
 import com.yanglb.utilitys.codegen.support.SupportType;
+import com.yanglb.utilitys.codegen.utility.Infos;
 import com.yanglb.utilitys.codegen.utility.StringUtility;
 
 public class CodeGenShell {
@@ -81,8 +82,8 @@ public boolean invoke(String[] args) {
 	 * 显示帮助信息
 	 */
 	private void showHelp() {
-		System.out.println("代码生成器 v3.0.0 使用说明");
-		System.out.println("Copyright 2015-2020 yanglb.com All Rights Reserved.");
+		System.out.println(String.format("代码生成器 v%s 使用说明", Infos.Version));
+		System.out.println(Infos.Copyright);
 		System.out.println();
 		System.out.println("用法：");
 		System.out.println("cg -type 生成类型 -lang 生成语言 -in 输入文件 [-sheets 要生成的Sheet名1[,2]] [-out 输出目录]");

src/com/yanglb/utilitys/codegen/utility/Infos.java

@@ -0,0 +1,10 @@
+package com.yanglb.utilitys.codegen.utility;
+
+public class Infos {
+	public static final String Name       = "Code Generator";
+	public static final String Version    = "3.0.1";
+	public static final String Copyright  = "Copyright 2015-2020 yanglb.com All Rights Reserved.";
+	public static final String Author     = "me@yanglb.com";
+	public static final String Website    = "https://yanglb.com";
+	public static final String Repository = "https://github.com/excel-code-generator/code-generator";
+}