Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
淡淡忧伤的程序员
DolphinScheduler
提交
a0b0bae1
DolphinScheduler
项目概览
淡淡忧伤的程序员
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
48
Star
0
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,发现更多精彩内容 >>
提交
a0b0bae1
编写于
5月 07, 2019
作者:
B
baoliang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add handle escapes % ==> "\\\\%"
上级
516ae195
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
41 addition
and
0 deletion
+41
-0
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-common/src/main/java/cn/escheduler/common/utils/ParameterUtils.java
.../main/java/cn/escheduler/common/utils/ParameterUtils.java
+14
-0
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/controller/AccessTokenController.java
浏览文件 @
a0b0bae1
...
@@ -22,6 +22,7 @@ import cn.escheduler.api.service.AccessTokenService;
...
@@ -22,6 +22,7 @@ import cn.escheduler.api.service.AccessTokenService;
import
cn.escheduler.api.service.UsersService
;
import
cn.escheduler.api.service.UsersService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -113,6 +114,7 @@ public class AccessTokenController extends BaseController{
...
@@ -113,6 +114,7 @@ public class AccessTokenController extends BaseController{
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
accessTokenService
.
queryAccessTokenList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
result
=
accessTokenService
.
queryAccessTokenList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/AlertGroupController.java
浏览文件 @
a0b0bae1
...
@@ -20,6 +20,7 @@ import cn.escheduler.api.service.AlertGroupService;
...
@@ -20,6 +20,7 @@ import cn.escheduler.api.service.AlertGroupService;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.AlertType
;
import
cn.escheduler.common.enums.AlertType
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -109,6 +110,7 @@ public class AlertGroupController extends BaseController{
...
@@ -109,6 +110,7 @@ public class AlertGroupController extends BaseController{
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
alertGroupService
.
listPaging
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
result
=
alertGroupService
.
listPaging
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/DataSourceController.java
浏览文件 @
a0b0bae1
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.service.DataSourceService;
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.service.DataSourceService;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.DbType
;
import
cn.escheduler.common.enums.DbType
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -182,6 +183,7 @@ public class DataSourceController extends BaseController {
...
@@ -182,6 +183,7 @@ public class DataSourceController extends BaseController {
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
)
{
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
)
{
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
dataSourceService
.
queryDataSourceListPaging
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
result
=
dataSourceService
.
queryDataSourceListPaging
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java
浏览文件 @
a0b0bae1
...
@@ -20,6 +20,7 @@ import cn.escheduler.api.enums.Status;
...
@@ -20,6 +20,7 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.ProcessDefinitionService
;
import
cn.escheduler.api.service.ProcessDefinitionService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -235,6 +236,7 @@ public class ProcessDefinitionController extends BaseController{
...
@@ -235,6 +236,7 @@ public class ProcessDefinitionController extends BaseController{
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
processDefinitionService
.
queryProcessDefinitionListPaging
(
loginUser
,
projectName
,
searchVal
,
pageNo
,
pageSize
,
userId
);
result
=
processDefinitionService
.
queryProcessDefinitionListPaging
(
loginUser
,
projectName
,
searchVal
,
pageNo
,
pageSize
,
userId
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessInstanceController.java
浏览文件 @
a0b0bae1
...
@@ -22,6 +22,7 @@ import cn.escheduler.api.utils.Constants;
...
@@ -22,6 +22,7 @@ import cn.escheduler.api.utils.Constants;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.ExecutionStatus
;
import
cn.escheduler.common.enums.ExecutionStatus
;
import
cn.escheduler.common.enums.Flag
;
import
cn.escheduler.common.enums.Flag
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -72,6 +73,7 @@ public class ProcessInstanceController extends BaseController{
...
@@ -72,6 +73,7 @@ public class ProcessInstanceController extends BaseController{
"search value:{},state type:{},host:{},start time:{}, end time:{},page number:{}, page size:{}"
,
"search value:{},state type:{},host:{},start time:{}, end time:{},page number:{}, page size:{}"
,
loginUser
.
getUserName
(),
projectName
,
processDefinitionId
,
searchVal
,
stateType
,
host
,
loginUser
.
getUserName
(),
projectName
,
processDefinitionId
,
searchVal
,
stateType
,
host
,
startTime
,
endTime
,
pageNo
,
pageSize
);
startTime
,
endTime
,
pageNo
,
pageSize
);
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
Map
<
String
,
Object
>
result
=
processInstanceService
.
queryProcessInstanceList
(
Map
<
String
,
Object
>
result
=
processInstanceService
.
queryProcessInstanceList
(
loginUser
,
projectName
,
processDefinitionId
,
startTime
,
endTime
,
searchVal
,
stateType
,
host
,
pageNo
,
pageSize
);
loginUser
,
projectName
,
processDefinitionId
,
startTime
,
endTime
,
searchVal
,
stateType
,
host
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/ProjectController.java
浏览文件 @
a0b0bae1
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.ProjectService
;
import
cn.escheduler.api.service.ProjectService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -134,6 +135,7 @@ public class ProjectController extends BaseController {
...
@@ -134,6 +135,7 @@ public class ProjectController extends BaseController {
try
{
try
{
logger
.
info
(
"login user {}, query project list paging"
,
loginUser
.
getUserName
());
logger
.
info
(
"login user {}, query project list paging"
,
loginUser
.
getUserName
());
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
Map
<
String
,
Object
>
result
=
projectService
.
queryProjectListPaging
(
loginUser
,
pageSize
,
pageNo
,
searchVal
);
Map
<
String
,
Object
>
result
=
projectService
.
queryProjectListPaging
(
loginUser
,
pageSize
,
pageNo
,
searchVal
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/QueueController.java
浏览文件 @
a0b0bae1
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.QueueService
;
import
cn.escheduler.api.service.QueueService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -82,6 +83,7 @@ public class QueueController extends BaseController{
...
@@ -82,6 +83,7 @@ public class QueueController extends BaseController{
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
queueService
.
queryList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
result
=
queueService
.
queryList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/ResourcesController.java
浏览文件 @
a0b0bae1
...
@@ -23,6 +23,7 @@ import cn.escheduler.api.utils.Constants;
...
@@ -23,6 +23,7 @@ import cn.escheduler.api.utils.Constants;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.ResourceType
;
import
cn.escheduler.common.enums.ResourceType
;
import
cn.escheduler.common.enums.UdfType
;
import
cn.escheduler.common.enums.UdfType
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
@@ -146,6 +147,7 @@ public class ResourcesController extends BaseController{
...
@@ -146,6 +147,7 @@ public class ResourcesController extends BaseController{
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
resourceService
.
queryResourceListPaging
(
loginUser
,
type
,
searchVal
,
pageNo
,
pageSize
);
result
=
resourceService
.
queryResourceListPaging
(
loginUser
,
type
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/SchedulerController.java
浏览文件 @
a0b0bae1
...
@@ -24,6 +24,7 @@ import cn.escheduler.common.enums.FailureStrategy;
...
@@ -24,6 +24,7 @@ import cn.escheduler.common.enums.FailureStrategy;
import
cn.escheduler.common.enums.Priority
;
import
cn.escheduler.common.enums.Priority
;
import
cn.escheduler.common.enums.ReleaseState
;
import
cn.escheduler.common.enums.ReleaseState
;
import
cn.escheduler.common.enums.WarningType
;
import
cn.escheduler.common.enums.WarningType
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -201,6 +202,7 @@ public class SchedulerController extends BaseController{
...
@@ -201,6 +202,7 @@ public class SchedulerController extends BaseController{
logger
.
info
(
"login user {}, query schedule, project name: {}, process definition id: {}"
,
logger
.
info
(
"login user {}, query schedule, project name: {}, process definition id: {}"
,
loginUser
.
getUserName
(),
projectName
,
processDefinitionId
);
loginUser
.
getUserName
(),
projectName
,
processDefinitionId
);
try
{
try
{
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
Map
<
String
,
Object
>
result
=
schedulerService
.
querySchedule
(
loginUser
,
projectName
,
processDefinitionId
,
searchVal
,
pageNo
,
pageSize
);
Map
<
String
,
Object
>
result
=
schedulerService
.
querySchedule
(
loginUser
,
projectName
,
processDefinitionId
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/TaskInstanceController.java
浏览文件 @
a0b0bae1
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.service.TaskInstanceService;
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.service.TaskInstanceService;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.ExecutionStatus
;
import
cn.escheduler.common.enums.ExecutionStatus
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -68,6 +69,7 @@ public class TaskInstanceController extends BaseController{
...
@@ -68,6 +69,7 @@ public class TaskInstanceController extends BaseController{
try
{
try
{
logger
.
info
(
"query task instance list, project name:{},process instance:{}, search value:{},task name:{}, state type:{}, host:{}, start:{}, end:{}"
,
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
);
projectName
,
processInstanceId
,
searchVal
,
taskName
,
stateType
,
host
,
startTime
,
endTime
);
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
Map
<
String
,
Object
>
result
=
taskInstanceService
.
queryTaskListPaging
(
Map
<
String
,
Object
>
result
=
taskInstanceService
.
queryTaskListPaging
(
loginUser
,
projectName
,
processInstanceId
,
taskName
,
startTime
,
endTime
,
searchVal
,
stateType
,
host
,
pageNo
,
pageSize
);
loginUser
,
projectName
,
processInstanceId
,
taskName
,
startTime
,
endTime
,
searchVal
,
stateType
,
host
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/TenantController.java
浏览文件 @
a0b0bae1
...
@@ -21,7 +21,9 @@ import cn.escheduler.api.enums.Status;
...
@@ -21,7 +21,9 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.TenantService
;
import
cn.escheduler.api.service.TenantService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -98,6 +100,7 @@ public class TenantController extends BaseController{
...
@@ -98,6 +100,7 @@ public class TenantController extends BaseController{
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
tenantService
.
queryTenantList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
result
=
tenantService
.
queryTenantList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java
浏览文件 @
a0b0bae1
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.UsersService
;
import
cn.escheduler.api.service.UsersService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -101,6 +102,7 @@ public class UsersController extends BaseController{
...
@@ -101,6 +102,7 @@ public class UsersController extends BaseController{
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
}
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
result
=
usersService
.
queryUserList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
result
=
usersService
.
queryUserList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/WorkerGroupController.java
浏览文件 @
a0b0bae1
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.enums.Status;
import
cn.escheduler.api.service.WorkerGroupService
;
import
cn.escheduler.api.service.WorkerGroupService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.utils.ParameterUtils
;
import
cn.escheduler.dao.model.User
;
import
cn.escheduler.dao.model.User
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -90,6 +91,7 @@ public class WorkerGroupController extends BaseController{
...
@@ -90,6 +91,7 @@ public class WorkerGroupController extends BaseController{
loginUser
.
getUserName
()
,
pageNo
,
pageSize
,
searchVal
);
loginUser
.
getUserName
()
,
pageNo
,
pageSize
,
searchVal
);
try
{
try
{
searchVal
=
ParameterUtils
.
handleEscapes
(
searchVal
);
Map
<
String
,
Object
>
result
=
workerGroupService
.
queryAllGroupPaging
(
pageNo
,
pageSize
,
searchVal
);
Map
<
String
,
Object
>
result
=
workerGroupService
.
queryAllGroupPaging
(
pageNo
,
pageSize
,
searchVal
);
return
returnDataListPaging
(
result
);
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
...
escheduler-common/src/main/java/cn/escheduler/common/utils/ParameterUtils.java
浏览文件 @
a0b0bae1
...
@@ -159,4 +159,18 @@ public class ParameterUtils {
...
@@ -159,4 +159,18 @@ public class ParameterUtils {
}
}
return
null
;
return
null
;
}
}
/**
* handle escapes
* @param inputString
* @return
*/
public
static
String
handleEscapes
(
String
inputString
){
if
(
StringUtils
.
isNotEmpty
(
inputString
)){
return
inputString
.
replace
(
"%"
,
"////%"
);
}
return
inputString
;
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录