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/12/13 06:22:49 UTC
[dolphinscheduler] branch 2.0.2-prepare updated: return domain after creating success (#7355)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 2.0.2-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/2.0.2-prepare by this push:
new f6fd7f6 return domain after creating success (#7355)
f6fd7f6 is described below
commit f6fd7f6540742020a1f2147e0cc71600b2c13d1a
Author: ouyangyewei <ou...@foxmail.com>
AuthorDate: Mon Dec 13 14:22:39 2021 +0800
return domain after creating success (#7355)
Co-authored-by: ouyangyewei <ye...@alibaba-inc.com>
---
.../dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java | 1 +
.../apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java | 2 +-
.../org/apache/dolphinscheduler/api/service/impl/QueueServiceImpl.java | 1 +
.../org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java | 1 +
.../org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java | 1 +
5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java
index 0bc8371..3904846 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java
@@ -110,6 +110,7 @@ public class AccessTokenServiceImpl extends BaseServiceImpl implements AccessTok
int insert = accessTokenMapper.insert(accessToken);
if (insert > 0) {
+ result.put(Constants.DATA_LIST, accessToken);
putMsg(result, Status.SUCCESS);
} else {
putMsg(result, Status.CREATE_ACCESS_TOKEN_ERROR);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
index 75347ee..a02458a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
@@ -110,7 +110,7 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
}
if (projectMapper.insert(project) > 0) {
- result.put(Constants.DATA_LIST, project.getId());
+ result.put(Constants.DATA_LIST, project);
putMsg(result, Status.SUCCESS);
} else {
putMsg(result, Status.CREATE_PROJECT_ERROR);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/QueueServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/QueueServiceImpl.java
index edd0e1d..91889cd 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/QueueServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/QueueServiceImpl.java
@@ -151,6 +151,7 @@ public class QueueServiceImpl extends BaseServiceImpl implements QueueService {
queueObj.setUpdateTime(now);
queueMapper.insert(queueObj);
+ result.put(Constants.DATA_LIST, queueObj);
putMsg(result, Status.SUCCESS);
return result;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
index d0ccd75..c1295c1 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
@@ -113,6 +113,7 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
createTenantDirIfNotExists(tenantCode);
}
+ result.put(Constants.DATA_LIST, tenant);
putMsg(result, Status.SUCCESS);
return result;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
index a98d45f..e07516a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
@@ -174,6 +174,7 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
HadoopUtils.getInstance().mkdir(userPath);
}
+ result.put(Constants.DATA_LIST, user);
putMsg(result, Status.SUCCESS);
return result;