Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_879456671
easyexcel
提交
27b417f3
E
easyexcel
项目概览
qq_879456671
/
easyexcel
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
easyexcel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
27b417f3
编写于
9月 17, 2021
作者:
庄家钜
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改pom版本
上级
5c529df0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
28 deletion
+25
-28
pom.xml
pom.xml
+21
-7
src/main/java/com/alibaba/excel/context/WriteContextImpl.java
...main/java/com/alibaba/excel/context/WriteContextImpl.java
+1
-1
src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
+3
-20
未找到文件。
pom.xml
浏览文件 @
27b417f3
...
...
@@ -85,7 +85,7 @@
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-api
</artifactId>
<version>
1.7.
26
</version>
<version>
1.7.
32
</version>
</dependency>
<dependency>
<groupId>
org.ehcache
</groupId>
...
...
@@ -103,31 +103,31 @@
<dependency>
<groupId>
ch.qos.logback
</groupId>
<artifactId>
logback-classic
</artifactId>
<version>
1.2.
3
</version>
<version>
1.2.
5
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<artifactId>
fastjson
</artifactId>
<version>
1.2.7
1
</version>
<version>
1.2.7
8
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot
</artifactId>
<version>
1.5.21.RELEASE
</version>
<version>
2.5.4
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-web
</artifactId>
<version>
1.5.21.RELEASE
</version>
<version>
2.5.4
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
4.13.
1
</version>
<version>
4.13.
2
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
...
...
@@ -171,6 +171,7 @@
<exclude>
com/alibaba/excel/util/MapUtils.java
</exclude>
<exclude>
com/alibaba/excel/metadata/format/DataFormatter.java
</exclude>
<exclude>
com/alibaba/excel/metadata/format/ExcelGeneralNumberFormat.java
</exclude>
<exclude>
com/alibaba/excel/metadata/csv/CsvDataFormat.java
</exclude>
</excludes>
</configuration>
<executions>
...
...
@@ -193,14 +194,16 @@
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-compiler-plugin
</artifactId>
<version>
3.8.1
</version>
<configuration>
<source>
1.8
</source>
<target>
1.8
</target>
</configuration>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-source-plugin
</artifactId>
<version>
2.1
</version>
<version>
3.
2.1
</version>
<configuration>
<attach>
true
</attach>
</configuration>
...
...
@@ -252,6 +255,17 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-surefire-plugin
</artifactId>
<version>
2.22.2
</version>
<configuration>
<includes>
<include>
com/alibaba/easyexcel/test/core/**/*.java
</include>
</includes>
<testFailureIgnore>
true
</testFailureIgnore>
</configuration>
</plugin>
</plugins>
</build>
</project>
src/main/java/com/alibaba/excel/context/WriteContextImpl.java
浏览文件 @
27b417f3
...
...
@@ -139,7 +139,7 @@ public class WriteContextImpl implements WriteContext {
return
false
;
}
if
(
LOGGER
.
isDebugEnabled
())
{
LOGGER
.
debug
(
"Sheet:{}
is already existed"
,
writeSheet
.
getSheetNo
());
LOGGER
.
debug
(
"Sheet:{}
,{} is already existed"
,
writeSheet
.
getSheetNo
(),
writeSheet
.
getSheetName
());
}
writeSheetHolder
.
setNewInitialization
(
Boolean
.
FALSE
);
writeTableHolder
=
null
;
...
...
src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
浏览文件 @
27b417f3
...
...
@@ -17,23 +17,6 @@ import org.apache.commons.collections4.CollectionUtils;
import
org.apache.poi.hssf.util.CellReference
;
import
org.apache.poi.ss.usermodel.FillPatternType
;
import
org.apache.poi.ss.usermodel.IndexedColors
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
com.alibaba.easyexcel.test.demo.write.DemoData
;
import
com.alibaba.easyexcel.test.util.TestFileUtil
;
import
com.alibaba.excel.EasyExcel
;
import
com.alibaba.excel.write.metadata.style.WriteCellStyle
;
import
com.alibaba.excel.write.metadata.style.WriteFont
;
import
com.alibaba.excel.write.style.HorizontalCellStyleStrategy
;
import
com.alibaba.fastjson.JSON
;
import
org.apache.poi.hssf.util.CellReference
;
import
org.apache.poi.ss.usermodel.FillPatternType
;
import
org.apache.poi.ss.usermodel.IndexedColors
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -43,15 +26,15 @@ import org.slf4j.LoggerFactory;
*
* @author Jiaju Zhuang
**/
@Ignore
public
class
Lock2Test
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
Lock2Test
.
class
);
@Test
public
void
test
()
throws
Exception
{
// File file = TestFileUtil.readUserHomeFile("test/test4.xlsx");
// File file = TestFileUtil.readUserHomeFile("test/test6.xls");
assert
1
!=
1
;
// File file = TestFileUtil.readUserHomeFile("test/test4.xlsx");
// File file = TestFileUtil.readUserHomeFile("test/test6.xls");
File
file
=
new
File
(
"/Users/zhuangjiaju/IdeaProjects/easyexcel/src/test/resources/converter/converter07.xlsx"
);
List
<
Object
>
list
=
EasyExcel
.
read
(
"/Users/zhuangjiaju/Downloads/olay (1).xlsx"
).
sheet
(
0
).
doReadSync
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录