Merge branch 'temp_merge' into developing

easyexcel-core/src/main/java/com/alibaba/excel/analysis/csv/CsvExcelReadExecutor.java

@@ -84,12 +84,12 @@ public class CsvExcelReadExecutor implements ExcelReadExecutor {
         CSVFormat csvFormat = csvReadWorkbookHolder.getCsvFormat();
 
         if (csvReadWorkbookHolder.getMandatoryUseInputStream()) {
-            return csvFormat.parse(new InputStreamReader(csvReadWorkbookHolder.getInputStream()));
+            return csvFormat.parse(new InputStreamReader(csvReadWorkbookHolder.getInputStream(),csvReadWorkbookHolder.getEncoding()));
         }
         if (csvReadWorkbookHolder.getFile() != null) {
             return csvFormat.parse(new FileReader(csvReadWorkbookHolder.getFile()));
         }
-        return csvFormat.parse(new InputStreamReader(csvReadWorkbookHolder.getInputStream()));
+        return csvFormat.parse(new InputStreamReader(csvReadWorkbookHolder.getInputStream(),csvReadWorkbookHolder.getEncoding()));
     }
 
     private void dealRecord(CSVRecord record, int rowIndex) {

easyexcel-core/src/main/java/com/alibaba/excel/read/builder/ExcelReaderBuilder.java

@@ -38,6 +38,11 @@ public class ExcelReaderBuilder extends AbstractExcelReaderParameterBuilder<Exce
         return this;
     }
 
+    public ExcelReaderBuilder encoding(String encoding){
+        readWorkbook.setEncoding(encoding);
+        return this;
+    }
+
     /**
      * Read InputStream
      * <p>

easyexcel-core/src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java

@@ -98,4 +98,6 @@ public class ReadWorkbook extends ReadBasicParameter {
      * @see CellExtraTypeEnum
      */
     private Set<CellExtraTypeEnum> extraReadSet;
+
+    private String encoding;
 }

easyexcel-core/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadWorkbookHolder.java

@@ -4,9 +4,11 @@ import com.alibaba.excel.read.metadata.ReadWorkbook;
 import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder;
 import com.alibaba.excel.support.ExcelTypeEnum;
 
+import com.alibaba.excel.util.StringUtils;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.compress.utils.CharsetNames;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 
@@ -24,9 +26,12 @@ public class CsvReadWorkbookHolder extends ReadWorkbookHolder {
     private CSVParser csvParser;
 
 
+    private String encoding;
+
     public CsvReadWorkbookHolder(ReadWorkbook readWorkbook) {
         super(readWorkbook);
         setExcelType(ExcelTypeEnum.CSV);
         this.csvFormat = CSVFormat.DEFAULT;
+        this.encoding = StringUtils.isEmpty(readWorkbook.getEncoding())? CharsetNames.UTF_8:readWorkbook.getEncoding();
     }
 }