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

add gitcode

Browse Source
This commit is contained in:
Looly 2024-12-19 21:29:34 +08:00
parent 4e2c460ab6
commit 9c8dadf600
5 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,7 +2,7 @@
# 🚀Changelog # 🚀Changelog
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.8.35(2024-12-15) # 5.8.35(2024-12-19)
### 🐣新特性 ### 🐣新特性
* 【poi 】 优化ExcelWriter中使用比较器writer的方法，只对第一条数据进行排序（pr#3807@Github） * 【poi 】 优化ExcelWriter中使用比较器writer的方法，只对第一条数据进行排序（pr#3807@Github）
@ -11,6 +11,7 @@
* 【json 】 JSON的getByPath方法新增更为通用的指定出参类型重载（pr#3814@Github） * 【json 】 JSON的getByPath方法新增更为通用的指定出参类型重载（pr#3814@Github）
* 【core 】 DateUtil.parseUTC方法标记废弃，改名为parseISO8601（issue#IBB6I5@Gitee） * 【core 】 DateUtil.parseUTC方法标记废弃，改名为parseISO8601（issue#IBB6I5@Gitee）
* 【core 】 添加EnumUtil#getBy(Class, Func1, Object)方法（pr#1283@Gitee） * 【core 】 添加EnumUtil#getBy(Class, Func1, Object)方法（pr#1283@Gitee）
* 【db 】 添加Entity.addCondition方法（issue#IBCDL2@Gitee）
### 🐞Bug修复 ### 🐞Bug修复
* 【crypto 】 修复JWTSignerUtil.createSigner中algorithmId未转换问题（issue#3806@Github） * 【crypto 】 修复JWTSignerUtil.createSigner中algorithmId未转换问题（issue#3806@Github）

8
bin/push_dev.sh
View File

@ -3,7 +3,11 @@
echo -e "\033[32mCheckout to v5-dev\033[0m" echo -e "\033[32mCheckout to v5-dev\033[0m"
git checkout v5-dev git checkout v5-dev
echo -e "\033[32mPush to origin v5-dev\033[0m" echo -e "\033[32mPush to Github(origin) v5-dev\033[0m"
git push origin v5-dev git push origin v5-dev
echo -e "\033[32mPush to osc v5-dev\033[0m"
echo -e "\033[32mPush to Gitee v5-dev\033[0m"
git push osc v5-dev git push osc v5-dev
echo -e "\033[32mPush to Gitcode v5-dev\033[0m"
git push gitcode v5-dev

8
bin/push_master.sh
View File

@ -6,7 +6,11 @@ git checkout v5-master
echo -e "\033[32mMerge v5-dev branch\033[0m" echo -e "\033[32mMerge v5-dev branch\033[0m"
git merge v5-dev -m 'Prepare release' git merge v5-dev -m 'Prepare release'
echo -e "\033[32mPush to origin v5-master\033[0m" echo -e "\033[32mPush to Github(origin) v5-master\033[0m"
git push origin v5-master git push origin v5-master
echo -e "\033[32mPush to osc v5-master\033[0m"
echo -e "\033[32mPush to Gitee v5-master\033[0m"
git push osc v5-master git push osc v5-master
echo -e "\033[32mPush to Gitcode v5-master\033[0m"
git push gitcode v5-master

1
bin/sync.sh
View File

@ -3,3 +3,4 @@
git checkout v5-dev git checkout v5-dev
git pull osc v5-dev git pull osc v5-dev
git pull origin v5-dev git pull origin v5-dev
git pull gitcode v5-dev

12
hutool-db/src/main/java/cn/hutool/db/Entity.java
View File

@ -8,6 +8,7 @@ import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.db.sql.Condition;
import cn.hutool.db.sql.SqlUtil; import cn.hutool.db.sql.SqlUtil;
import java.nio.charset.Charset; import java.nio.charset.Charset;
@ -266,6 +267,17 @@ public class Entity extends Dict {
} }
// -------------------------------------------------------------------- Put and Set start // -------------------------------------------------------------------- Put and Set start
/**
* 添加条件
*
* @param condition 条件
* @return this
* @since 5.8.34
*/
public Entity addCondition(final Condition condition) {
return set(condition.getField(), condition);
}
@Override @Override
public Entity set(String field, Object value) { public Entity set(String field, Object value) {
return (Entity) super.set(field, value); return (Entity) super.set(field, value);