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:06 UTC
[incubator-dolphinscheduler] branch json_split updated (0055ef4 ->
59a542d)
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 0055ef4 [Feature][JsonSplit] Add Project code (#4509)
add 543aac5 [feature-3665][ui]Add element-ui (#3666)
add ab884df Add form-create plug-in and alarm group management add sample demo
add bbfe5c1 Modify node version
add 1057e6b fix
add a7a928b fix
add 1618b98 [feature][ui]Alert plugin design (#3734)
add 1d25434 [Feature-3189][alert,spi,dao,plugin-api] base code of dolphinscheduler spi and alert plugin implement (#3601)
add 20bc747 Replace the tenant management page ui with element-ui (#3891)
add 449cbbe [feature#3356] alert-spi support DingTalk&WeChat (#3869)
add 2df6ecb the alert module support service.
add 30d75f2 the alert module support service.
add 36cfcc4 Delete blank lines.
add a263455 add code checkstyle.
add 5c1561a Solve the sonar bug.
add 3341317 Re-execute build.
add 500d481 add test.
add 0fdb001 update ut.
add 54802bb add test class.
add 72942ac update test.
add c61e536 Merge pull request #3979 from zhuangchong/alert_spi_support_sync_service
add f4ef86c [FEATURE#4029] alert spi support script alert
add 4c7743f code style
add 05eabda code smell
add e4641da add test
add 03ed107 code style
add 5b14319 code smell
add 66afe5a code style
add 63522ad fix name error
add c3695a0 Merge pull request #4063 from CalvinKirs/alert_script
add 91eb42d init sms plugin
add 13e6ce9 Merge branch 'sms' into alert_plugin_design
add b21a158 delete dolphinscheduler-alert-sms plugin
add 44d5cce dolphinscheduler plugin need add <package>dolphinscheduler-plugin</package> in the pom.xml file
add 183725d Merge pull request #25 from apache/alert_plugin_design
add 37c8f00 modify http type
add 567590c Merge branch 'sms' into alert_plugin_design
add 3f85a4c delete alert http plugin (#4152)
add 169a4ac [Feature-3749][Alert-SPI] SqlTask should send notifications by alert server api (#4080)
add 9da6d58 [Alert plugin design] add http alert plugin (#4165)
add cb25810 [Feature-3311] Add alert plugin instance function (#4038)
add 0f31152 [Feature-#3252][build]plugins need put in plugins dir when install (#4259)
add 17d4421 [Feature#4310][Alert-SPI] Plug-ins containing UI components provide display pages (#4311)
add 14785f4 [Feature-#3828][server] Delete recipients and CCs in the process defi… (#4303)
add 5808a0a Replace the front-end code of the plugin branch with the front-end code of the dev branch (#4353)
add 4d55360 Merge dev to alert_plugin_design (#4351)
add ffc5420 Delete the receivers, receiversCc fields, delete api alert-group/grant-user, projects/{projectName}/executors/get-receiver-cc (#4409)
add 73b0eaa merge dev to alert_plugin_design (#4530)
add 34b0f30 fix alert property utils init properties. (#4527)
add ab95b16 Revert "[Feature-#3049] Alert Plugin Design(merge alert_plugin_design to dev) (#4495)" (#4535)
add 64b4715 reslove
add b290754 [Improvement-#4503][dolphinscheduler-dist]Jackson version upgraded to 2.10.5 from 2.9.10 (#4522)
add 1c5abbb Merge branch 'dev' into alert_plugin_design
add acee4e0 Merge pull request #4537 from CalvinKris/alert_plugin_design
add 500147f [Feature-#3826][UI]Alert SPI (#4441)
add 046940b [Improvement][API] ProjectService queryAllProjectList API optimization (#4539)
add cfa88a4 [Improvement-4493][api] The Process Definition interface parameter releaseState is changed to an enumeration type (#4494)
add 5bae933 update get system load (#4524)
add 0b8fcac [Fix-4439][*] Fix cors problem (#4490)
add 829fdb5 [Improvement] Optimize the popover box title, create and edit instances are not cleared (#4540)
new 59a542d Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into json-split
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:
.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 +-
.../LocaleChangeInterceptorTest.java} | 23 +--
.../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 +-
...fUtilsTest.java => HiveConfUtilsTest.java~HEAD} | 0
...nfUtilsTest.java => HiveConfUtilsTest.java~dev} | 0
.../dao/mapper/ProcessDefinitionMapper.java | 6 +
.../dao/mapper/ProcessDefinitionMapper.xml | 6 +
.../dao/mapper/ProcessDefinitionMapperTest.java | 8 +
dolphinscheduler-dist/release-docs/LICENSE | 6 +-
...element-ui => LICENSE-@form-create-element-ui } | 2 +-
.../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 +++++++++++++++++++++
.../pages/warningInstance}/_source/list.vue | 39 ++--
.../{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, 694 insertions(+), 605 deletions(-)
delete mode 100644 docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD
delete mode 100644 docker/kubernetes/dolphinscheduler/requirements.yaml~dev
create mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LocaleChangeInterceptor.java
copy dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/{security/SecurityConfigLDAPTest.java~HEAD => interceptor/LocaleChangeInterceptorTest.java} (69%)
copy dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/{HiveConfUtilsTest.java => HiveConfUtilsTest.java~HEAD} (100%)
copy dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/{HiveConfUtilsTest.java => HiveConfUtilsTest.java~dev} (100%)
copy dolphinscheduler-dist/release-docs/licenses/ui-licenses/{LICENSE-@form-create-element-ui => LICENSE-@form-create-element-ui } (98%)
create mode 100644 dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
copy dolphinscheduler-ui/src/js/conf/home/pages/{user/pages/token => security/pages/warningInstance}/_source/list.vue (72%)
copy dolphinscheduler-ui/src/js/conf/home/pages/security/pages/{warningGroups => warningInstance}/index.vue (82%)
copy dolphinscheduler-ui/src/js/module/components/popup/{popup.vue => popover.vue} (93%)
[incubator-dolphinscheduler] 01/01: Merge branch 'json_split' of
https://github.com/apache/incubator-dolphinscheduler into json-split
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 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;