升级第三方库版本

Author: yanglb

pom.xml

@@ -14,28 +14,34 @@
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-            <version>1.4</version>
+            <version>1.8.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
+            <version>1.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-excelant</artifactId>
-            <version>3.11</version>
+            <version>5.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.32</version>
+            <version>2.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.json/json -->
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20200518</version>
+            <version>20231013</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.24.2</version>
         </dependency>
     </dependencies>
     <build>
@@ -74,4 +80,11 @@
             </plugin>
         </plugins>
     </build>
+    <repositories>
+        <repository>
+            <id>maven_central</id>
+            <name>Maven Central</name>
+            <url>https://repo.maven.apache.org/maven2/</url>
+        </repository>
+    </repositories>
 </project>

src/main/java/com/yanglb/codegen/core/reader/BaseReader.java

@@ -31,6 +31,7 @@
 import java.util.List;
 import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -185,23 +186,23 @@ private boolean isReadable(String sheetName) {
 	 */
 	public String getCellStringValue(XSSFCell cell) {
 		String result = null;
-    	int type = cell.getCellType();
-    	if(type == Cell.CELL_TYPE_FORMULA) type = cell.getCachedFormulaResultType();
-    	if(type == Cell.CELL_TYPE_BLANK) return null;
-    	if(type == Cell.CELL_TYPE_ERROR) {
+    	CellType type = cell.getCellType();
+    	if(type == CellType.FORMULA) type = cell.getCachedFormulaResultType();
+    	if(type == CellType.BLANK) return null;
+    	if(type == CellType.ERROR) {
     		return "#VALUE!";
     	}
 
     	switch(type) {
-    	case Cell.CELL_TYPE_BOOLEAN:
+			case BOOLEAN:
     		result = String.valueOf(cell.getBooleanCellValue());
     		break;
 
-    	case Cell.CELL_TYPE_STRING:
+			case STRING:
     		result = cell.getStringCellValue();
     		break;
 
-    	case Cell.CELL_TYPE_NUMERIC:
+			case NUMERIC:
     	{
     		if(cell.getCellStyle().getDataFormat() == DataFormatType.FORMAT_DATE) {
     			Date date = cell.getDateCellValue();

src/main/java/com/yanglb/codegen/core/reader/impl/HashMapReaderImpl.java

@@ -19,6 +19,8 @@
 import com.yanglb.codegen.utils.StringUtil;
 import java.util.HashMap;
 import java.util.List;
+
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -43,7 +45,7 @@ protected HashMap<String, String> onReader(XSSFSheet sheet) {
 			XSSFRow xssfRow = sheet.getRow(row);
 			String key = this.getCellStringValue(xssfRow.getCell(this.startColNo));
 			// key不为空时添加到Map中
-			if(xssfRow.getCell(this.startColNo).getCellType() == XSSFCell.CELL_TYPE_BLANK
+			if(xssfRow.getCell(this.startColNo).getCellType() == CellType.BLANK
 					|| StringUtil.isNullOrEmpty(key)) {
 				continue;
 			}

src/main/java/com/yanglb/codegen/core/reader/impl/TableReaderImpl.java

@@ -24,6 +24,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -78,16 +80,16 @@ protected TableModel onReader(XSSFSheet sheet) throws CodeGenException {
 					throw new CodeGenException(String.format("error: sheet(%s), row(%d), col(%d)", 
 							sheet.getSheetName(), rowNo, colNo));
 				}
-				if(cell.getCellType() != XSSFCell.CELL_TYPE_BLANK
-						&& cell.getCellType() != XSSFCell.CELL_TYPE_ERROR) {
+				if(cell.getCellType() != CellType.BLANK
+						&& cell.getCellType() != CellType.ERROR) {
 					allBlank = false;
 				}
 				String value = this.getCellStringValue(cell);
 
 				// 第一行为KEY
 				if(rowNo == this.startRowNo) {
 					if(StringUtil.isNullOrEmpty(value)
-							|| cell.getCellType() ==XSSFCell.CELL_TYPE_BLANK
+							|| cell.getCellType() ==CellType.BLANK
 							|| "-".equals(value)) {
 						// 空白/忽略的列无视
 						continue;