This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch 133-merge-dev
in repository
https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 536974d merge from 1.3.3-release
add c7b5956 [Feature-3941][ui] Remove tenant name (#3949)
add c54d096 [Improvement][script] daemon script usage (#3968)
add 187c5c1 Merge pull request #22 from apache/dev
add d520cef Merge pull request #23 from apache/dev
add c86ff41 Merge pull request #24 from apache/dev
add c614bd3 the resources API document does not match the interface
parameters
add 584a787 fix bug
add a6266b7 reset code
add 83cc289 Update udfs.vue
add f4c14de Merge pull request #4009 from BoYiZhang/pr_4008
add 2830ab1 fix #3688, Optimization of table building statements (#3689)
add 4b502e3 [Improvement-4012][common/remote] Json util code
integration,remove the remote module json util (#4013)
add 7239979 Merge branch 'dev' into 133-merge-dev
No new revisions were added by this update.
Summary of changes:
.../api/controller/ResourcesController.java | 192 +++++++++++++--------
.../api/controller/TenantController.java | 23 ++-
.../apache/dolphinscheduler/api/enums/Status.java | 2 +-
.../api/service/TenantService.java | 5 +-
.../api/service/impl/TenantServiceImpl.java | 12 +-
.../src/main/resources/i18n/messages.properties | 1 -
.../main/resources/i18n/messages_en_US.properties | 1 -
.../main/resources/i18n/messages_zh_CN.properties | 1 -
.../api/controller/TenantControllerTest.java | 8 +-
.../api/service/TenantServiceTest.java | 13 +-
.../dolphinscheduler/common/utils/JSONUtils.java | 39 +++++
.../common/utils/JSONUtilsTest.java | 35 ++--
.../apache/dolphinscheduler/dao/entity/Tenant.java | 14 --
.../apache/dolphinscheduler/dao/entity/User.java | 15 --
.../dao/mapper/ProcessDefinitionMapper.xml | 2 +-
.../dolphinscheduler/dao/mapper/TenantMapper.xml | 2 +-
.../dolphinscheduler/dao/mapper/UserMapper.xml | 4 +-
.../dao/mapper/ResourceMapperTest.java | 1 -
.../dao/mapper/TenantMapperTest.java | 4 +-
.../dao/mapper/UserMapperTest.java | 2 -
dolphinscheduler-remote/pom.xml | 8 +-
.../remote/command/TaskExecuteAckCommand.java | 28 +--
.../remote/command/TaskExecuteRequestCommand.java | 13 +-
.../remote/command/TaskExecuteResponseCommand.java | 27 +--
.../remote/command/TaskKillRequestCommand.java | 14 +-
.../remote/command/TaskKillResponseCommand.java | 22 +--
.../command/log/GetLogBytesRequestCommand.java | 6 +-
.../command/log/GetLogBytesResponseCommand.java | 6 +-
.../command/log/RemoveTaskLogRequestCommand.java | 6 +-
.../command/log/RemoveTaskLogResponseCommand.java | 6 +-
.../command/log/RollViewLogRequestCommand.java | 6 +-
.../command/log/RollViewLogResponseCommand.java | 6 +-
.../remote/command/log/ViewLogRequestCommand.java | 6 +-
.../remote/command/log/ViewLogResponseCommand.java | 6 +-
.../remote/utils/JsonSerializer.java | 92 ----------
.../remote/JsonSerializerTest.java | 58 -------
.../server/entity/TaskExecutionContext.java | 4 +-
.../server/log/LoggerRequestProcessor.java | 64 ++++---
.../server/master/processor/TaskAckProcessor.java | 16 +-
.../processor/TaskKillResponseProcessor.java | 9 +-
.../master/processor/TaskResponseProcessor.java | 17 +-
.../worker/processor/TaskExecuteProcessor.java | 15 +-
.../server/worker/processor/TaskKillProcessor.java | 23 +--
.../consumer/TaskPriorityQueueConsumerTest.java | 1 -
.../master/processor/TaskAckProcessorTest.java | 101 +++++++++++
.../processor/TaskKillResponseProcessorTest.java | 64 +++++++
.../service/log/LogClientService.java | 13 +-
.../pages/dag/_source/udp/_source/selectTenant.vue | 2 +-
.../pages/tenement/_source/createTenement.vue | 28 +--
.../pages/security/pages/tenement/_source/list.vue | 8 -
.../security/pages/users/_source/createUser.vue | 2 +-
.../pages/security/pages/users/_source/list.vue | 2 +-
.../home/pages/user/pages/account/_source/info.vue | 2 +-
.../src/js/conf/home/store/security/actions.js | 2 +-
.../src/js/module/i18n/locale/en_US.js | 2 -
.../src/js/module/i18n/locale/zh_CN.js | 2 -
.../locator/security/TenantManageLocator.java | 4 +-
.../page/security/TenantManagePage.java | 1 -
e2e/src/test/resources/testData/security_zh_cn.yml | 1 -
pom.xml | 3 +
script/dolphinscheduler-daemon.sh | 2 +-
.../mysql/dolphinscheduler_ddl.sql | 1 -
.../postgresql/dolphinscheduler_ddl.sql | 1 -
sql/dolphinscheduler-postgre.sql | 1 -
sql/dolphinscheduler_mysql.sql | 25 ++-
65 files changed, 568 insertions(+), 534 deletions(-)
delete mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/JsonSerializer.java
delete mode 100644
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/JsonSerializerTest.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessorTest.java
create mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskKillResponseProcessorTest.java
