You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/02/04 02:14:35 UTC
[incubator-dolphinscheduler] branch json_split updated (c511658 ->
591f4f2)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from c511658 [Feature][JsonSplit] modify updateProcessDefinition/switchProcessDefinitionVersion (#4666)
add 6df87b8 [Fix-4641][Alert] Sending the email to the following server failed :null:null (#4642)
add c3f6f96 [Improvement-4568][API] When the workflow definition name validation API fails, the system prompts that the workflow definition name already exists (#4569)
add 424497e [Improvement][Api] Use WebUtils.getCookie instead of BaseService.getCookie (#4559)
add 66b8288 [Improvement][Dao] Remove duplicated mysql configurations (#4558)
new 591f4f2 Merge remote-tracking branch 'upstream/dev' into spilit
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../plugin/alert/email/MailParamsConstants.java | 20 ++++++++++----------
.../plugin/alert/email/MailUtilsTest.java | 1 +
.../apache/dolphinscheduler/api/enums/Status.java | 3 ++-
.../api/interceptor/LocaleChangeInterceptor.java | 4 ++--
.../dolphinscheduler/api/service/BaseService.java | 21 ---------------------
.../service/impl/ProcessDefinitionServiceImpl.java | 4 ++--
.../api/service/impl/SessionServiceImpl.java | 3 ++-
.../controller/ProcessDefinitionControllerTest.java | 4 ++--
.../api/service/BaseServiceTest.java | 14 --------------
.../api/service/ProcessDefinitionServiceTest.java | 2 +-
.../src/main/resources/datasource.properties | 7 -------
11 files changed, 22 insertions(+), 61 deletions(-)
[incubator-dolphinscheduler] 01/01: Merge remote-tracking branch
'upstream/dev' into spilit
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 591f4f28306d96c070194f4eebc487552982ad94
Merge: c511658 66b8288
Author: lenboo <ba...@gmail.com>
AuthorDate: Thu Feb 4 10:14:14 2021 +0800
Merge remote-tracking branch 'upstream/dev' into spilit
.../plugin/alert/email/MailParamsConstants.java | 20 ++++++++++----------
.../plugin/alert/email/MailUtilsTest.java | 1 +
.../apache/dolphinscheduler/api/enums/Status.java | 3 ++-
.../api/interceptor/LocaleChangeInterceptor.java | 4 ++--
.../dolphinscheduler/api/service/BaseService.java | 21 ---------------------
.../service/impl/ProcessDefinitionServiceImpl.java | 4 ++--
.../api/service/impl/SessionServiceImpl.java | 3 ++-
.../controller/ProcessDefinitionControllerTest.java | 4 ++--
.../api/service/BaseServiceTest.java | 14 --------------
.../api/service/ProcessDefinitionServiceTest.java | 2 +-
.../src/main/resources/datasource.properties | 7 -------
11 files changed, 22 insertions(+), 61 deletions(-)
diff --cc dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index c49a2e0,af91ed2..f704971
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@@ -476,11 -425,11 +476,11 @@@ public class ProcessDefinitionServiceIm
return result;
}
- if (!name.equals(processDefine.getName())) {
+ if (!name.equals(processDefinition.getName())) {
// check whether the new process define name exist
- ProcessDefinition definition = processDefineMapper.verifyByDefineName(project.getId(), name);
+ ProcessDefinition definition = processDefinitionMapper.verifyByDefineName(project.getId(), name);
if (definition != null) {
- putMsg(result, Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR, name);
+ putMsg(result, Status.PROCESS_DEFINITION_NAME_EXIST, name);
return result;
}
}