Merge branch 'main' into hotfix/fix_repeat_case

# Conflicts:
#	fastexcel-test/src/test/java/cn/idev/excel/test/temp/simple/RepeatTest.java

Author: alaahong

.github/workflows/release.yml

@@ -1,37 +1,40 @@
 name: Publish package to the Maven Central Repository
 
+
+
 on:
   release:
     types: [created]
+  workflow_dispatch:
 
 jobs:
   publish:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@main
       - name: Install Java and Maven
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@main
         with:
           java-version: 8
           distribution: 'adopt'
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
       - name: Cache local Maven repository
-        uses: actions/cache@v4
+        uses: actions/cache@main
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-m2
-      - name: Install GPG secret key
-        run: cat <(echo -e "${{ secrets.GPG_PRIVATE_KEY }}") | gpg --batch --import
+      - id: install-secret-key
+        name: Install GPG secret key
+        run: |
+          cat <(echo -e "${{ secrets.GPG_PRIVATE_KEY }}") | gpg --batch --import
       - name: Publish package
-        run: >
-          ./mvnw --batch-mode clean deploy
-              -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }}
-              -Dmaven.test.skip=true -Dmaven.javadoc.skip=false -Dgpg.skip=false
+        run: |
+          mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }}  clean deploy -Dmaven.test.skip=true -Dmaven.javadoc.skip=false -Dgpg.skip=false
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

CHANGELOG.md

@@ -22,7 +22,7 @@
 4. 更新并增加相关API文档和说明。
 
 具体更新内容如下：
-- 【新增】新功能-支持支持自定义表头解析 [#257](https://github.com/fast-excel/fastexcel/pull/257) [@721806280](https://github.com/721806280)
+- 【新增】新功能-支持自定义表头解析 [#257](https://github.com/fast-excel/fastexcel/pull/257) [@721806280](https://github.com/721806280)
 - 【新增】增加测试用例 [#264](https://github.com/fast-excel/fastexcel/pull/264) [@happyfeetw](https://github.com/happyfeetw)
 - 【改进】将开源协议修改为 Apache-2.0 license [#251](https://github.com/fast-excel/fastexcel/pull/251) [@psxjoy](https://github.com/psxjoy)
 - 【修复】修复最后空列无法读取的BUG [#287](https://github.com/fast-excel/fastexcel/pull/287) [@delei](https://github.com/delei)

README.md

@@ -45,14 +45,14 @@ FastExcel 将始终坚持免费开源，并采用商业友好的 Apache 协议
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 ### Gradle
 如果您使用 Gradle 进行项目构建，请在 `build.gradle` 文件中引入以下配置：
 ```gradle
 dependencies {
-    implementation 'cn.idev.excel:fastexcel:1.1.0'
+    implementation 'cn.idev.excel:fastexcel:1.2.0'
 }
 ```
 ## EasyExcel 与 FastExcel 的区别
@@ -77,7 +77,7 @@ dependencies {
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 

README_EN.md

@@ -37,15 +37,15 @@ If you are using Maven for project building, add the following configuration in
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 ### Gradle
 If you are using Gradle for project building, add the following configuration in the build.gradle file:
 
 ```gradle
 dependencies {
-    implementation 'cn.idev.excel:fastexcel:1.1.0'
+    implementation 'cn.idev.excel:fastexcel:1.2.0'
 }
 ```
 ## Update
@@ -73,7 +73,7 @@ Replace with:
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 ### 2. Update Code

README_JP.md

@@ -37,15 +37,15 @@ Mavenでプロジェクトを構築する場合、`pom.xml`ファイルに次の
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 ### Gradle
 
 Gradleでプロジェクトを構築する場合、build.gradleファイルに次の構成を含めてください：
 ```gradle
 dependencies {
-    implementation 'cn.idev.excel:fastexcel:1.1.0'
+    implementation 'cn.idev.excel:fastexcel:1.2.0'
 }
 ```
 ## 更新する
@@ -70,7 +70,7 @@ EasyExcelの依存関係をFastExcelの依存関係に置き換えます。以
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 ### 2. コードの修正

fastexcel-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.idev.excel</groupId>
         <artifactId>fastexcel-parent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

fastexcel-core/src/main/java/cn/idev/excel/EasyExcel.java

@@ -5,6 +5,4 @@
  *
  * @author jipengfei
  */
-public class EasyExcel extends FastExcelFactory {
-
-}
+public class EasyExcel extends FastExcelFactory {}

fastexcel-core/src/main/java/cn/idev/excel/ExcelReader.java

@@ -1,16 +1,17 @@
 package cn.idev.excel;
 
+import java.io.Closeable;
+import java.util.Arrays;
+import java.util.List;
+
+import cn.idev.excel.read.metadata.ReadSheet;
+import cn.idev.excel.read.metadata.ReadWorkbook;
 import cn.idev.excel.analysis.ExcelAnalyser;
 import cn.idev.excel.analysis.ExcelAnalyserImpl;
 import cn.idev.excel.analysis.ExcelReadExecutor;
 import cn.idev.excel.context.AnalysisContext;
-import cn.idev.excel.read.metadata.ReadSheet;
-import cn.idev.excel.read.metadata.ReadWorkbook;
-import lombok.extern.slf4j.Slf4j;
 
-import java.io.Closeable;
-import java.util.Arrays;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Excel readers are all read in event mode.
@@ -19,16 +20,16 @@
  */
 @Slf4j
 public class ExcelReader implements Closeable {
-    
+
     /**
      * Analyser
      */
     private final ExcelAnalyser excelAnalyser;
-    
+
     public ExcelReader(ReadWorkbook readWorkbook) {
         excelAnalyser = new ExcelAnalyserImpl(readWorkbook);
     }
-    
+
     /**
      * Parse all sheet content by default
      *
@@ -38,14 +39,14 @@ public ExcelReader(ReadWorkbook readWorkbook) {
     public void read() {
         readAll();
     }
-    
+
     /***
      * Parse all sheet content by default
      */
     public void readAll() {
         excelAnalyser.analysis(null, Boolean.TRUE);
     }
-    
+
     /**
      * Parse the specified sheet，SheetNo start from 0
      *
@@ -54,7 +55,7 @@ public void readAll() {
     public ExcelReader read(ReadSheet... readSheet) {
         return read(Arrays.asList(readSheet));
     }
-    
+
     /**
      * Read multiple sheets.
      *
@@ -65,7 +66,7 @@ public ExcelReader read(List<ReadSheet> readSheetList) {
         excelAnalyser.analysis(readSheetList, Boolean.FALSE);
         return this;
     }
-    
+
     /**
      * Context for the entire execution process
      *
@@ -74,7 +75,7 @@ public ExcelReader read(List<ReadSheet> readSheetList) {
     public AnalysisContext analysisContext() {
         return excelAnalyser.analysisContext();
     }
-    
+
     /**
      * Current executor
      *
@@ -83,7 +84,7 @@ public AnalysisContext analysisContext() {
     public ExcelReadExecutor excelExecutor() {
         return excelAnalyser.excelExecutor();
     }
-    
+
     /**
      * @return
      * @deprecated please use {@link #analysisContext()}
@@ -92,7 +93,7 @@ public ExcelReadExecutor excelExecutor() {
     public AnalysisContext getAnalysisContext() {
         return analysisContext();
     }
-    
+
     /**
      * Complete the entire read file.Release the cache and close stream.
      */
@@ -101,14 +102,15 @@ public void finish() {
             excelAnalyser.finish();
         }
     }
-    
+
     @Override
     public void close() {
         finish();
     }
-    
+
     /**
      * Prevents calls to {@link #finish} from freeing the cache
+     *
      */
     @Override
     protected void finalize() {