caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade: 更新 hutool 和 mybatis plus 版本

Browse Source
This commit is contained in:
misworga831 2024-01-22 10:43:09 +08:00
parent 72482ee395
commit 6755515b1f
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/src/main/java/cn/lili/mybatis/mybatisplus/external/InsertIgnoreBatchAllColumn.java vendored
View File

@ -28,6 +28,10 @@ public class InsertIgnoreBatchAllColumn extends AbstractMethod {
@Accessors(chain = true) @Accessors(chain = true)
private Predicate<TableFieldInfo> predicate; private Predicate<TableFieldInfo> predicate;
protected InsertIgnoreBatchAllColumn(String methodName) {
super(methodName);
}
@SuppressWarnings("Duplicates") @SuppressWarnings("Duplicates")
@Override @Override
public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) { public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
@ -36,7 +40,7 @@ public class InsertIgnoreBatchAllColumn extends AbstractMethod {
String sqlTemplate = "<script>\nINSERT IGNORE INTO %s %s VALUES %s\n</script>"; String sqlTemplate = "<script>\nINSERT IGNORE INTO %s %s VALUES %s\n</script>";
List<TableFieldInfo> fieldList = tableInfo.getFieldList(); List<TableFieldInfo> fieldList = tableInfo.getFieldList();
String insertSqlColumn = tableInfo.getKeyInsertSqlColumn(true, false) + String insertSqlColumn = tableInfo.getKeyInsertSqlColumn(true, "", false) +
this.filterTableFieldInfo(fieldList, predicate, TableFieldInfo::getInsertSqlColumn, EMPTY); this.filterTableFieldInfo(fieldList, predicate, TableFieldInfo::getInsertSqlColumn, EMPTY);
String columnScript = LEFT_BRACKET + insertSqlColumn.substring(0, insertSqlColumn.length() - 1) + RIGHT_BRACKET; String columnScript = LEFT_BRACKET + insertSqlColumn.substring(0, insertSqlColumn.length() - 1) + RIGHT_BRACKET;
String insertSqlProperty = tableInfo.getKeyInsertSqlProperty(true, ENTITY_DOT, false) + String insertSqlProperty = tableInfo.getKeyInsertSqlProperty(true, ENTITY_DOT, false) +

2
framework/src/main/java/cn/lili/mybatis/mybatisplus/external/SpiceSqlInjector.java vendored
View File

@ -28,7 +28,7 @@ public class SpiceSqlInjector extends DefaultSqlInjector {
// methodList.add(new InsertBatchSomeColumn(t -> !t.isLogicDelete() && !"update_time".equals(t.getColumn()))); // methodList.add(new InsertBatchSomeColumn(t -> !t.isLogicDelete() && !"update_time".equals(t.getColumn())));
// 要逻辑删除 t.isLogicDelete() 默认不要 // 要逻辑删除 t.isLogicDelete() 默认不要
methodList.add(new InsertBatchSomeColumn(t -> !t.isLogicDelete())); methodList.add(new InsertBatchSomeColumn(t -> !t.isLogicDelete()));
methodList.add(new InsertIgnoreBatchAllColumn()); methodList.add(new InsertIgnoreBatchAllColumn("insertIgnoreBatchAllColumn"));
return methodList; return methodList;
} }
} }

6
pom.xml
View File

@ -25,12 +25,12 @@
<docker-registry>registry.cn-beijing.aliyuncs.com/lili-images</docker-registry> <docker-registry>registry.cn-beijing.aliyuncs.com/lili-images</docker-registry>
<images-version>1</images-version> <images-version>1</images-version>
<alipay-sdk-version>4.22.32.ALL</alipay-sdk-version> <alipay-sdk-version>4.22.32.ALL</alipay-sdk-version>
<mybatis-plus-version>3.5.1</mybatis-plus-version> <mybatis-plus-version>3.5.5</mybatis-plus-version>
<Hutool-version>5.8.14</Hutool-version> <Hutool-version>5.8.24</Hutool-version>
<TinyPinyin-verions>2.0.3.RELEASE</TinyPinyin-verions> <TinyPinyin-verions>2.0.3.RELEASE</TinyPinyin-verions>
<jasypt-version>3.0.4</jasypt-version> <jasypt-version>3.0.4</jasypt-version>
<neetl-version>2.9.10</neetl-version> <neetl-version>2.9.10</neetl-version>
<lombok-version>1.18.24</lombok-version> <lombok-version>1.18.30</lombok-version>
<redisson>3.15.6</redisson> <redisson>3.15.6</redisson>
<aliyun-version>4.5.18</aliyun-version> <aliyun-version>4.5.18</aliyun-version>
<aliyun-sdk-oss-version>3.11.1</aliyun-sdk-oss-version> <aliyun-sdk-oss-version>3.11.1</aliyun-sdk-oss-version>