Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
43b44239
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
43b44239
编写于
3月 02, 2022
作者:
J
Jiajie Zhong
提交者:
GitHub
3月 02, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "[cherry-pick] upgrade mybatis-plus to 3.4.3 (#8539)" (#8644)
This reverts commit
29ab135c
.
上级
ac5c3936
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
30 addition
and
33 deletion
+30
-33
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
...phinscheduler/dao/datasource/SpringConnectionFactory.java
+9
-9
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
...apache/dolphinscheduler/dao/entity/ProcessDefinition.java
+1
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
...g/apache/dolphinscheduler/dao/entity/ProcessInstance.java
+1
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
...rg/apache/dolphinscheduler/dao/entity/TaskDefinition.java
+1
-2
dolphinscheduler-dist/release-docs/LICENSE
dolphinscheduler-dist/release-docs/LICENSE
+8
-8
pom.xml
pom.xml
+2
-2
tools/dependencies/known-dependencies.txt
tools/dependencies/known-dependencies.txt
+8
-8
未找到文件。
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
浏览文件 @
43b44239
...
...
@@ -20,9 +20,7 @@ package org.apache.dolphinscheduler.dao.datasource;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.core.MybatisConfiguration
;
import
com.baomidou.mybatisplus.core.config.GlobalConfig
;
import
com.baomidou.mybatisplus.extension.MybatisMapWrapperFactory
;
import
com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor
;
import
com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor
;
import
com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor
;
import
com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean
;
import
org.apache.ibatis.mapping.DatabaseIdProvider
;
import
org.apache.ibatis.mapping.VendorDatabaseIdProvider
;
...
...
@@ -42,6 +40,11 @@ import java.util.Properties;
@Configuration
public
class
SpringConnectionFactory
{
@Bean
public
PaginationInterceptor
paginationInterceptor
()
{
return
new
PaginationInterceptor
();
}
@Bean
public
DataSourceTransactionManager
transactionManager
(
DataSource
dataSource
)
{
return
new
DataSourceTransactionManager
(
dataSource
);
...
...
@@ -54,19 +57,16 @@ public class SpringConnectionFactory {
configuration
.
setCacheEnabled
(
false
);
configuration
.
setCallSettersOnNulls
(
true
);
configuration
.
setJdbcTypeForNull
(
JdbcType
.
NULL
);
configuration
.
setObjectWrapperFactory
(
new
MybatisMapWrapperFactory
());
MybatisPlusInterceptor
mybatisPlusInterceptor
=
new
MybatisPlusInterceptor
();
mybatisPlusInterceptor
.
addInnerInterceptor
(
new
PaginationInnerInterceptor
());
configuration
.
addInterceptor
(
paginationInterceptor
());
configuration
.
setGlobalConfig
(
new
GlobalConfig
().
setBanner
(
false
));
MybatisSqlSessionFactoryBean
sqlSessionFactoryBean
=
new
MybatisSqlSessionFactoryBean
();
sqlSessionFactoryBean
.
setConfiguration
(
configuration
);
sqlSessionFactoryBean
.
setDataSource
(
dataSource
);
sqlSessionFactoryBean
.
setPlugins
(
mybatisPlusInterceptor
);
GlobalConfig
.
DbConfig
dbConfig
=
new
GlobalConfig
.
DbConfig
();
dbConfig
.
setIdType
(
IdType
.
AUTO
);
GlobalConfig
globalConfig
=
new
GlobalConfig
()
.
setBanner
(
false
)
;
GlobalConfig
globalConfig
=
new
GlobalConfig
();
globalConfig
.
setDbConfig
(
dbConfig
);
sqlSessionFactoryBean
.
setGlobalConfig
(
globalConfig
);
sqlSessionFactoryBean
.
setTypeAliasesPackage
(
"org.apache.dolphinscheduler.dao.entity"
);
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
浏览文件 @
43b44239
...
...
@@ -22,8 +22,6 @@ import org.apache.dolphinscheduler.common.enums.ReleaseState;
import
org.apache.dolphinscheduler.common.process.Property
;
import
org.apache.dolphinscheduler.common.utils.JSONUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -35,6 +33,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.core.toolkit.StringUtils
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
浏览文件 @
43b44239
...
...
@@ -26,8 +26,6 @@ import org.apache.dolphinscheduler.common.enums.TaskDependType;
import
org.apache.dolphinscheduler.common.enums.WarningType
;
import
org.apache.dolphinscheduler.common.utils.DateUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
java.util.Date
;
import
java.util.Objects
;
...
...
@@ -35,6 +33,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.core.toolkit.StringUtils
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
浏览文件 @
43b44239
...
...
@@ -25,8 +25,6 @@ import org.apache.dolphinscheduler.common.enums.TimeoutFlag;
import
org.apache.dolphinscheduler.common.process.Property
;
import
org.apache.dolphinscheduler.common.utils.JSONUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -38,6 +36,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.core.toolkit.StringUtils
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.annotation.JsonDeserialize
;
...
...
dolphinscheduler-dist/release-docs/LICENSE
浏览文件 @
43b44239
...
...
@@ -323,7 +323,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
jna-platform 4.5.2: https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform/4.5.2, Apache 2.0 and LGPL 2.1
joda-time 2.5: https://github.com/JodaOrg/joda-time, Apache 2.0
jpam 1.1: https://mvnrepository.com/artifact/net.sf.jpam/jpam/1.1, Apache 2.0
jsqlparser
4.0
: https://github.com/JSQLParser/JSqlParser, Apache 2.0 or LGPL 2.1
jsqlparser
2.1
: https://github.com/JSQLParser/JSqlParser, Apache 2.0 or LGPL 2.1
jsr305 3.0.0: https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305, Apache 2.0
j2objc-annotations 1.1 https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/1.1, Apache 2.0
libfb303 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libfb303/0.9.3, Apache 2.0
...
...
@@ -334,13 +334,13 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
log4j-1.2-api 2.14.1: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api/2.14.1, Apache 2.0
lz4 1.3.0: https://mvnrepository.com/artifact/net.jpountz.lz4/lz4/1.3.0, Apache 2.0
mapstruct 1.2.0.Final: https://github.com/mapstruct/mapstruct, Apache 2.0
mybatis 3.5.
7 https://mvnrepository.com/artifact/org.mybatis/mybatis/3.5.7
, Apache 2.0
mybatis-plus 3.
4.3
: https://github.com/baomidou/mybatis-plus, Apache 2.0
mybatis-plus-annotation 3.
4.3: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-annotation/3.4.3
, Apache 2.0
mybatis-plus-boot-starter 3.
4.3: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter/3.4.3
, Apache 2.0
mybatis-plus-core 3.
4.3: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-core/3.4.3
, Apache 2.0
mybatis-plus-extension 3.
4.3: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-extension/3.4.3
, Apache 2.0
mybatis-spring 2.0.
6: https://mvnrepository.com/artifact/org.mybatis/mybatis-spring/2.0.6
, Apache 2.0
mybatis 3.5.
2 https://mvnrepository.com/artifact/org.mybatis/mybatis/3.5.2
, Apache 2.0
mybatis-plus 3.
2.0
: https://github.com/baomidou/mybatis-plus, Apache 2.0
mybatis-plus-annotation 3.
2.0: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-annotation/3.2.0
, Apache 2.0
mybatis-plus-boot-starter 3.
2.0: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter/3.2.0
, Apache 2.0
mybatis-plus-core 3.
2.0: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-core/3.2.0
, Apache 2.0
mybatis-plus-extension 3.
2.0: https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-extension/3.2.0
, Apache 2.0
mybatis-spring 2.0.
2: https://mvnrepository.com/artifact/org.mybatis/mybatis-spring/2.0.2
, Apache 2.0
netty 3.6.2.Final: https://github.com/netty/netty, Apache 2.0
netty 4.1.53.Final: https://github.com/netty/netty/blob/netty-4.1.53.Final/LICENSE.txt, Apache 2.0
opencsv 2.3: https://mvnrepository.com/artifact/net.sf.opencsv/opencsv/2.3, Apache 2.0
...
...
pom.xml
浏览文件 @
43b44239
...
...
@@ -66,8 +66,8 @@
<hadoop.version>
2.7.3
</hadoop.version>
<quartz.version>
2.3.0
</quartz.version>
<jackson.version>
2.10.5
</jackson.version>
<mybatis-plus.version>
3.
4.3
</mybatis-plus.version>
<mybatis.spring.version>
2.0.
6
</mybatis.spring.version>
<mybatis-plus.version>
3.
2.0
</mybatis-plus.version>
<mybatis.spring.version>
2.0.
1
</mybatis.spring.version>
<cron.utils.version>
9.1.3
</cron.utils.version>
<druid.version>
1.2.4
</druid.version>
<h2.version>
1.4.200
</h2.version>
...
...
tools/dependencies/known-dependencies.txt
浏览文件 @
43b44239
...
...
@@ -139,7 +139,7 @@ joda-time-2.5.jar
jpam-1.1.jar
jsch-0.1.42.jar
jsp-api-2.1.jar
jsqlparser-
4.0
.jar
jsqlparser-
2.1
.jar
jsr305-3.0.0.jar
jta-1.1.jar
jul-to-slf4j-1.7.32.jar
...
...
@@ -153,13 +153,13 @@ logback-core-1.2.3.jar
lz4-1.3.0.jar
mapstruct-1.2.0.Final.jar
mssql-jdbc-6.1.0.jre8.jar
mybatis-3.5.
7
.jar
mybatis-plus-3.
4.3
.jar
mybatis-plus-annotation-3.
4.3
.jar
mybatis-plus-boot-starter-3.
4.3
.jar
mybatis-plus-core-3.
4.3
.jar
mybatis-plus-extension-3.
4.3
.jar
mybatis-spring-2.0.
6
.jar
mybatis-3.5.
2
.jar
mybatis-plus-3.
2.0
.jar
mybatis-plus-annotation-3.
2.0
.jar
mybatis-plus-boot-starter-3.
2.0
.jar
mybatis-plus-core-3.
2.0
.jar
mybatis-plus-extension-3.
2.0
.jar
mybatis-spring-2.0.
2
.jar
netty-3.6.2.Final.jar
netty-all-4.1.53.Final.jar
opencsv-2.3.jar
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录