mirror of
https://gitee.com/dolphinscheduler/DolphinScheduler.git
synced 2024-12-05 05:38:30 +08:00
merge api constants into common constants (#1084)
* move updateTaskState into try/catch block in case of exception * fix NPE * using conf.getInt instead of getString * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath. for AlertDao, correct the spelling. * duplicate * refactor getTaskWorkerGroupId * add friendly log * update hearbeat thread num = 1 * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread * 1. move verifyTaskInstanceIsNull after taskInstance 2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable * fix the message * delete before check to avoid KeeperException$NoNodeException * fix the message * check processInstance state before delete tenant * check processInstance state before delete worker group * refactor * merge api constants into common constatns
This commit is contained in:
parent
b77d232dd6
commit
fb422af732
@ -19,8 +19,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.AccessTokenService;
|
import org.apache.dolphinscheduler.api.service.AccessTokenService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
package org.apache.dolphinscheduler.api.controller;
|
package org.apache.dolphinscheduler.api.controller;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.service.AlertGroupService;
|
import org.apache.dolphinscheduler.api.service.AlertGroupService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.AlertType;
|
import org.apache.dolphinscheduler.common.enums.AlertType;
|
||||||
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
package org.apache.dolphinscheduler.api.controller;
|
package org.apache.dolphinscheduler.api.controller;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.dao.entity.Resource;
|
import org.apache.dolphinscheduler.dao.entity.Resource;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
|
@ -18,8 +18,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.service.DataAnalysisService;
|
import org.apache.dolphinscheduler.api.service.DataAnalysisService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
|
@ -18,8 +18,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.DataSourceService;
|
import org.apache.dolphinscheduler.api.service.DataSourceService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.DbType;
|
import org.apache.dolphinscheduler.common.enums.DbType;
|
||||||
import org.apache.dolphinscheduler.common.utils.CommonUtils;
|
import org.apache.dolphinscheduler.common.utils.CommonUtils;
|
||||||
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
||||||
|
@ -20,8 +20,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
import org.apache.dolphinscheduler.api.enums.ExecuteType;
|
import org.apache.dolphinscheduler.api.enums.ExecuteType;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.ExecutorService;
|
import org.apache.dolphinscheduler.api.service.ExecutorService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.*;
|
import io.swagger.annotations.*;
|
||||||
import org.apache.dolphinscheduler.common.enums.*;
|
import org.apache.dolphinscheduler.common.enums.*;
|
||||||
|
@ -18,8 +18,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.service.LoggerService;
|
import org.apache.dolphinscheduler.api.service.LoggerService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
|
@ -20,8 +20,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.SessionService;
|
import org.apache.dolphinscheduler.api.service.SessionService;
|
||||||
import org.apache.dolphinscheduler.api.service.UsersService;
|
import org.apache.dolphinscheduler.api.service.UsersService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.*;
|
import io.swagger.annotations.*;
|
||||||
import org.apache.commons.httpclient.HttpStatus;
|
import org.apache.commons.httpclient.HttpStatus;
|
||||||
|
@ -18,8 +18,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.service.MonitorService;
|
import org.apache.dolphinscheduler.api.service.MonitorService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
@ -18,8 +18,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
|
import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.*;
|
import io.swagger.annotations.*;
|
||||||
|
@ -18,8 +18,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.ProcessInstanceService;
|
import org.apache.dolphinscheduler.api.service.ProcessInstanceService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
||||||
import org.apache.dolphinscheduler.common.enums.Flag;
|
import org.apache.dolphinscheduler.common.enums.Flag;
|
||||||
import org.apache.dolphinscheduler.common.queue.ITaskQueue;
|
import org.apache.dolphinscheduler.common.queue.ITaskQueue;
|
||||||
|
@ -20,8 +20,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
|
import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
|
||||||
import org.apache.dolphinscheduler.api.service.ProjectService;
|
import org.apache.dolphinscheduler.api.service.ProjectService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
@ -19,8 +19,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.QueueService;
|
import org.apache.dolphinscheduler.api.service.QueueService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
@ -19,8 +19,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.ResourcesService;
|
import org.apache.dolphinscheduler.api.service.ResourcesService;
|
||||||
import org.apache.dolphinscheduler.api.service.UdfFuncService;
|
import org.apache.dolphinscheduler.api.service.UdfFuncService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.ResourceType;
|
import org.apache.dolphinscheduler.common.enums.ResourceType;
|
||||||
import org.apache.dolphinscheduler.common.enums.UdfType;
|
import org.apache.dolphinscheduler.common.enums.UdfType;
|
||||||
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
||||||
|
@ -36,8 +36,8 @@ import springfox.documentation.annotations.ApiIgnore;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import static org.apache.dolphinscheduler.api.utils.Constants.SESSION_USER;
|
|
||||||
import static org.apache.dolphinscheduler.api.enums.Status.*;
|
import static org.apache.dolphinscheduler.api.enums.Status.*;
|
||||||
|
import static org.apache.dolphinscheduler.common.Constants.SESSION_USER;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* schedule controller
|
* schedule controller
|
||||||
|
@ -18,8 +18,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.service.TaskInstanceService;
|
import org.apache.dolphinscheduler.api.service.TaskInstanceService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
||||||
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
|
@ -18,8 +18,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.service.TaskRecordService;
|
import org.apache.dolphinscheduler.api.service.TaskRecordService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
@ -19,8 +19,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.TenantService;
|
import org.apache.dolphinscheduler.api.service.TenantService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
@ -19,8 +19,8 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.UsersService;
|
import org.apache.dolphinscheduler.api.service.UsersService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
@ -20,13 +20,13 @@ package org.apache.dolphinscheduler.api.controller;
|
|||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.WorkerGroupService;
|
import org.apache.dolphinscheduler.api.service.WorkerGroupService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
import io.swagger.annotations.ApiImplicitParams;
|
import io.swagger.annotations.ApiImplicitParams;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
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;
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
package org.apache.dolphinscheduler.api.interceptor;
|
package org.apache.dolphinscheduler.api.interceptor;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.service.SessionService;
|
import org.apache.dolphinscheduler.api.service.SessionService;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.dao.entity.Session;
|
import org.apache.dolphinscheduler.dao.entity.Session;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
|
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
package org.apache.dolphinscheduler.api.service;
|
package org.apache.dolphinscheduler.api.service;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.AccessToken;
|
import org.apache.dolphinscheduler.dao.entity.AccessToken;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
package org.apache.dolphinscheduler.api.service;
|
package org.apache.dolphinscheduler.api.service;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.AlertType;
|
import org.apache.dolphinscheduler.common.enums.AlertType;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.AlertGroup;
|
import org.apache.dolphinscheduler.dao.entity.AlertGroup;
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
package org.apache.dolphinscheduler.api.service;
|
package org.apache.dolphinscheduler.api.service;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.common.utils.HadoopUtils;
|
import org.apache.dolphinscheduler.common.utils.HadoopUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
|
@ -21,9 +21,8 @@ import org.apache.dolphinscheduler.api.dto.CommandStateCount;
|
|||||||
import org.apache.dolphinscheduler.api.dto.DefineUserDto;
|
import org.apache.dolphinscheduler.api.dto.DefineUserDto;
|
||||||
import org.apache.dolphinscheduler.api.dto.TaskCountDto;
|
import org.apache.dolphinscheduler.api.dto.TaskCountDto;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.CommandType;
|
import org.apache.dolphinscheduler.common.enums.CommandType;
|
||||||
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.common.queue.ITaskQueue;
|
import org.apache.dolphinscheduler.common.queue.ITaskQueue;
|
||||||
import org.apache.dolphinscheduler.common.queue.TaskQueueFactory;
|
import org.apache.dolphinscheduler.common.queue.TaskQueueFactory;
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
package org.apache.dolphinscheduler.api.service;
|
package org.apache.dolphinscheduler.api.service;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.DbType;
|
import org.apache.dolphinscheduler.common.enums.DbType;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.common.job.db.*;
|
import org.apache.dolphinscheduler.common.job.db.*;
|
||||||
|
@ -19,7 +19,7 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.ExecuteType;
|
import org.apache.dolphinscheduler.api.enums.ExecuteType;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.*;
|
import org.apache.dolphinscheduler.common.enums.*;
|
||||||
import org.apache.dolphinscheduler.common.utils.DateUtils;
|
import org.apache.dolphinscheduler.common.utils.DateUtils;
|
||||||
import org.apache.dolphinscheduler.common.utils.JSONUtils;
|
import org.apache.dolphinscheduler.common.utils.JSONUtils;
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
package org.apache.dolphinscheduler.api.service;
|
package org.apache.dolphinscheduler.api.service;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.ZookeeperMonitor;
|
import org.apache.dolphinscheduler.api.utils.ZookeeperMonitor;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.ZKNodeType;
|
import org.apache.dolphinscheduler.common.enums.ZKNodeType;
|
||||||
import org.apache.dolphinscheduler.dao.MonitorDBDao;
|
import org.apache.dolphinscheduler.dao.MonitorDBDao;
|
||||||
import org.apache.dolphinscheduler.common.model.MasterServer;
|
import org.apache.dolphinscheduler.common.model.MasterServer;
|
||||||
|
@ -19,8 +19,8 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
import org.apache.dolphinscheduler.api.dto.treeview.Instance;
|
import org.apache.dolphinscheduler.api.dto.treeview.Instance;
|
||||||
import org.apache.dolphinscheduler.api.dto.treeview.TreeViewDto;
|
import org.apache.dolphinscheduler.api.dto.treeview.TreeViewDto;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.*;
|
import org.apache.dolphinscheduler.common.enums.*;
|
||||||
import org.apache.dolphinscheduler.common.graph.DAG;
|
import org.apache.dolphinscheduler.common.graph.DAG;
|
||||||
import org.apache.dolphinscheduler.common.model.TaskNode;
|
import org.apache.dolphinscheduler.common.model.TaskNode;
|
||||||
|
@ -19,9 +19,9 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
import org.apache.dolphinscheduler.api.dto.gantt.GanttDto;
|
import org.apache.dolphinscheduler.api.dto.gantt.GanttDto;
|
||||||
import org.apache.dolphinscheduler.api.dto.gantt.Task;
|
import org.apache.dolphinscheduler.api.dto.gantt.Task;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.DependResult;
|
import org.apache.dolphinscheduler.common.enums.DependResult;
|
||||||
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
||||||
import org.apache.dolphinscheduler.common.enums.Flag;
|
import org.apache.dolphinscheduler.common.enums.Flag;
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
package org.apache.dolphinscheduler.api.service;
|
package org.apache.dolphinscheduler.api.service;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
|
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
|
||||||
import org.apache.dolphinscheduler.dao.entity.Project;
|
import org.apache.dolphinscheduler.dao.entity.Project;
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
package org.apache.dolphinscheduler.api.service;
|
package org.apache.dolphinscheduler.api.service;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.dao.entity.Queue;
|
import org.apache.dolphinscheduler.dao.entity.Queue;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import org.apache.dolphinscheduler.dao.mapper.QueueMapper;
|
import org.apache.dolphinscheduler.dao.mapper.QueueMapper;
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
package org.apache.dolphinscheduler.api.service;
|
package org.apache.dolphinscheduler.api.service;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.ResourceType;
|
import org.apache.dolphinscheduler.common.enums.ResourceType;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.common.utils.FileUtils;
|
import org.apache.dolphinscheduler.common.utils.FileUtils;
|
||||||
|
@ -19,8 +19,8 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.dto.ScheduleParam;
|
import org.apache.dolphinscheduler.api.dto.ScheduleParam;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
|
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
|
||||||
import org.apache.dolphinscheduler.common.enums.Priority;
|
import org.apache.dolphinscheduler.common.enums.Priority;
|
||||||
import org.apache.dolphinscheduler.common.enums.ReleaseState;
|
import org.apache.dolphinscheduler.common.enums.ReleaseState;
|
||||||
|
@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.controller.BaseController;
|
import org.apache.dolphinscheduler.api.controller.BaseController;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.Session;
|
import org.apache.dolphinscheduler.dao.entity.Session;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
|
@ -18,8 +18,8 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
||||||
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
||||||
import org.apache.dolphinscheduler.common.utils.DateUtils;
|
import org.apache.dolphinscheduler.common.utils.DateUtils;
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
package org.apache.dolphinscheduler.api.service;
|
package org.apache.dolphinscheduler.api.service;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.dao.TaskRecordDao;
|
import org.apache.dolphinscheduler.dao.TaskRecordDao;
|
||||||
import org.apache.dolphinscheduler.dao.entity.TaskRecord;
|
import org.apache.dolphinscheduler.dao.entity.TaskRecord;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
@ -20,10 +20,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
||||||
import org.apache.dolphinscheduler.common.utils.HadoopUtils;
|
import org.apache.dolphinscheduler.common.utils.HadoopUtils;
|
||||||
import org.apache.dolphinscheduler.common.utils.PropertyUtils;
|
import org.apache.dolphinscheduler.common.utils.PropertyUtils;
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
package org.apache.dolphinscheduler.api.service;
|
package org.apache.dolphinscheduler.api.service;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.UdfType;
|
import org.apache.dolphinscheduler.common.enums.UdfType;
|
||||||
import org.apache.dolphinscheduler.common.utils.PropertyUtils;
|
import org.apache.dolphinscheduler.common.utils.PropertyUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.Resource;
|
import org.apache.dolphinscheduler.dao.entity.Resource;
|
||||||
|
@ -18,9 +18,9 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.CheckUtils;
|
import org.apache.dolphinscheduler.api.utils.CheckUtils;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
import org.apache.dolphinscheduler.api.utils.Result;
|
import org.apache.dolphinscheduler.api.utils.Result;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.ResourceType;
|
import org.apache.dolphinscheduler.common.enums.ResourceType;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
||||||
|
@ -17,9 +17,8 @@
|
|||||||
package org.apache.dolphinscheduler.api.service;
|
package org.apache.dolphinscheduler.api.service;
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
||||||
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
|
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
|
@ -18,6 +18,7 @@ package org.apache.dolphinscheduler.api.utils;
|
|||||||
|
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.task.AbstractParameters;
|
import org.apache.dolphinscheduler.common.task.AbstractParameters;
|
||||||
import org.apache.dolphinscheduler.common.utils.JSONUtils;
|
import org.apache.dolphinscheduler.common.utils.JSONUtils;
|
||||||
import org.apache.dolphinscheduler.common.utils.TaskParametersUtils;
|
import org.apache.dolphinscheduler.common.utils.TaskParametersUtils;
|
||||||
|
@ -1,129 +0,0 @@
|
|||||||
/*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
|
||||||
* this work for additional information regarding copyright ownership.
|
|
||||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
* (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package org.apache.dolphinscheduler.api.utils;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* web application constants
|
|
||||||
*/
|
|
||||||
public class Constants {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* status
|
|
||||||
*/
|
|
||||||
public static final String STATUS = "status";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* message
|
|
||||||
*/
|
|
||||||
public static final String MSG = "msg";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* data total
|
|
||||||
* 数据总数
|
|
||||||
*/
|
|
||||||
public static final String COUNT = "count";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* page size
|
|
||||||
* 每页数据条数
|
|
||||||
*/
|
|
||||||
public static final String PAGE_SIZE = "pageSize";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* current page no
|
|
||||||
* 当前页码
|
|
||||||
*/
|
|
||||||
public static final String PAGE_NUMBER = "pageNo";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* result
|
|
||||||
*/
|
|
||||||
public static final String RESULT = "result";
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public static final String DATA_LIST = "data";
|
|
||||||
|
|
||||||
public static final String TOTAL_LIST = "totalList";
|
|
||||||
|
|
||||||
public static final String CURRENT_PAGE = "currentPage";
|
|
||||||
|
|
||||||
public static final String TOTAL_PAGE = "totalPage";
|
|
||||||
|
|
||||||
public static final String TOTAL = "total";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* session user
|
|
||||||
*/
|
|
||||||
public static final String SESSION_USER = "session.user";
|
|
||||||
|
|
||||||
public static final String SESSION_ID = "sessionId";
|
|
||||||
|
|
||||||
public static final String PASSWORD_DEFAULT = "******";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* driver
|
|
||||||
*/
|
|
||||||
public static final String ORG_POSTGRESQL_DRIVER = "org.postgresql.Driver";
|
|
||||||
public static final String COM_MYSQL_JDBC_DRIVER = "com.mysql.jdbc.Driver";
|
|
||||||
public static final String ORG_APACHE_HIVE_JDBC_HIVE_DRIVER = "org.apache.hive.jdbc.HiveDriver";
|
|
||||||
public static final String COM_CLICKHOUSE_JDBC_DRIVER = "ru.yandex.clickhouse.ClickHouseDriver";
|
|
||||||
public static final String COM_ORACLE_JDBC_DRIVER = "oracle.jdbc.driver.OracleDriver";
|
|
||||||
public static final String COM_SQLSERVER_JDBC_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* database type
|
|
||||||
*/
|
|
||||||
public static final String MYSQL = "MYSQL";
|
|
||||||
public static final String POSTGRESQL = "POSTGRESQL";
|
|
||||||
public static final String HIVE = "HIVE";
|
|
||||||
public static final String SPARK = "SPARK";
|
|
||||||
public static final String CLICKHOUSE = "CLICKHOUSE";
|
|
||||||
public static final String ORACLE = "ORACLE";
|
|
||||||
public static final String SQLSERVER = "SQLSERVER";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* jdbc url
|
|
||||||
*/
|
|
||||||
public static final String JDBC_MYSQL = "jdbc:mysql://";
|
|
||||||
public static final String JDBC_POSTGRESQL = "jdbc:postgresql://";
|
|
||||||
public static final String JDBC_HIVE_2 = "jdbc:hive2://";
|
|
||||||
public static final String JDBC_CLICKHOUSE = "jdbc:clickhouse://";
|
|
||||||
public static final String JDBC_ORACLE = "jdbc:oracle:thin:@//";
|
|
||||||
public static final String JDBC_SQLSERVER = "jdbc:sqlserver://";
|
|
||||||
|
|
||||||
|
|
||||||
public static final String ADDRESS = "address";
|
|
||||||
public static final String DATABASE = "database";
|
|
||||||
public static final String JDBC_URL = "jdbcUrl";
|
|
||||||
public static final String PRINCIPAL = "principal";
|
|
||||||
public static final String USER = "user";
|
|
||||||
public static final String PASSWORD = "password";
|
|
||||||
public static final String OTHER = "other";
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* session timeout
|
|
||||||
*/
|
|
||||||
public static final int SESSION_TIME_OUT = 7200;
|
|
||||||
public static final int maxFileSize = 1024 * 1024 * 1024;
|
|
||||||
public static final String UDF = "UDF";
|
|
||||||
public static final String CLASS = "class";
|
|
||||||
public static final String RECEIVERS = "receivers";
|
|
||||||
public static final String RECEIVERS_CC = "receiversCc";
|
|
||||||
}
|
|
@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
|
@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.DbType;
|
import org.apache.dolphinscheduler.common.enums.DbType;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
|
@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Ignore;
|
import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
|
@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.DependResult;
|
import org.apache.dolphinscheduler.common.enums.DependResult;
|
||||||
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
|
@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.ResourceType;
|
import org.apache.dolphinscheduler.common.enums.ResourceType;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
|
@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.ReleaseState;
|
import org.apache.dolphinscheduler.common.enums.ReleaseState;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.Project;
|
import org.apache.dolphinscheduler.dao.entity.Project;
|
||||||
|
@ -18,8 +18,8 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
|
@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
|
@ -18,8 +18,8 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
|
||||||
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
||||||
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
|
@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.service;
|
|||||||
|
|
||||||
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
import org.apache.dolphinscheduler.api.ApiApplicationServer;
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.utils.Constants;
|
import org.apache.dolphinscheduler.common.Constants;
|
||||||
import org.apache.dolphinscheduler.common.enums.UserType;
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
||||||
import org.apache.dolphinscheduler.dao.entity.User;
|
import org.apache.dolphinscheduler.dao.entity.User;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
|
@ -491,9 +491,6 @@ public final class Constants {
|
|||||||
|
|
||||||
public static String TASK_RECORD_TABLE_HISTORY_HIVE_LOG = "eamp_hive_hist_log_hd";
|
public static String TASK_RECORD_TABLE_HISTORY_HIVE_LOG = "eamp_hive_hist_log_hd";
|
||||||
|
|
||||||
public static final String STATUS = "status";
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* command parameter keys
|
* command parameter keys
|
||||||
@ -665,7 +662,7 @@ public final class Constants {
|
|||||||
/**
|
/**
|
||||||
* --class CLASS_NAME
|
* --class CLASS_NAME
|
||||||
*/
|
*/
|
||||||
public static final String CLASS = "--class";
|
public static final String MAIN_CLASS = "--class";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* --driver-cores NUM
|
* --driver-cores NUM
|
||||||
@ -935,4 +932,108 @@ public final class Constants {
|
|||||||
ExecutionStatus.WAITTING_THREAD.ordinal(),
|
ExecutionStatus.WAITTING_THREAD.ordinal(),
|
||||||
ExecutionStatus.WAITTING_DEPEND.ordinal()
|
ExecutionStatus.WAITTING_DEPEND.ordinal()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* status
|
||||||
|
*/
|
||||||
|
public static final String STATUS = "status";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* message
|
||||||
|
*/
|
||||||
|
public static final String MSG = "msg";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* data total
|
||||||
|
* 数据总数
|
||||||
|
*/
|
||||||
|
public static final String COUNT = "count";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* page size
|
||||||
|
* 每页数据条数
|
||||||
|
*/
|
||||||
|
public static final String PAGE_SIZE = "pageSize";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* current page no
|
||||||
|
* 当前页码
|
||||||
|
*/
|
||||||
|
public static final String PAGE_NUMBER = "pageNo";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* result
|
||||||
|
*/
|
||||||
|
public static final String RESULT = "result";
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public static final String DATA_LIST = "data";
|
||||||
|
|
||||||
|
public static final String TOTAL_LIST = "totalList";
|
||||||
|
|
||||||
|
public static final String CURRENT_PAGE = "currentPage";
|
||||||
|
|
||||||
|
public static final String TOTAL_PAGE = "totalPage";
|
||||||
|
|
||||||
|
public static final String TOTAL = "total";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* session user
|
||||||
|
*/
|
||||||
|
public static final String SESSION_USER = "session.user";
|
||||||
|
|
||||||
|
public static final String SESSION_ID = "sessionId";
|
||||||
|
|
||||||
|
public static final String PASSWORD_DEFAULT = "******";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* driver
|
||||||
|
*/
|
||||||
|
public static final String ORG_POSTGRESQL_DRIVER = "org.postgresql.Driver";
|
||||||
|
public static final String COM_MYSQL_JDBC_DRIVER = "com.mysql.jdbc.Driver";
|
||||||
|
public static final String ORG_APACHE_HIVE_JDBC_HIVE_DRIVER = "org.apache.hive.jdbc.HiveDriver";
|
||||||
|
public static final String COM_CLICKHOUSE_JDBC_DRIVER = "ru.yandex.clickhouse.ClickHouseDriver";
|
||||||
|
public static final String COM_ORACLE_JDBC_DRIVER = "oracle.jdbc.driver.OracleDriver";
|
||||||
|
public static final String COM_SQLSERVER_JDBC_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* database type
|
||||||
|
*/
|
||||||
|
public static final String MYSQL = "MYSQL";
|
||||||
|
public static final String POSTGRESQL = "POSTGRESQL";
|
||||||
|
public static final String HIVE = "HIVE";
|
||||||
|
public static final String SPARK = "SPARK";
|
||||||
|
public static final String CLICKHOUSE = "CLICKHOUSE";
|
||||||
|
public static final String ORACLE = "ORACLE";
|
||||||
|
public static final String SQLSERVER = "SQLSERVER";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* jdbc url
|
||||||
|
*/
|
||||||
|
public static final String JDBC_MYSQL = "jdbc:mysql://";
|
||||||
|
public static final String JDBC_POSTGRESQL = "jdbc:postgresql://";
|
||||||
|
public static final String JDBC_HIVE_2 = "jdbc:hive2://";
|
||||||
|
public static final String JDBC_CLICKHOUSE = "jdbc:clickhouse://";
|
||||||
|
public static final String JDBC_ORACLE = "jdbc:oracle:thin:@//";
|
||||||
|
public static final String JDBC_SQLSERVER = "jdbc:sqlserver://";
|
||||||
|
|
||||||
|
|
||||||
|
public static final String ADDRESS = "address";
|
||||||
|
public static final String DATABASE = "database";
|
||||||
|
public static final String JDBC_URL = "jdbcUrl";
|
||||||
|
public static final String PRINCIPAL = "principal";
|
||||||
|
public static final String OTHER = "other";
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* session timeout
|
||||||
|
*/
|
||||||
|
public static final int SESSION_TIME_OUT = 7200;
|
||||||
|
public static final int maxFileSize = 1024 * 1024 * 1024;
|
||||||
|
public static final String UDF = "UDF";
|
||||||
|
public static final String CLASS = "class";
|
||||||
|
public static final String RECEIVERS = "receivers";
|
||||||
|
public static final String RECEIVERS_CC = "receiversCc";
|
||||||
}
|
}
|
||||||
|
@ -55,7 +55,7 @@ public class SparkArgsUtils {
|
|||||||
if(param.getProgramType() !=null ){
|
if(param.getProgramType() !=null ){
|
||||||
if(param.getProgramType()!=ProgramType.PYTHON){
|
if(param.getProgramType()!=ProgramType.PYTHON){
|
||||||
if (StringUtils.isNotEmpty(param.getMainClass())) {
|
if (StringUtils.isNotEmpty(param.getMainClass())) {
|
||||||
args.add(Constants.CLASS);
|
args.add(Constants.MAIN_CLASS);
|
||||||
args.add(param.getMainClass());
|
args.add(param.getMainClass());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user