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/01/25 02:39:07 UTC
[incubator-dolphinscheduler] 01/01: Merge branch 'json_split' of
https://github.com/apache/incubator-dolphinscheduler into json-split
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 59a542d68fdd25a3bab47e38c60d9bfc4cd71f91
Merge: 0055ef4 829fdb5
Author: lenboo <ba...@gmail.com>
AuthorDate: Mon Jan 25 10:38:28 2021 +0800
Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into json-split
# Conflicts:
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
# dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
.gitignore | 122 +------------
.../dolphinscheduler/requirements.yaml~HEAD | 25 ---
.../dolphinscheduler/requirements.yaml~dev | 25 ---
.../alert/utils/PropertyUtils.java | 5 +
.../src/main/resources/alert.properties | 3 +-
.../alert/utils/PropertyUtilsTest.java | 17 +-
.../api/configuration/AppConfiguration.java | 32 ++--
.../controller/ProcessDefinitionController.java | 15 +-
.../api/interceptor/LocaleChangeInterceptor.java | 56 ++++++
.../api/service/ProcessDefinitionService.java | 3 +-
.../dolphinscheduler/api/service/UsersService.java | 10 +-
.../service/impl/ProcessDefinitionServiceImpl.java | 12 +-
.../api/service/impl/ProjectServiceImpl.java | 21 +--
.../ProcessDefinitionControllerTest.java | 7 +-
.../interceptor/LocaleChangeInterceptorTest.java | 48 +++++
.../api/service/ProcessDefinitionServiceTest.java | 8 +-
.../api/service/ProjectServiceTest.java | 11 +-
.../apache/dolphinscheduler/common/Constants.java | 5 +
.../dolphinscheduler/common/utils/JSONUtils.java | 6 +-
.../dolphinscheduler/common/utils/OSUtils.java | 15 +-
.../common/utils/HiveConfUtilsTest.java~HEAD | 42 +++--
.../common/utils/HiveConfUtilsTest.java~dev | 42 +++--
.../dao/mapper/ProcessDefinitionMapper.java | 6 +
.../dao/mapper/ProcessDefinitionMapper.xml | 6 +
.../dao/mapper/ProcessDefinitionMapperTest.java | 8 +
dolphinscheduler-dist/release-docs/LICENSE | 6 +-
.../ui-licenses/LICENSE-@form-create-element-ui | 21 +++
.../server/log/TaskLogAppender.java | 4 +-
dolphinscheduler-ui/package.json | 4 +
dolphinscheduler-ui/src/js/conf/home/index.js | 2 +
.../home/pages/dag/_source/formModel/tasks/sql.vue | 55 +-----
.../pages/dag/_source/formModel/tasks/sqoop.vue | 2 -
.../home/pages/dag/_source/startingParam/index.vue | 2 -
.../src/js/conf/home/pages/dag/_source/udp/udp.vue | 4 +-
.../conditions/instance/processInstance.vue | 2 +-
.../pages/definition/pages/list/_source/list.vue | 31 +---
.../pages/definition/pages/list/_source/start.vue | 31 +---
.../pages/definition/pages/list/_source/timing.vue | 26 +--
.../pages/definition/timing/_source/list.vue | 27 +--
.../pages/instance/pages/list/_source/list.vue | 1 -
.../projects/pages/list/_source/createProject.vue | 16 +-
.../conf/home/pages/projects/pages/list/index.vue | 2 +
.../security/pages/queue/_source/createQueue.vue | 19 +-
.../conf/home/pages/security/pages/queue/index.vue | 2 +
.../pages/tenement/_source/createTenement.vue | 17 +-
.../home/pages/security/pages/tenement/index.vue | 2 +
.../security/pages/users/_source/createUser.vue | 21 ++-
.../pages/security/pages/users/_source/list.vue | 1 +
.../conf/home/pages/security/pages/users/index.vue | 2 +
.../pages/warningGroups/_source/createWarning.vue | 47 ++---
.../security/pages/warningGroups/_source/list.vue | 55 +-----
.../pages/security/pages/warningGroups/index.vue | 16 +-
.../_source/createWarningInstance.vue | 197 +++++++++++++++++++++
.../_source/list.vue | 82 +--------
.../{warningGroups => warningInstance}/index.vue | 30 ++--
.../home/pages/user/pages/account/_source/info.vue | 4 +-
.../pages/user/pages/token/_source/createToken.vue | 11 +-
.../js/conf/home/pages/user/pages/token/index.vue | 2 +
.../src/js/conf/home/router/index.js | 11 +-
.../src/js/conf/home/store/dag/actions.js | 12 --
.../src/js/conf/home/store/dag/state.js | 2 +-
.../src/js/conf/home/store/security/actions.js | 94 +++++++++-
.../components/popup/{popup.vue => popover.vue} | 9 +-
.../src/js/module/components/popup/popup.vue | 2 +-
.../components/secondaryMenu/_source/menu.js | 9 +
.../src/js/module/components/transfer/resource.vue | 5 +-
.../src/js/module/i18n/locale/en_US.js | 9 +-
.../src/js/module/i18n/locale/zh_CN.js | 6 +
dolphinscheduler-ui/src/js/module/io/index.js | 4 +
dolphinscheduler-ui/src/sass/common/index.scss | 4 +-
pom.xml | 3 +-
tools/dependencies/known-dependencies.txt | 6 +-
72 files changed, 786 insertions(+), 684 deletions(-)
diff --cc docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD
index e219975,e219975..0000000
deleted file mode 100644,100644
--- a/docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD
+++ /dev/null
@@@ -1,25 -1,25 +1,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.
--#
--dependencies:
--- name: postgresql
-- version: 8.x.x
-- repository: https://charts.bitnami.com/bitnami
-- condition: postgresql.enabled
--- name: zookeeper
-- version: 5.x.x
-- repository: https://charts.bitnami.com/bitnami
-- condition: redis.enabled
diff --cc docker/kubernetes/dolphinscheduler/requirements.yaml~dev
index e219975,e219975..0000000
deleted file mode 100644,100644
--- a/docker/kubernetes/dolphinscheduler/requirements.yaml~dev
+++ /dev/null
@@@ -1,25 -1,25 +1,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.
--#
--dependencies:
--- name: postgresql
-- version: 8.x.x
-- repository: https://charts.bitnami.com/bitnami
-- condition: postgresql.enabled
--- name: zookeeper
-- version: 5.x.x
-- repository: https://charts.bitnami.com/bitnami
-- condition: redis.enabled
diff --cc dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
index acf5f0a,9241df6..bca3b8d
--- 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
@@@ -24,8 -24,7 +24,9 @@@ import org.apache.dolphinscheduler.api.
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.utils.SnowFlakeUtils;
+import org.apache.dolphinscheduler.common.utils.SnowFlakeUtils.SnowFlakeException;
+ import org.apache.dolphinscheduler.common.utils.CollectionUtils;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.ProjectUser;