ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

change to private

Browse Source
This commit is contained in:
looly 2021-11-30 17:36:45 +08:00
parent cc72350385
commit f07f786493
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -29,6 +29,7 @@
* 【core 】 CopyOptions增加override配置（issue#I4JQ1N@Gitee） * 【core 】 CopyOptions增加override配置（issue#I4JQ1N@Gitee）
* 【poi 】 SheetRidReader可以获取所有sheet名（issue#I4JA3M@Gitee） * 【poi 】 SheetRidReader可以获取所有sheet名（issue#I4JA3M@Gitee）
* 【core 】 AsyncUtil.waitAny增加返回值（pr#473@Gitee） * 【core 】 AsyncUtil.waitAny增加返回值（pr#473@Gitee）
* 【core 】 Calculator.compare改为private（issue#1982@Github）
* *
### 🐞Bug修复 ### 🐞Bug修复
* 【core 】 修复FileResource构造fileName参数无效问题（issue#1942@Github） * 【core 】 修复FileResource构造fileName参数无效问题（issue#1942@Github）

4
hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
View File

@ -154,7 +154,7 @@ public class Calculator {
* @param peek peek * @param peek peek
* @return 优先级 * @return 优先级
*/ */
public boolean compare(char cur, char peek) {// 如果是peek优先级高于cur，返回true，默认都是peek优先级要低 private boolean compare(char cur, char peek) {// 如果是peek优先级高于cur，返回true，默认都是peek优先级要低
final int offset = 40; final int offset = 40;
if(cur == '%'){ if(cur == '%'){
// %优先级最高 // %优先级最高
@ -165,7 +165,7 @@ public class Calculator {
peek = 47; peek = 47;
} }
return operatPriority[(peek) - offset] >= operatPriority[(cur) - offset]; return operatPriority[peek - offset] >= operatPriority[cur - offset];
} }
/** /**

2
hutool-db/pom.xml
View File

@ -81,7 +81,7 @@
<dependency> <dependency>
<groupId>com.github.chris2018998</groupId> <groupId>com.github.chris2018998</groupId>
<artifactId>beecp</artifactId> <artifactId>beecp</artifactId>
<version>3.2.9</version> <version>3.3.0</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>

6
hutool-extra/pom.xml
View File

@ -241,7 +241,7 @@
<dependency> <dependency>
<groupId>org.apache.lucene</groupId> <groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-smartcn</artifactId> <artifactId>lucene-analyzers-smartcn</artifactId>
<version>8.10.1</version> <version>8.11.0</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
@ -384,7 +384,7 @@
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>1.2.6</version> <version>1.2.7</version>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -432,7 +432,7 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId> <artifactId>spring-expression</artifactId>
<version>5.3.12</version> <version>5.3.13</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>