Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
89b5ea93
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
706
Star
9572
Fork
3514
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
89b5ea93
编写于
5月 10, 2019
作者:
B
bao liang
提交者:
GitHub
5月 10, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #275 from lenboo/branch-1.0.2
handle %; physical delete;check before delete project
上级
2347773a
cd4c9f93
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
54 addition
and
2 deletion
+54
-2
escheduler-api/src/main/java/cn/escheduler/api/controller/AccessTokenController.java
...a/cn/escheduler/api/controller/AccessTokenController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/AlertGroupController.java
...va/cn/escheduler/api/controller/AlertGroupController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/DataSourceController.java
...va/cn/escheduler/api/controller/DataSourceController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java
...scheduler/api/controller/ProcessDefinitionController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessInstanceController.java
.../escheduler/api/controller/ProcessInstanceController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/ProjectController.java
.../java/cn/escheduler/api/controller/ProjectController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/QueueController.java
...in/java/cn/escheduler/api/controller/QueueController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/ResourcesController.java
...ava/cn/escheduler/api/controller/ResourcesController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/SchedulerController.java
...ava/cn/escheduler/api/controller/SchedulerController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/TaskInstanceController.java
.../cn/escheduler/api/controller/TaskInstanceController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/TenantController.java
...n/java/cn/escheduler/api/controller/TenantController.java
+3
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java
...in/java/cn/escheduler/api/controller/UsersController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/WorkerGroupController.java
...a/cn/escheduler/api/controller/WorkerGroupController.java
+2
-0
escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java
...ler-api/src/main/java/cn/escheduler/api/enums/Status.java
+1
-0
escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java
...c/main/java/cn/escheduler/api/service/ProjectService.java
+11
-0
escheduler-common/src/main/java/cn/escheduler/common/utils/ParameterUtils.java
.../main/java/cn/escheduler/common/utils/ParameterUtils.java
+14
-0
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapperProvider.java
.../java/cn/escheduler/dao/mapper/ProjectMapperProvider.java
+1
-2
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/controller/AccessTokenController.java
浏览文件 @
89b5ea93
...
...
@@ -22,6 +22,7 @@ import cn.escheduler.api.service.AccessTokenService;
import
cn.escheduler.api.service.UsersService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -113,6 +114,7 @@ public class AccessTokenController extends BaseController{
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
return
returnDataListPaging
(
result
);
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
accessTokenService
.
queryAccessTokenList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/AlertGroupController.java
浏览文件 @
89b5ea93
...
...
@@ -20,6 +20,7 @@ import cn.escheduler.api.service.AlertGroupService;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.AlertType
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -109,6 +110,7 @@ public class AlertGroupController extends BaseController{
return
returnDataListPaging
(
result
);
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
alertGroupService
.
listPaging
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/DataSourceController.java
浏览文件 @
89b5ea93
...
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.service.DataSourceService;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.DbType
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -182,6 +183,7 @@ public class DataSourceController extends BaseController {
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
)
{
return
returnDataListPaging
(
result
);
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
dataSourceService
.
queryDataSourceListPaging
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
)
{
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java
浏览文件 @
89b5ea93
...
...
@@ -20,6 +20,7 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.ProcessDefinitionService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -235,6 +236,7 @@ public class ProcessDefinitionController extends BaseController{
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
return
returnDataListPaging
(
result
);
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
processDefinitionService
.
queryProcessDefinitionListPaging
(
loginUser
,
projectName
,
searchVal
,
pageNo
,
pageSize
,
userId
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessInstanceController.java
浏览文件 @
89b5ea93
...
...
@@ -22,6 +22,7 @@ import cn.escheduler.api.utils.Constants;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.ExecutionStatus
;
import
cn.escheduler.common.enums.Flag
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -72,6 +73,7 @@ public class ProcessInstanceController extends BaseController{
"search value:{},state type:{},host:{},start time:{}, end time:{},page number:{}, page size:{}"
,
loginUser
.
getUserName
(),
projectName
,
processDefinitionId
,
searchVal
,
stateType
,
host
,
startTime
,
endTime
,
pageNo
,
pageSize
);
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
Map
<
String
,
Object
>
result
=
processInstanceService
.
queryProcessInstanceList
(
loginUser
,
projectName
,
processDefinitionId
,
startTime
,
endTime
,
searchVal
,
stateType
,
host
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/ProjectController.java
浏览文件 @
89b5ea93
...
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.ProjectService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -134,6 +135,7 @@ public class ProjectController extends BaseController {
try
{
logger
.
info
(
"login user {}, query project list paging"
,
loginUser
.
getUserName
());
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
Map
<
String
,
Object
>
result
=
projectService
.
queryProjectListPaging
(
loginUser
,
pageSize
,
pageNo
,
searchVal
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
)
{
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/QueueController.java
浏览文件 @
89b5ea93
...
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.QueueService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -82,6 +83,7 @@ public class QueueController extends BaseController{
return
returnDataListPaging
(
result
);
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
queueService
.
queryList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/ResourcesController.java
浏览文件 @
89b5ea93
...
...
@@ -23,6 +23,7 @@ import cn.escheduler.api.utils.Constants;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.ResourceType
;
import
cn.escheduler.common.enums.UdfType
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.apache.commons.lang.StringUtils
;
import
org.slf4j.Logger
;
...
...
@@ -146,6 +147,7 @@ public class ResourcesController extends BaseController{
return
returnDataListPaging
(
result
);
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
resourceService
.
queryResourceListPaging
(
loginUser
,
type
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/SchedulerController.java
浏览文件 @
89b5ea93
...
...
@@ -24,6 +24,7 @@ import cn.escheduler.common.enums.FailureStrategy;
import
cn.escheduler.common.enums.Priority
;
import
cn.escheduler.common.enums.ReleaseState
;
import
cn.escheduler.common.enums.WarningType
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -201,6 +202,7 @@ public class SchedulerController extends BaseController{
logger
.
info
(
"login user {}, query schedule, project name: {}, process definition id: {}"
,
loginUser
.
getUserName
(),
projectName
,
processDefinitionId
);
try
{
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
Map
<
String
,
Object
>
result
=
schedulerService
.
querySchedule
(
loginUser
,
projectName
,
processDefinitionId
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/TaskInstanceController.java
浏览文件 @
89b5ea93
...
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.service.TaskInstanceService;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.ExecutionStatus
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -68,6 +69,7 @@ public class TaskInstanceController extends BaseController{
try
{
logger
.
info
(
"query task instance list, project name:{},process instance:{}, search value:{},task name:{}, state type:{}, host:{}, start:{}, end:{}"
,
projectName
,
processInstanceId
,
searchVal
,
taskName
,
stateType
,
host
,
startTime
,
endTime
);
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
Map
<
String
,
Object
>
result
=
taskInstanceService
.
queryTaskListPaging
(
loginUser
,
projectName
,
processInstanceId
,
taskName
,
startTime
,
endTime
,
searchVal
,
stateType
,
host
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/TenantController.java
浏览文件 @
89b5ea93
...
...
@@ -21,7 +21,9 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.TenantService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -98,6 +100,7 @@ public class TenantController extends BaseController{
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
return
returnDataListPaging
(
result
);
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
tenantService
.
queryTenantList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java
浏览文件 @
89b5ea93
...
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.UsersService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -101,6 +102,7 @@ public class UsersController extends BaseController{
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
return
returnDataListPaging
(
result
);
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
usersService
.
queryUserList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/WorkerGroupController.java
浏览文件 @
89b5ea93
...
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.WorkerGroupService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -90,6 +91,7 @@ public class WorkerGroupController extends BaseController{
loginUser
.
getUserName
()
,
pageNo
,
pageSize
,
searchVal
);
try
{
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
Map
<
String
,
Object
>
result
=
workerGroupService
.
queryAllGroupPaging
(
pageNo
,
pageSize
,
searchVal
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java
浏览文件 @
89b5ea93
...
...
@@ -159,6 +159,7 @@ public enum Status {
NAME_NULL
(
10134
,
"name must be not null"
),
NAME_EXIST
(
10135
,
"name {0} already exists"
),
SAVE_ERROR
(
10136
,
"save error"
),
DELETE_PROJECT_ERROR_DEFINES_NOT_NULL
(
10137
,
"please delete the process definitions in project first!"
),
...
...
escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java
浏览文件 @
89b5ea93
...
...
@@ -20,9 +20,11 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.PageInfo
;
import
cn.escheduler.common.enums.UserType
;
import
cn.escheduler.dao.mapper.ProcessDefinitionMapper
;
import
cn.escheduler.dao.mapper.ProjectMapper
;
import
cn.escheduler.dao.mapper.ProjectUserMapper
;
import
cn.escheduler.dao.mapper.UserMapper
;
import
cn.escheduler.dao.model.ProcessDefinition
;
import
cn.escheduler.dao.model.Project
;
import
cn.escheduler.dao.model.ProjectUser
;
import
cn.escheduler.dao.model.User
;
...
...
@@ -55,6 +57,9 @@ public class ProjectService extends BaseService{
@Autowired
private
ProjectUserMapper
projectUserMapper
;
@Autowired
private
ProcessDefinitionMapper
processDefinitionMapper
;
/**
* create project
*
...
...
@@ -199,6 +204,12 @@ public class ProjectService extends BaseService{
if
(
checkResult
!=
null
)
{
return
checkResult
;
}
List
<
ProcessDefinition
>
processDefinitionList
=
processDefinitionMapper
.
queryAllDefinitionList
(
projectId
);
if
(
processDefinitionList
.
size
()
>
0
){
putMsg
(
result
,
Status
.
DELETE_PROJECT_ERROR_DEFINES_NOT_NULL
);
return
result
;
}
int
delete
=
projectMapper
.
delete
(
projectId
);
if
(
delete
>
0
)
{
...
...
escheduler-common/src/main/java/cn/escheduler/common/utils/ParameterUtils.java
浏览文件 @
89b5ea93
...
...
@@ -159,4 +159,18 @@ public class ParameterUtils {
}
return
null
;
}
/**
* handle escapes
* @param inputString
* @return
*/
public
static
String
handleEscapes
(
String
inputString
){
if
(
StringUtils
.
isNotEmpty
(
inputString
)){
return
inputString
.
replace
(
"%"
,
"////%"
);
}
return
inputString
;
}
}
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapperProvider.java
浏览文件 @
89b5ea93
...
...
@@ -55,8 +55,7 @@ public class ProjectMapperProvider {
public
String
delete
(
Map
<
String
,
Object
>
parameter
)
{
return
new
SQL
()
{
{
UPDATE
(
TABLE_NAME
);
SET
(
"flag=0"
);
DELETE_FROM
(
TABLE_NAME
);
WHERE
(
"`id`=#{projectId}"
);
}
}.
toString
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录