lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-06 13:48:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Looly 2019-10-20 22:18:57 +08:00
parent 7db9955f00
commit ba23a1f192
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -7,7 +7,10 @@
### 新特性 ### 新特性
* 【core】 强化java.time包的对象转换支持 * 【core】 强化java.time包的对象转换支持
### Bug修复 ### Bug修复
* 【db】 修正字段中含有as导致触发关键字不能包装字段的问题（issue#I13ML7@Gitee）
* 【extra】 修复QrCode中utf-8不支持大写的问题。（issue#I13MT6@Gitee）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

2
hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java
View File

@ -92,7 +92,7 @@ public class Wrapper {
} }
//如果字段中包含通配符或者括号（字段通配符或者函数），不做包装 //如果字段中包含通配符或者括号（字段通配符或者函数），不做包装
if(StrUtil.containsAnyIgnoreCase(field, "*", "(", " ", "as")) { if(StrUtil.containsAnyIgnoreCase(field, "*", "(", " ", " as ")) {
return field; return field;
} }

2
hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java
View File

@ -278,7 +278,7 @@ public class QrConfig {
// 配置 // 配置
final HashMap<EncodeHintType, Object> hints = new HashMap<>(); final HashMap<EncodeHintType, Object> hints = new HashMap<>();
if (null != this.charset) { if (null != this.charset) {
hints.put(EncodeHintType.CHARACTER_SET, charset.toString()); hints.put(EncodeHintType.CHARACTER_SET, charset.toString().toLowerCase());
} }
if (null != this.errorCorrection) { if (null != this.errorCorrection) {
hints.put(EncodeHintType.ERROR_CORRECTION, this.errorCorrection); hints.put(EncodeHintType.ERROR_CORRECTION, this.errorCorrection);