Merge pull request #3 from apache/dev (4bb044a4) · Commits · SUMMER2020 / students / proj-2002251

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -335,7 +335,7 @@ public class MailUtils {
		*/
		private static void handleException(Collection<String> receivers, Map<String, Object> retMap, Exception e) {
		logger.error("Send email to {} failed {}", receivers, e);
		retMap.put(Constants.MESSAGE, "Send email to {" + StringUtils.join(receivers, ",") + "} failed，" + e.toString());
		retMap.put(Constants.MESSAGE, "Send email to {" + String.join(",", receivers) + "} failed，" + e.toString());
		}

		}

+3 −6

Original line number	Diff line number	Diff line
		@@ -157,8 +157,7 @@ public class BaseController {
		* @return success result code
		*/
		public Result success(String msg, Object list) {
		Result result = getResult(msg, list);
		return result;
		return getResult(msg, list);
		}

		/**
		@@ -168,8 +167,7 @@ public class BaseController {
		* @return success result code
		*/
		public Result success(Object list) {
		Result result = getResult(Status.SUCCESS.getMsg(), list);
		return result;
		return getResult(Status.SUCCESS.getMsg(), list);
		}

		/**
		@@ -181,8 +179,7 @@ public class BaseController {
		* @return success result code
		*/
		public Result success(String msg, Map<String, Object> object) {
		Result result = getResult(msg, object);
		return result;
		return getResult(msg, object);
		}

		/**

+8 −8

Original line number	Diff line number	Diff line
		@@ -442,7 +442,7 @@ public class ProcessDefinitionController extends BaseController{
		loginUser.getUserName(), projectName, processDefinitionIds);

		Map<String, Object> result = new HashMap<>(5);
		List<Integer> deleteFailedIdList = new ArrayList<Integer>();
		List<String> deleteFailedIdList = new ArrayList<>();
		if(StringUtils.isNotEmpty(processDefinitionIds)){
		String[] processDefinitionIdArray = processDefinitionIds.split(",");

		@@ -451,17 +451,17 @@ public class ProcessDefinitionController extends BaseController{
		try {
		Map<String, Object> deleteResult = processDefinitionService.deleteProcessDefinitionById(loginUser, projectName, processDefinitionId);
		if(!Status.SUCCESS.equals(deleteResult.get(Constants.STATUS))){
		deleteFailedIdList.add(processDefinitionId);
		deleteFailedIdList.add(strProcessDefinitionId);
		logger.error((String)deleteResult.get(Constants.MSG));
		}
		} catch (Exception e) {
		deleteFailedIdList.add(processDefinitionId);
		deleteFailedIdList.add(strProcessDefinitionId);
		}
		}
		}

		if(!deleteFailedIdList.isEmpty()){
		putMsg(result, Status.BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR,StringUtils.join(deleteFailedIdList,","));
		putMsg(result, Status.BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR, String.join(",", deleteFailedIdList));
		}else{
		putMsg(result, Status.SUCCESS);
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -372,7 +372,7 @@ public class ProcessInstanceController extends BaseController{
		// task queue
		ITaskQueue tasksQueue = TaskQueueFactory.getTaskQueueInstance();
		Map<String, Object> result = new HashMap<>(5);
		List<Integer> deleteFailedIdList = new ArrayList<Integer>();
		List<String> deleteFailedIdList = new ArrayList<>();
		if(StringUtils.isNotEmpty(processInstanceIds)){
		String[] processInstanceIdArray = processInstanceIds.split(",");

		@@ -381,16 +381,16 @@ public class ProcessInstanceController extends BaseController{
		try {
		Map<String, Object> deleteResult = processInstanceService.deleteProcessInstanceById(loginUser, projectName, processInstanceId,tasksQueue);
		if(!Status.SUCCESS.equals(deleteResult.get(Constants.STATUS))){
		deleteFailedIdList.add(processInstanceId);
		deleteFailedIdList.add(strProcessInstanceId);
		logger.error((String)deleteResult.get(Constants.MSG));
		}
		} catch (Exception e) {
		deleteFailedIdList.add(processInstanceId);
		deleteFailedIdList.add(strProcessInstanceId);
		}
		}
		}
		if(deleteFailedIdList.size() > 0){
		putMsg(result, Status.BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR,StringUtils.join(deleteFailedIdList,","));
		putMsg(result, Status.BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR, String.join(",", deleteFailedIdList));
		}else{
		putMsg(result, Status.SUCCESS);
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,7 @@ public class ProcessDefinitionService extends BaseDAGService {
		processDefine.setConnects(connects);
		processDefine.setTimeout(processData.getTimeout());
		processDefine.setTenantId(processData.getTenantId());
		processDefine.setModifyBy(loginUser.getUserName());

		//custom global params
		List<Property> globalParamsList = processData.getGlobalParams();
		@@ -308,6 +309,7 @@ public class ProcessDefinitionService extends BaseDAGService {
		processDefine.setConnects(connects);
		processDefine.setTimeout(processData.getTimeout());
		processDefine.setTenantId(processData.getTenantId());
		processDefine.setModifyBy(loginUser.getUserName());

		//custom global params
		List<Property> globalParamsList = new ArrayList<>();