Commit Graph

82 Commits

Author SHA1 Message Date
Jiaju Zhuang 3fc94de442 新增广告位 2021-10-09 19:25:03 +08:00
Jiaju Zhuang aafb3e9a43 优化写入样式代码 2021-09-18 16:01:30 +08:00
Jiaju Zhuang 2d4fa668c8 修改javadoc 2021-09-17 23:11:44 +08:00
Jiaju Zhuang b9844658cd 新增demo 2021-09-17 22:58:24 +08:00
Jiaju Zhuang 329cc3d1f2 修改javadoc规范 2021-09-17 22:16:31 +08:00
Jiaju Zhuang a17a5682fa 修改升级特性 2021-09-17 22:03:22 +08:00
Jiaju Zhuang 9a63692bd5 Merge branch 'master' into developing
# Conflicts:
#	pom.xml
#	src/main/java/com/alibaba/excel/analysis/v07/handlers/CellTagHandler.java
#	src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
#	update.md
2021-09-17 11:28:20 +08:00
Jiaju Zhuang a131a4e4ec 修改java ci 2021-09-17 11:11:34 +08:00
Jiaju Zhuang 25b132a852 修改url超时 2021-09-14 20:39:40 +08:00
Jiaju Zhuang 5dd3bc98f6 Merge branch 'master' into developing
# Conflicts:
#	pom.xml
#	src/main/java/com/alibaba/excel/converters/string/StringNumberConverter.java
#	src/main/java/com/alibaba/excel/metadata/format/DataFormatter.java
#	src/main/java/com/alibaba/excel/util/NumberDataFormatterUtils.java
#	src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java
#	src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
#	update.md
2021-09-13 20:07:39 +08:00
jipengfei-jpf 5797cb3476
Update README.md
ok
2021-08-17 21:50:01 +08:00
Jiaju Zhuang 62855db969
Update README.md
新增5群
2021-06-24 11:48:02 +08:00
Jiaju Zhuang 9faaef64c8
Update README.md
新增5群
2021-06-24 11:47:41 +08:00
Jiaju Zhuang 9515c69990
Update README.md
修改readme
2021-05-14 14:12:18 +08:00
Jiaju Zhuang 79ac76d14b
Update README.md
新增QQ3群
2021-05-14 14:06:55 +08:00
Jiaju Zhuang 4b7ef26a46 修改合并指定数据 2021-04-09 13:46:24 +08:00
Jiaju Zhuang 00d0abe7d9
Merge pull request #1565 from alaahong/patch-1
Fix the contentType issue
2021-04-09 13:45:04 +08:00
Jiaju Zhuang 53bbfecc82
Merge pull request #1427 from ZebulonFeng/patch-1
修改错别字,修改句子使其通顺
2021-04-09 11:29:20 +08:00
Jiaju Zhuang bb3166345d
Update README.md
新增4群
2021-03-11 20:39:17 +08:00
Jiaju Zhuang 19fcc3f4f6
Update README.md
新增钉钉3群
2020-09-22 09:10:03 +08:00
ian.zhang 006b102e16
Update correct content type
Update correct content type
2020-09-11 12:05:54 +08:00
ian.zhang 4629a28428
Fix the contentType issue
Raise the PR to fix the sample issue by incorrect content type.

By given sample, we will get a xls type excel even set excelType(ExcelTypeEnum.XLSX), which will open with an alert even the file encoding is based on xlsx. 
"The file format and extension of 'xxx' don't match. The file could be corrupted of unsafe. Unless you trust its source, don't open it. Do you want to open it anyway?"

The root cause is from incorrect content type. it will be fine if set the content type based on xlsx as below
response.setContentType("vnd.openxmlformats-officedocument.spreadsheetml.sheet")

Reference:
https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
.xls	Microsoft Excel	application/vnd.ms-excel
.xlsx	Microsoft Excel (OpenXML)	application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
2020-09-11 11:58:21 +08:00
Jiaju Zhuang d37b87238a 修改demo safari浏览器中文乱码的bug 2020-09-08 18:08:47 +08:00
Zebulon Feng a65c4de055
修改错别字,修改句子使其通顺 2020-06-24 10:46:57 +08:00
Zebulon Feng 1a6bb95a17
修改错别字,修改句子使其通顺 2020-06-24 10:31:52 +08:00
Jiaju Zhuang 4cbdf679d5 新增QQ2群 2020-06-09 21:06:02 +08:00
Jiaju Zhuang 1a4d921652
Update README.md
新增钉钉群
2020-05-15 18:44:51 +08:00
Jiaju Zhuang cb1e085e28
Update README.md
修改excel大写
2020-03-17 22:34:21 +08:00
Jiaju Zhuang afcec70c1f
Update README.md
修改官网到语雀
2020-03-17 22:33:33 +08:00
Jiaju Zhuang 51cb8c8e54 Merge remote-tracking branch 'remotes/origin/master' into 2.1.x
# Conflicts:
#	pom.xml
#	src/main/java/com/alibaba/excel/analysis/v07/handlers/DefaultCellHandler.java
#	src/main/java/com/alibaba/excel/analysis/v07/handlers/ProcessResultCellHandler.java
#	src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java
#	update.md
2020-03-17 00:33:47 +08:00
Jiaju Zhuang c6f21608ab 修复填充只有`sheetName`会抛异常 2020-01-03 20:08:18 +08:00
Jiaju Zhuang 2c58b5e5fc 新增支持接收批注 2019-12-25 18:32:21 +08:00
Jiaju Zhuang f065e370ab 提交部分代码 2019-12-04 18:51:58 +08:00
Jiaju Zhuang 2205ade4be 修改同步读取返回对象支持泛型 2019-11-01 19:53:06 +08:00
Jiaju Zhuang 5c89856804 Merge remote-tracking branch 'remotes/origin/master' into 2.1.0-beta1 2019-10-21 19:10:19 +08:00
Jiaju Zhuang 2320becd47 优化读取全部sheet方案 2019-10-15 20:34:09 +08:00
jipengfei-jpf a1b615eb75
Update README.md
add contributes
2019-10-15 17:55:47 +08:00
Jiaju Zhuang 8a2cb69be9 优化读取全部sheet方案 2019-10-11 18:32:09 +08:00
Jiaju Zhuang 3a2bf2b43f 优化07版超大文件读取方案 2019-09-29 19:59:15 +08:00
Jiaju Zhuang 55632ddbc2 Merge remote-tracking branch 'remotes/origin/master' into v2.0
# Conflicts:
#	README.md
2019-08-26 14:50:19 +08:00
Jiaju Zhuang 23d6b5f863 Merge remote-tracking branch 'remotes/origin/master' into v2.0
# Conflicts:
#	README.md
2019-08-26 11:07:55 +08:00
罗成 6b37ba2f26 优化读写逻辑 2019-08-26 10:04:07 +08:00
zhuangjiaju 22dc33d4da 优化读写逻辑 2019-08-06 16:54:58 +08:00
zhuangjiaju 99f041e9cd 优化读写逻辑 2019-08-06 13:19:38 +08:00
zhuangjiaju 89245cd0a3 优化读写逻辑 2019-08-06 10:01:33 +08:00
zhuangjiaju fe35e570c2 优化读写逻辑 2019-08-05 19:42:31 +08:00
jipengfei-jpf ad04f24233
Update README.md 2019-07-18 17:28:08 +08:00
jipengfei-jpf 5465fcd761
Update README.md 2019-07-18 17:27:49 +08:00
zhuangjiaju b1a4f9c400 1. 修改readme
2. 加入travis ci
2019-07-04 19:12:38 +08:00
zhuangjiaju 5bed05b5d8 1. 加入mvnw 统一mvn 版本
2. 加入style校验
3. 加入qq群
4. 加入editorconfig
2019-07-01 21:53:28 +08:00