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 1b9ab88e789d19e63629bf95e5c80b993e298da5 Merge: f7ca571 a53195f Author: lenboo <[email protected]> AuthorDate: Thu Feb 18 17:28:58 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit .../api/controller/AlertGroupController.java | 3 +- .../api/service/AlertGroupService.java | 140 +--- .../dolphinscheduler/api/service/BaseService.java | 15 +- .../dolphinscheduler/api/service/UsersService.java | 875 +-------------------- .../AlertGroupServiceImpl.java} | 20 +- .../UsersServiceImpl.java} | 45 +- .../api/service/AlertGroupServiceTest.java | 7 +- .../api/service/UsersServiceTest.java | 3 +- .../dolphinscheduler/common/utils/NetUtils.java | 13 +- .../common/utils/PropertyUtils.java | 2 +- .../remote/utils/ChannelUtils.java | 8 +- .../server/master/registry/MasterRegistryTest.java | 3 +- .../pages/definition/pages/list/_source/list.vue | 12 +- .../_source/createWarningInstance.vue | 48 +- .../components/fileUpdate/definitionUpdate.vue | 9 + .../components/fileUpdate/fileChildReUpdate.vue | 10 + .../components/fileUpdate/fileChildUpdate.vue | 11 + .../module/components/fileUpdate/fileReUpload.vue | 10 + .../js/module/components/fileUpdate/fileUpdate.vue | 11 + .../components/fileUpdate/resourceChildUpdate.vue | 11 + .../js/module/components/fileUpdate/udfUpdate.vue | 11 + .../src/js/module/i18n/locale/en_US.js | 1 + .../src/js/module/i18n/locale/zh_CN.js | 1 + 23 files changed, 204 insertions(+), 1065 deletions(-)
