Browse Source

Merge pull request #718 from dailidong/dev

use right desc
pull/2/head
dailidong 5 years ago committed by GitHub
parent
commit
1a2a931ca7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java
  2. 2
      escheduler-api/src/main/java/cn/escheduler/api/service/LoggerService.java
  3. 2
      escheduler-api/src/main/java/cn/escheduler/api/service/SessionService.java

2
escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java

@ -30,7 +30,7 @@ public enum Status {
// DB_OPERATION_ERROR(10005, "database operation error"), // DB_OPERATION_ERROR(10005, "database operation error"),
HDFS_OPERATION_ERROR(10006, "hdfs operation error"), HDFS_OPERATION_ERROR(10006, "hdfs operation error"),
UPDATE_FAILED(10007, "updateProcessInstance failed"), UPDATE_FAILED(10007, "updateProcessInstance failed"),
TASK_INSTANCE_HOST_NOT_FOUND(10008, "task instance does not set host"), TASK_INSTANCE_NOT_FOUND(10008, "task instance not found"),
TENANT_NAME_EXIST(10009, "tenant code already exists"), TENANT_NAME_EXIST(10009, "tenant code already exists"),
USER_NOT_EXIST(10010, "user {0} not exists"), USER_NOT_EXIST(10010, "user {0} not exists"),
ALERT_GROUP_NOT_EXIST(10011, "alarm group not found"), ALERT_GROUP_NOT_EXIST(10011, "alarm group not found"),

2
escheduler-api/src/main/java/cn/escheduler/api/service/LoggerService.java

@ -53,7 +53,7 @@ public class LoggerService {
TaskInstance taskInstance = processDao.findTaskInstanceById(taskInstId); TaskInstance taskInstance = processDao.findTaskInstanceById(taskInstId);
String host = taskInstance.getHost(); String host = taskInstance.getHost();
if(StringUtils.isEmpty(host)){ if(StringUtils.isEmpty(host)){
return new Result(Status.TASK_INSTANCE_HOST_NOT_FOUND.getCode(), Status.TASK_INSTANCE_HOST_NOT_FOUND.getMsg()); return new Result(Status.TASK_INSTANCE_NOT_FOUND.getCode(), Status.TASK_INSTANCE_NOT_FOUND.getMsg());
} }

2
escheduler-api/src/main/java/cn/escheduler/api/service/SessionService.java

@ -86,8 +86,6 @@ public class SessionService extends BaseService{
// logined // logined
List<Session> sessionList = sessionMapper.queryByUserId(user.getId()); List<Session> sessionList = sessionMapper.queryByUserId(user.getId());
Date now = new Date(); Date now = new Date();
/** /**

Loading…
Cancel
Save