Skip to content

Commit 0954daf

Browse files
committed
publish 2.0.5
1 parent 2aa15e4 commit 0954daf

File tree

6 files changed

+24
-23
lines changed

6 files changed

+24
-23
lines changed

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
```
1414

1515
---
16-
- 2.0.4 此次变更内容
17-
18-
- 移除对Multipart的支持
19-
- 修复一个Async Http无法创建多个实例的问题
16+
- 2.0.5 此次变更内容
17+
18+
- 调整默认Async Http默认工作连接数
19+
- Zip4J升级最新API
20+
- 升级依赖推荐版本
2021

2122
- [ChangeLog](https://github.com/lazy-koala/java-toolkit/blob/master/doc/ChangeLog.md)
2223

@@ -29,15 +30,15 @@
2930
<dependency>
3031
<groupId>com.thankjava.toolkit</groupId>
3132
<artifactId>fast-toolkit</artifactId>
32-
<version>2.0.4</version>
33+
<version>2.0.5</version>
3334
</dependency>
3435
```
3536

3637
```xml
3738
<dependency>
3839
<groupId>com.thankjava.toolkit3d</groupId>
3940
<artifactId>fast-toolkit3d</artifactId>
40-
<version>2.0.4</version>
41+
<version>2.0.5</version>
4142
</dependency>
4243
```
4344

doc/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
- 调整默认Async Http默认工作连接数
88
- Zip4J升级最新API
9+
- 升级依赖推荐版本
910

1011
- 2.0.4
1112

fast-toolkit/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<modelVersion>4.0.0</modelVersion>
1818
<groupId>com.thankjava.toolkit</groupId>
1919
<artifactId>fast-toolkit</artifactId>
20-
<version>2.0.5-SNAPSHOT</version>
20+
<version>2.0.5</version>
2121

2222
<build>
2323
<plugins>

fast-toolkit3d/pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@
1515
</distributionManagement>
1616

1717
<properties>
18-
<com.thankjava.toolkit.version>2.0.5-SNAPSHOT</com.thankjava.toolkit.version>
19-
<com.alibaba.fastjson.version>1.2.60</com.alibaba.fastjson.version>
20-
<com.alibaba.druid.version>1.1.20</com.alibaba.druid.version>
21-
<org.mybatis.version>3.5.6</org.mybatis.version>
22-
<mysql.version>8.0.16</mysql.version>
23-
<redis.clients.version>3.2.0</redis.clients.version>
24-
<org.mongodb.version>3.8.2</org.mongodb.version>
18+
<com.thankjava.toolkit.version>2.0.5</com.thankjava.toolkit.version>
19+
<com.alibaba.fastjson.version>1.2.76</com.alibaba.fastjson.version>
20+
<com.alibaba.druid.version>1.2.6</com.alibaba.druid.version>
21+
<org.mybatis.version>3.5.7</org.mybatis.version>
22+
<mysql.version>8.0.25</mysql.version>
23+
<redis.clients.version>3.6.3</redis.clients.version>
24+
<org.mongodb.version>3.12.10</org.mongodb.version>
2525
<com.thoughtworks.xstream.version>1.4.17</com.thoughtworks.xstream.version>
2626
<net.sf.ehcache.version>2.6.11</net.sf.ehcache.version>
27-
<cglib.version>3.2.8</cglib.version>
27+
<cglib.version>3.3.0</cglib.version>
2828
<javax.mail.version>1.5.0-b01</javax.mail.version>
2929
<javax.activation.version>1.1.1</javax.activation.version>
30-
<commons-codec.version>1.13</commons-codec.version>
31-
<zip4j.version>2.7.0</zip4j.version>
30+
<commons-codec.version>1.15</commons-codec.version>
31+
<zip4j.version>2.9.0</zip4j.version>
3232
<httpasyncclient.version>4.1.4</httpasyncclient.version>
33-
<httpmime.version>4.5.2</httpmime.version>
34-
<poi.version>3.17</poi.version>
33+
<httpmime.version>4.5.13</httpmime.version>
34+
<poi.version>5.0.0</poi.version>
3535

3636
</properties>
3737

3838
<modelVersion>4.0.0</modelVersion>
3939
<groupId>com.thankjava.toolkit3d</groupId>
4040
<artifactId>fast-toolkit3d</artifactId>
41-
<version>2.0.5-SNAPSHOT</version>
41+
<version>2.0.5</version>
4242

4343
<dependencies>
4444

fast-toolkit3d/src/main/java/com/thankjava/toolkit3d/core/excel/poi/impl/POIReaderImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import java.io.FileInputStream;
1717
import java.io.IOException;
18-
import java.io.InputStream;
1918
import java.util.ArrayList;
2019
import java.util.HashMap;
2120
import java.util.List;
@@ -89,7 +88,7 @@ private String getCellValue(int rowIndex, int columnIndex, Cell cell) {
8988
FormatCellValueType formatCellValueType = getCellValueType(rowIndex, columnIndex, cell);
9089

9190
if (formatCellValueType == null) {
92-
switch (cell.getCellTypeEnum()) {
91+
switch (cell.getCellType()) {
9392
case BOOLEAN:
9493
return String.valueOf(cell.getBooleanCellValue());
9594
case NUMERIC:

fast-toolkit3d/src/test/java/encrypit/Base64UtilTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
public class Base64UtilTest {
1616

1717
public static void main(String[] args) throws IOException {
18-
FileInputStream fileInputStream = new FileInputStream(new File("F:\\Download\\Browser\\5f335f650cf5d85bf8bc0e7a.png"));
18+
FileInputStream fileInputStream = new FileInputStream(new File("C:\\Users\\Acexy\\Desktop\\result.png"));
1919
byte[] bytes = new byte[fileInputStream.available()];
2020
fileInputStream.read(bytes);
2121
System.out.println(Base64Util.encode2String(bytes));

0 commit comments

Comments
 (0)