|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
package org.apache.dolphinscheduler.api.service;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
|
|
|
|
import org.apache.dolphinscheduler.api.dto.resources.visitor.ResourceTreeVisitor;
|
|
|
|
import org.apache.dolphinscheduler.api.enums.Status;
|
|
|
|
import org.apache.dolphinscheduler.api.exceptions.ServiceException;
|
|
|
|
import org.apache.dolphinscheduler.api.utils.CheckUtils;
|
|
|
|
import org.apache.dolphinscheduler.api.utils.PageInfo;
|
|
|
|
import org.apache.dolphinscheduler.api.utils.Result;
|
|
|
|
import org.apache.dolphinscheduler.common.Constants;
|
|
|
|
import org.apache.dolphinscheduler.common.enums.Flag;
|
|
|
|
import org.apache.dolphinscheduler.common.enums.ResourceType;
|
|
|
|
import org.apache.dolphinscheduler.common.enums.UserType;
|
|
|
|
import org.apache.dolphinscheduler.common.utils.*;
|
|
|
|
import org.apache.dolphinscheduler.dao.entity.*;
|
|
|
|
import org.apache.dolphinscheduler.dao.mapper.*;
|
|
|
|
import org.apache.dolphinscheduler.dao.utils.ResourceProcessDefinitionUtils;
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.text.MessageFormat;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* user service
|
|
|
|
*/
|
|
|
|
@Service
|
|
|
|
public class UsersService extends BaseService {
|
|
|
|
|
|
|
|
private static final Logger logger = LoggerFactory.getLogger(UsersService.class);
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
private UserMapper userMapper;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
private TenantMapper tenantMapper;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
private ProjectUserMapper projectUserMapper;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
private ResourceUserMapper resourcesUserMapper;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
private ResourceMapper resourceMapper;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
private DataSourceUserMapper datasourceUserMapper;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
private UDFUserMapper udfUserMapper;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
private AlertGroupMapper alertGroupMapper;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
private ProcessDefinitionMapper processDefinitionMapper;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* create user, only system admin have permission
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @param userName user name
|
|
|
|
* @param userPassword user password
|
|
|
|
* @param email email
|
|
|
|
* @param tenantId tenant id
|
|
|
|
* @param phone phone
|
|
|
|
* @param queue queue
|
|
|
|
* @return create result code
|
|
|
|
* @throws Exception exception
|
|
|
|
*/
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public Map<String, Object> createUser(User loginUser,
|
|
|
|
String userName,
|
|
|
|
String userPassword,
|
|
|
|
String email,
|
|
|
|
int tenantId,
|
|
|
|
String phone,
|
|
|
|
String queue,
|
|
|
|
int state) throws Exception {
|
|
|
|
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
merge dev-db to dev (#1426)
* [dolphinscheduler-1345] [newfeature] Add DB2 Datasource (#1391)
* Fix the problem that the 'queueId' is not present when creating a tenant based on the default queue. (#1409)
* dolphinscheduler-#1403][bug]improve the check rules (#1408)
1. When check failed, we don’t know whitch parameter has is wrong, Because username、password、email and phone were checks together. I refactored the check method ,Now it will return failed msg by each field.
2. The email check regex support [_|\-|\.]?) in createUser.vue, But it do not support in backend server , I fix it, Now they have the same check regex both in frontend and backend
* jcip-annotations define version information and maven-assembly-plugin add groupId (#1413)
* "v-for" add key (#1419)
* [dolphinscheduler-#1397] [bug]Resources can not be previewed or updated (#1406)
When create an resource the name will add the suffix, But When rename the resource there is no suffix add to the name, So When update resource name without suffix just like "test.sh" => "test" , Then the bug reproduced.
To fix this bug i add the logic bellow:
When rename, if the name without suffix then add it ,else use the origin name
* simply server module configs (#1424)
* move updateTaskState into try/catch block in case of exception
* fix NPE
* using conf.getInt instead of getString
* for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
for AlertDao, correct the spelling.
* duplicate
* refactor getTaskWorkerGroupId
* add friendly log
* update hearbeat thread num = 1
* fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
* 1. move verifyTaskInstanceIsNull after taskInstance
2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
* fix the message
* delete before check to avoid KeeperException$NoNodeException
* fix the message
* check processInstance state before delete tenant
* check processInstance state before delete worker group
* refactor
* merge api constants into common constatns
* update the resource perm
* update the dataSource perm
* fix CheckUtils.checkUserParams method
* update AlertGroupService, extends from BaseService, remove duplicate methods
* refactor
* modify method name
* add hasProjectAndPerm method
* using checkProject instead of getResultStatus
* delete checkAuth method, using hasProjectAndPerm instead.
* correct spelling
* add transactional for deleteWorkerGroupById
* add Transactional for deleteProcessInstanceById method
* change sqlSessionTemplate singleton
* change sqlSessionTemplate singleton and reformat code
* fix unsuitable error message
* update shutdownhook methods
* fix worker log bug
* fix api server debug mode bug
* upgrade zk version
* delete this line ,for zkClient.close() will do the whole thing
* fix master server shutdown error
* degrade zk version and add FourLetterWordMain class
* fix PathChildrenCache not close
* add Transactional for createSession method
* add more message for java-doc
* delete App, let spring manage connectionFactory
* add license
* add class Application for test support
* refactor masterServer and workerServer
* add args
* fix the spring transaction not work bug
* remove author
* delete @Bean annotation
* delete master/worker properties
* updates
* rename application.properties to application-dao.properties
* delete this class
* delete master/worker properties and refactory master/worker
* delete unused imports
* merge
* delete unused config
5 years ago
|
|
|
|
|
|
|
//check all user params
|
|
|
|
String msg = this.checkUserParams(userName, userPassword, email, phone);
|
|
|
|
|
|
|
|
if (!StringUtils.isEmpty(msg)) {
|
|
|
|
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,msg);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
if (!isAdmin(loginUser)) {
|
|
|
|
putMsg(result, Status.USER_NO_OPERATION_PERM);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!checkTenantExists(tenantId)) {
|
|
|
|
putMsg(result, Status.TENANT_NOT_EXIST);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
User user = createUser(userName, userPassword, email, tenantId, phone, queue, state);
|
|
|
|
|
|
|
|
Tenant tenant = tenantMapper.queryById(tenantId);
|
|
|
|
// resource upload startup
|
|
|
|
if (PropertyUtils.getResUploadStartupState()){
|
|
|
|
// if tenant not exists
|
|
|
|
if (!HadoopUtils.getInstance().exists(HadoopUtils.getHdfsTenantDir(tenant.getTenantCode()))){
|
|
|
|
createTenantDirIfNotExists(tenant.getTenantCode());
|
|
|
|
}
|
|
|
|
String userPath = HadoopUtils.getHdfsUserDir(tenant.getTenantCode(),user.getId());
|
|
|
|
HadoopUtils.getInstance().mkdir(userPath);
|
|
|
|
}
|
|
|
|
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
return result;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = RuntimeException.class)
|
|
|
|
public User createUser(String userName,
|
|
|
|
String userPassword,
|
|
|
|
String email,
|
|
|
|
int tenantId,
|
|
|
|
String phone,
|
|
|
|
String queue,
|
|
|
|
int state) {
|
|
|
|
User user = new User();
|
|
|
|
Date now = new Date();
|
|
|
|
|
|
|
|
user.setUserName(userName);
|
|
|
|
user.setUserPassword(EncryptionUtils.getMd5(userPassword));
|
|
|
|
user.setEmail(email);
|
|
|
|
user.setTenantId(tenantId);
|
|
|
|
user.setPhone(phone);
|
|
|
|
user.setState(state);
|
|
|
|
// create general users, administrator users are currently built-in
|
|
|
|
user.setUserType(UserType.GENERAL_USER);
|
|
|
|
user.setCreateTime(now);
|
|
|
|
user.setUpdateTime(now);
|
|
|
|
if (StringUtils.isEmpty(queue)){
|
|
|
|
queue = "";
|
|
|
|
}
|
|
|
|
user.setQueue(queue);
|
|
|
|
|
|
|
|
// save user
|
|
|
|
userMapper.insert(user);
|
|
|
|
return user;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* query user by id
|
|
|
|
* @param id id
|
|
|
|
* @return user info
|
|
|
|
*/
|
|
|
|
public User queryUser(int id) {
|
|
|
|
return userMapper.selectById(id);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* query user
|
|
|
|
* @param name name
|
|
|
|
* @return user info
|
|
|
|
*/
|
|
|
|
public User queryUser(String name) {
|
|
|
|
return userMapper.queryByUserNameAccurately(name);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* query user
|
|
|
|
*
|
|
|
|
* @param name name
|
|
|
|
* @param password password
|
|
|
|
* @return user info
|
|
|
|
*/
|
|
|
|
public User queryUser(String name, String password) {
|
|
|
|
String md5 = EncryptionUtils.getMd5(password);
|
|
|
|
return userMapper.queryUserByNamePassword(name, md5);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* get user id by user name
|
|
|
|
* @param name user name
|
|
|
|
* @return if name empty 0, user not exists -1, user exist user id
|
|
|
|
*/
|
|
|
|
public int getUserIdByName(String name) {
|
|
|
|
//executor name query
|
|
|
|
int executorId = 0;
|
|
|
|
if (StringUtils.isNotEmpty(name)) {
|
|
|
|
User executor = queryUser(name);
|
|
|
|
if (null != executor) {
|
|
|
|
executorId = executor.getId();
|
|
|
|
} else {
|
|
|
|
executorId = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return executorId;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* query user list
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @param pageNo page number
|
|
|
|
* @param searchVal search avlue
|
|
|
|
* @param pageSize page size
|
|
|
|
* @return user list page
|
|
|
|
*/
|
|
|
|
public Map<String, Object> queryUserList(User loginUser, String searchVal, Integer pageNo, Integer pageSize) {
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
|
|
|
|
|
|
|
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
Page<User> page = new Page(pageNo, pageSize);
|
|
|
|
|
|
|
|
IPage<User> scheduleList = userMapper.queryUserPaging(page, searchVal);
|
|
|
|
|
|
|
|
PageInfo<User> pageInfo = new PageInfo<>(pageNo, pageSize);
|
|
|
|
pageInfo.setTotalCount((int)scheduleList.getTotal());
|
|
|
|
pageInfo.setLists(scheduleList.getRecords());
|
|
|
|
result.put(Constants.DATA_LIST, pageInfo);
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* updateProcessInstance user
|
|
|
|
*
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
*
|
|
|
|
* @param loginUser
|
|
|
|
* @param userId user id
|
|
|
|
* @param userName user name
|
|
|
|
* @param userPassword user password
|
|
|
|
* @param email email
|
|
|
|
* @param tenantId tennat id
|
|
|
|
* @param phone phone
|
|
|
|
* @param queue queue
|
|
|
|
* @return update result code
|
|
|
|
* @throws Exception exception
|
|
|
|
*/
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
public Map<String, Object> updateUser(User loginUser, int userId,
|
|
|
|
String userName,
|
|
|
|
String userPassword,
|
|
|
|
String email,
|
|
|
|
int tenantId,
|
|
|
|
String phone,
|
|
|
|
String queue,
|
|
|
|
int state) throws Exception {
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
|
|
|
result.put(Constants.STATUS, false);
|
|
|
|
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
if (check(result, !hasPerm(loginUser, userId), Status.USER_NO_OPERATION_PERM)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
User user = userMapper.selectById(userId);
|
|
|
|
if (user == null) {
|
|
|
|
putMsg(result, Status.USER_NOT_EXIST, userId);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
if (StringUtils.isNotEmpty(userName)) {
|
|
|
|
|
|
|
|
if (!CheckUtils.checkUserName(userName)){
|
|
|
|
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,userName);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
User tempUser = userMapper.queryByUserNameAccurately(userName);
|
|
|
|
if (tempUser != null && tempUser.getId() != userId) {
|
|
|
|
putMsg(result, Status.USER_NAME_EXIST);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
user.setUserName(userName);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(userPassword)) {
|
|
|
|
if (!CheckUtils.checkPassword(userPassword)){
|
|
|
|
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,userPassword);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
user.setUserPassword(EncryptionUtils.getMd5(userPassword));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(email)) {
|
|
|
|
if (!CheckUtils.checkEmail(email)){
|
|
|
|
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,email);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
user.setEmail(email);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(phone) && !CheckUtils.checkPhone(phone)) {
|
|
|
|
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,phone);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
user.setPhone(phone);
|
|
|
|
user.setQueue(queue);
|
|
|
|
user.setState(state);
|
|
|
|
Date now = new Date();
|
|
|
|
user.setUpdateTime(now);
|
|
|
|
|
|
|
|
//if user switches the tenant, the user's resources need to be copied to the new tenant
|
|
|
|
if (user.getTenantId() != tenantId) {
|
|
|
|
Tenant oldTenant = tenantMapper.queryById(user.getTenantId());
|
|
|
|
//query tenant
|
|
|
|
Tenant newTenant = tenantMapper.queryById(tenantId);
|
|
|
|
if (newTenant != null) {
|
|
|
|
// if hdfs startup
|
|
|
|
if (PropertyUtils.getResUploadStartupState() && oldTenant != null){
|
|
|
|
String newTenantCode = newTenant.getTenantCode();
|
|
|
|
String oldResourcePath = HadoopUtils.getHdfsResDir(oldTenant.getTenantCode());
|
|
|
|
String oldUdfsPath = HadoopUtils.getHdfsUdfDir(oldTenant.getTenantCode());
|
|
|
|
|
|
|
|
// if old tenant dir exists
|
|
|
|
if (HadoopUtils.getInstance().exists(oldResourcePath)){
|
|
|
|
String newResourcePath = HadoopUtils.getHdfsResDir(newTenantCode);
|
|
|
|
String newUdfsPath = HadoopUtils.getHdfsUdfDir(newTenantCode);
|
|
|
|
|
|
|
|
//file resources list
|
|
|
|
List<Resource> fileResourcesList = resourceMapper.queryResourceList(
|
|
|
|
null, userId, ResourceType.FILE.ordinal());
|
|
|
|
if (CollectionUtils.isNotEmpty(fileResourcesList)) {
|
|
|
|
ResourceTreeVisitor resourceTreeVisitor = new ResourceTreeVisitor(fileResourcesList);
|
|
|
|
ResourceComponent resourceComponent = resourceTreeVisitor.visit();
|
|
|
|
copyResourceFiles(resourceComponent, oldResourcePath, newResourcePath);
|
|
|
|
}
|
|
|
|
|
|
|
|
//udf resources
|
|
|
|
List<Resource> udfResourceList = resourceMapper.queryResourceList(
|
|
|
|
null, userId, ResourceType.UDF.ordinal());
|
|
|
|
if (CollectionUtils.isNotEmpty(udfResourceList)) {
|
|
|
|
ResourceTreeVisitor resourceTreeVisitor = new ResourceTreeVisitor(udfResourceList);
|
|
|
|
ResourceComponent resourceComponent = resourceTreeVisitor.visit();
|
|
|
|
copyResourceFiles(resourceComponent, oldUdfsPath, newUdfsPath);
|
|
|
|
}
|
|
|
|
|
|
|
|
//Delete the user from the old tenant directory
|
|
|
|
String oldUserPath = HadoopUtils.getHdfsUserDir(oldTenant.getTenantCode(),userId);
|
|
|
|
HadoopUtils.getInstance().delete(oldUserPath, true);
|
|
|
|
}else {
|
|
|
|
// if old tenant dir not exists , create
|
|
|
|
createTenantDirIfNotExists(oldTenant.getTenantCode());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (HadoopUtils.getInstance().exists(HadoopUtils.getHdfsTenantDir(newTenant.getTenantCode()))){
|
|
|
|
//create user in the new tenant directory
|
|
|
|
String newUserPath = HadoopUtils.getHdfsUserDir(newTenant.getTenantCode(),user.getId());
|
|
|
|
HadoopUtils.getInstance().mkdir(newUserPath);
|
|
|
|
}else {
|
|
|
|
// if new tenant dir not exists , create
|
|
|
|
createTenantDirIfNotExists(newTenant.getTenantCode());
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
user.setTenantId(tenantId);
|
|
|
|
}
|
|
|
|
|
|
|
|
// updateProcessInstance user
|
|
|
|
userMapper.updateById(user);
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* delete user
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @param id user id
|
|
|
|
* @return delete result code
|
|
|
|
* @throws Exception exception when operate hdfs
|
|
|
|
*/
|
|
|
|
public Map<String, Object> deleteUserById(User loginUser, int id) throws Exception {
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
|
|
|
//only admin can operate
|
|
|
|
if (!isAdmin(loginUser)) {
|
|
|
|
putMsg(result, Status.USER_NO_OPERATION_PERM, id);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
//check exist
|
|
|
|
User tempUser = userMapper.selectById(id);
|
|
|
|
if (tempUser == null) {
|
|
|
|
putMsg(result, Status.USER_NOT_EXIST, id);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
// delete user
|
|
|
|
User user = userMapper.queryTenantCodeByUserId(id);
|
|
|
|
|
|
|
|
if (user != null) {
|
|
|
|
if (PropertyUtils.getResUploadStartupState()) {
|
|
|
|
String userPath = HadoopUtils.getHdfsUserDir(user.getTenantCode(),id);
|
|
|
|
if (HadoopUtils.getInstance().exists(userPath)) {
|
|
|
|
HadoopUtils.getInstance().delete(userPath, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
userMapper.deleteById(id);
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* grant project
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @param userId user id
|
|
|
|
* @param projectIds project id array
|
|
|
|
* @return grant result code
|
|
|
|
*/
|
|
|
|
@Transactional(rollbackFor = RuntimeException.class)
|
|
|
|
public Map<String, Object> grantProject(User loginUser, int userId, String projectIds) {
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
|
|
|
result.put(Constants.STATUS, false);
|
|
|
|
|
|
|
|
//only admin can operate
|
|
|
|
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
//check exist
|
|
|
|
User tempUser = userMapper.selectById(userId);
|
|
|
|
if (tempUser == null) {
|
|
|
|
putMsg(result, Status.USER_NOT_EXIST, userId);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
//if the selected projectIds are empty, delete all items associated with the user
|
|
|
|
projectUserMapper.deleteProjectRelation(0, userId);
|
|
|
|
|
|
|
|
if (check(result, StringUtils.isEmpty(projectIds), Status.SUCCESS)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
String[] projectIdArr = projectIds.split(",");
|
|
|
|
|
|
|
|
for (String projectId : projectIdArr) {
|
|
|
|
Date now = new Date();
|
|
|
|
ProjectUser projectUser = new ProjectUser();
|
|
|
|
projectUser.setUserId(userId);
|
|
|
|
projectUser.setProjectId(Integer.parseInt(projectId));
|
|
|
|
projectUser.setPerm(7);
|
|
|
|
projectUser.setCreateTime(now);
|
|
|
|
projectUser.setUpdateTime(now);
|
|
|
|
projectUserMapper.insert(projectUser);
|
|
|
|
}
|
|
|
|
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* grant resource
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @param userId user id
|
|
|
|
* @param resourceIds resource id array
|
|
|
|
* @return grant result code
|
|
|
|
*/
|
|
|
|
@Transactional(rollbackFor = RuntimeException.class)
|
|
|
|
public Map<String, Object> grantResources(User loginUser, int userId, String resourceIds) {
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
|
|
|
//only admin can operate
|
|
|
|
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
User user = userMapper.selectById(userId);
|
|
|
|
if(user == null){
|
|
|
|
putMsg(result, Status.USER_NOT_EXIST, userId);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
Set<Integer> needAuthorizeResIds = new HashSet();
|
|
|
|
if (StringUtils.isNotBlank(resourceIds)) {
|
|
|
|
String[] resourceFullIdArr = resourceIds.split(",");
|
|
|
|
// need authorize resource id set
|
|
|
|
for (String resourceFullId : resourceFullIdArr) {
|
|
|
|
String[] resourceIdArr = resourceFullId.split("-");
|
|
|
|
for (int i=0;i<=resourceIdArr.length-1;i++) {
|
|
|
|
int resourceIdValue = Integer.parseInt(resourceIdArr[i]);
|
|
|
|
needAuthorizeResIds.add(resourceIdValue);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//get the authorized resource id list by user id
|
|
|
|
List<Resource> oldAuthorizedRes = resourceMapper.queryAuthorizedResourceList(userId);
|
|
|
|
//if resource type is UDF,need check whether it is bound by UDF functon
|
|
|
|
Set<Integer> oldAuthorizedResIds = oldAuthorizedRes.stream().map(t -> t.getId()).collect(Collectors.toSet());
|
|
|
|
|
|
|
|
//get the unauthorized resource id list
|
|
|
|
oldAuthorizedResIds.removeAll(needAuthorizeResIds);
|
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(oldAuthorizedResIds)) {
|
|
|
|
|
|
|
|
// get all resource id of process definitions those is released
|
|
|
|
List<Map<String, Object>> list = processDefinitionMapper.listResourcesByUser(userId);
|
|
|
|
Map<Integer, Set<Integer>> resourceProcessMap = ResourceProcessDefinitionUtils.getResourceProcessDefinitionMap(list);
|
|
|
|
Set<Integer> resourceIdSet = resourceProcessMap.keySet();
|
|
|
|
|
|
|
|
resourceIdSet.retainAll(oldAuthorizedResIds);
|
|
|
|
if (CollectionUtils.isNotEmpty(resourceIdSet)) {
|
|
|
|
logger.error("can't be deleted,because it is used of process definition");
|
|
|
|
for (Integer resId : resourceIdSet) {
|
|
|
|
logger.error("resource id:{} is used of process definition {}",resId,resourceProcessMap.get(resId));
|
|
|
|
}
|
|
|
|
putMsg(result, Status.RESOURCE_IS_USED);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
resourcesUserMapper.deleteResourceUser(userId, 0);
|
|
|
|
|
|
|
|
if (check(result, StringUtils.isEmpty(resourceIds), Status.SUCCESS)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int resourceIdValue : needAuthorizeResIds) {
|
|
|
|
Resource resource = resourceMapper.selectById(resourceIdValue);
|
|
|
|
if (resource == null) {
|
|
|
|
putMsg(result, Status.RESOURCE_NOT_EXIST);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
Date now = new Date();
|
|
|
|
ResourcesUser resourcesUser = new ResourcesUser();
|
|
|
|
resourcesUser.setUserId(userId);
|
|
|
|
resourcesUser.setResourcesId(resourceIdValue);
|
|
|
|
if (resource.isDirectory()) {
|
|
|
|
resourcesUser.setPerm(Constants.AUTHORIZE_READABLE_PERM);
|
|
|
|
}else{
|
|
|
|
resourcesUser.setPerm(Constants.AUTHORIZE_WRITABLE_PERM);
|
|
|
|
}
|
|
|
|
|
|
|
|
resourcesUser.setCreateTime(now);
|
|
|
|
resourcesUser.setUpdateTime(now);
|
|
|
|
resourcesUserMapper.insert(resourcesUser);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* grant udf function
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @param userId user id
|
|
|
|
* @param udfIds udf id array
|
|
|
|
* @return grant result code
|
|
|
|
*/
|
|
|
|
@Transactional(rollbackFor = RuntimeException.class)
|
|
|
|
public Map<String, Object> grantUDFFunction(User loginUser, int userId, String udfIds) {
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
|
|
|
|
|
|
|
//only admin can operate
|
|
|
|
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
User user = userMapper.selectById(userId);
|
|
|
|
if(user == null){
|
|
|
|
putMsg(result, Status.USER_NOT_EXIST, userId);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
udfUserMapper.deleteByUserId(userId);
|
|
|
|
|
|
|
|
if (check(result, StringUtils.isEmpty(udfIds), Status.SUCCESS)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
String[] resourcesIdArr = udfIds.split(",");
|
|
|
|
|
|
|
|
for (String udfId : resourcesIdArr) {
|
|
|
|
Date now = new Date();
|
|
|
|
UDFUser udfUser = new UDFUser();
|
|
|
|
udfUser.setUserId(userId);
|
|
|
|
udfUser.setUdfId(Integer.parseInt(udfId));
|
|
|
|
udfUser.setPerm(7);
|
|
|
|
udfUser.setCreateTime(now);
|
|
|
|
udfUser.setUpdateTime(now);
|
|
|
|
udfUserMapper.insert(udfUser);
|
|
|
|
}
|
|
|
|
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* grant datasource
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @param userId user id
|
|
|
|
* @param datasourceIds data source id array
|
|
|
|
* @return grant result code
|
|
|
|
*/
|
|
|
|
@Transactional(rollbackFor = RuntimeException.class)
|
|
|
|
public Map<String, Object> grantDataSource(User loginUser, int userId, String datasourceIds) {
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
|
|
|
result.put(Constants.STATUS, false);
|
|
|
|
|
|
|
|
//only admin can operate
|
|
|
|
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
User user = userMapper.selectById(userId);
|
|
|
|
if(user == null){
|
|
|
|
putMsg(result, Status.USER_NOT_EXIST, userId);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
datasourceUserMapper.deleteByUserId(userId);
|
|
|
|
|
|
|
|
if (check(result, StringUtils.isEmpty(datasourceIds), Status.SUCCESS)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
String[] datasourceIdArr = datasourceIds.split(",");
|
|
|
|
|
|
|
|
for (String datasourceId : datasourceIdArr) {
|
|
|
|
Date now = new Date();
|
|
|
|
|
|
|
|
DatasourceUser datasourceUser = new DatasourceUser();
|
|
|
|
datasourceUser.setUserId(userId);
|
|
|
|
datasourceUser.setDatasourceId(Integer.parseInt(datasourceId));
|
|
|
|
datasourceUser.setPerm(7);
|
|
|
|
datasourceUser.setCreateTime(now);
|
|
|
|
datasourceUser.setUpdateTime(now);
|
|
|
|
datasourceUserMapper.insert(datasourceUser);
|
|
|
|
}
|
|
|
|
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* query user info
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @return user info
|
|
|
|
*/
|
|
|
|
public Map<String, Object> getUserInfo(User loginUser) {
|
|
|
|
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
|
|
|
|
|
User user = null;
|
|
|
|
if (loginUser.getUserType() == UserType.ADMIN_USER) {
|
|
|
|
user = loginUser;
|
|
|
|
} else {
|
|
|
|
user = userMapper.queryDetailsById(loginUser.getId());
|
|
|
|
|
|
|
|
List<AlertGroup> alertGroups = alertGroupMapper.queryByUserId(loginUser.getId());
|
|
|
|
|
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
|
|
|
|
|
if (alertGroups != null && alertGroups.size() > 0) {
|
|
|
|
for (int i = 0; i < alertGroups.size() - 1; i++) {
|
|
|
|
sb.append(alertGroups.get(i).getGroupName() + ",");
|
|
|
|
}
|
|
|
|
sb.append(alertGroups.get(alertGroups.size() - 1));
|
|
|
|
user.setAlertGroup(sb.toString());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
result.put(Constants.DATA_LIST, user);
|
|
|
|
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* query user list
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @return user list
|
|
|
|
*/
|
|
|
|
public Map<String, Object> queryAllGeneralUsers(User loginUser) {
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
|
|
|
//only admin can operate
|
|
|
|
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
List<User> userList = userMapper.queryAllGeneralUser();
|
|
|
|
result.put(Constants.DATA_LIST, userList);
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* query user list
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @return user list
|
|
|
|
*/
|
|
|
|
public Map<String, Object> queryUserList(User loginUser) {
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
|
|
|
//only admin can operate
|
|
|
|
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
List<User> userList = userMapper.selectList(null );
|
|
|
|
result.put(Constants.DATA_LIST, userList);
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* verify user name exists
|
|
|
|
*
|
|
|
|
* @param userName user name
|
|
|
|
* @return true if user name not exists, otherwise return false
|
|
|
|
*/
|
|
|
|
public Result verifyUserName(String userName) {
|
|
|
|
|
|
|
|
Result result = new Result();
|
|
|
|
User user = userMapper.queryByUserNameAccurately(userName);
|
|
|
|
if (user != null) {
|
|
|
|
logger.error("user {} has exist, can't create again.", userName);
|
|
|
|
|
|
|
|
putMsg(result, Status.USER_NAME_EXIST);
|
|
|
|
} else {
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* unauthorized user
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @param alertgroupId alert group id
|
|
|
|
* @return unauthorize result code
|
|
|
|
*/
|
|
|
|
public Map<String, Object> unauthorizedUser(User loginUser, Integer alertgroupId) {
|
|
|
|
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
|
|
|
//only admin can operate
|
|
|
|
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
List<User> userList = userMapper.selectList(null );
|
|
|
|
List<User> resultUsers = new ArrayList<>();
|
|
|
|
Set<User> userSet = null;
|
|
|
|
if (userList != null && userList.size() > 0) {
|
|
|
|
userSet = new HashSet<>(userList);
|
|
|
|
|
|
|
|
List<User> authedUserList = userMapper.queryUserListByAlertGroupId(alertgroupId);
|
|
|
|
|
|
|
|
Set<User> authedUserSet = null;
|
|
|
|
if (authedUserList != null && authedUserList.size() > 0) {
|
|
|
|
authedUserSet = new HashSet<>(authedUserList);
|
|
|
|
userSet.removeAll(authedUserSet);
|
|
|
|
}
|
|
|
|
resultUsers = new ArrayList<>(userSet);
|
|
|
|
}
|
|
|
|
result.put(Constants.DATA_LIST, resultUsers);
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* authorized user
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @param alertgroupId alert group id
|
|
|
|
* @return authorized result code
|
|
|
|
*/
|
|
|
|
public Map<String, Object> authorizedUser(User loginUser, Integer alertgroupId) {
|
[Draft][Merge][133-dev]133 merge dev (#4031)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
* [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306)
* [Feture-3327][ui]Add the function of re-uploading files in the resource center
Co-authored-by: wuchunfu <319355703@qq.com>
* [Improvement-3327][api]support re-upload the resource file (#3395)
* [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396)
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* [Fix-3390][api]Running hive sql task need find the hdfs path correctly
* update soft version
* hive UDF function to modify the background color
* fix
* fix bug: Fix master task dependency check bug
* cancel spark task version check (#3406)
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
* [Bug][ui]Fix front-end bug #3413
* [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410)
* Optimize dag
* Update actions.js (#3401)
* [Fix-3256][ui] Fix admin user info update error (#3425) (#3428)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure
* dag connection add check
* fix
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454)
* Remove node deep monitoring
* If worker group id is null,don't need to set the value of the worker group (#3460)
* [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x
* [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group
* [ui]Code optimization
* fix
* fix
* [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js
* [optimization][ui]Prevent the shell script input box from being empty
* [Fix-3462][api]If login user is admin,need list all udfs (#3465)
* [Fix-3462][api]If login user is admin,need list all udfs
* [Fix-3462][api]add the test on the method of QueryUdfFuncList
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3462][api]fix the code smell
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482)
* [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
* [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory
* fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ci_e2e fail (#3497)
* [Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource
* [Fix-3469][api]Should list python file and jar file
* [Fix-3469][api]Should filter the resource by the different program type
* [Fix-3469][api]fix the code smell
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types
* fix
* Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb73c9682739308a0a98887a1c0f407ef.
* test
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* fix ds muti-level directory in zk, which lead to fail to assign work
* add login user check some actions in api
* [Hotfix][ci] Fix e2e ci docker image build error
* modify tag 1.3.0 to HEAD
* modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* remove OGNL part of the mybaits notice (#3526)
* [maven-release-plugin] prepare release 1.3.2
* [maven-release-plugin] prepare for next development iteration
* release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Script input box to modify the delay loading time
* fix
* fix
* fix
* fix
* modify general user can't create token
* [ui]It is forbidden to select non-existent resources and modify the tree display data format
* modify general user can't create token (#3533)
* [Feature] JVM parameter optimization , related issue #3370
* [Feature] JVM parameter optimization , related issue #3370
* test release 1.3.2 version rollback
* test release 1.3.2 version rollback
* test
* test release 1.3.2 version rollback
* modify tag 1.3.0 to HEAD
* modify general user can't create token
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* if task is null , set task type is null instead of "null"
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537)
* [Fix-3536][api]If user didn't have tenant,create resource will NPE
* [Fix-3536][api]If user didn't have tenant,create resource directory will NPE
* modify general user can't create,delete,update token (#3538)
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* [ui]Resource delete OK button to increase loading, change the number of homepage display cursor
* fix
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3748)
* [fixbug][ui]Repair the master and worker management instrument display
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741)
* [fixbug][ui]Remove non-existent or deleted resources disabled
* [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select
* [fix-3553][ui]Repair click workflow connection, select the entire path
* fix
* fix
* [Fix-3238][docker]Fix that can not create folder in docker with standalone mode
* [Fix-3616][Server] when worker akc/response master exception , async retry (#3776)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Improvement-3720][ui] js mailbox verification fix
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3124][docker]Fix that can not build a docker image on windows (#3765)
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
* [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect
* [BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'
* '3258'
* Update WorkerGroupServiceTest.java
* Delete UserState.java
* Delete ResourceSyncService.java
* Delete core-site.xml
* Delete hdfs-site.xml
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
* [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
* [Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
* Update dolphinscheduler-daemon.sh
* catfile method Stream not closed
* catfile method Stream not closed
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3713][common]Fix that catfile method Stream not closed
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
* [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading
* [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt
* Feature: Add test cases
* Update TenantServiceTest.java
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
* Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
* [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state
* add verify tenant name cannot contain special characters.
* [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
* fix
* fix
* fix
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
* [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
* [fixbug-3887][ui]Fix missing English translation of re-upload files
* add process define name verify. (#3879)
* Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
* revert pr 3872
* [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.
* delete unused code
* update code smell
* refactor sub work command process
* add process service ut
* add license header
* fix some code smell
* chang ut java8 to java11
* update sonar to java11
* copy ut config from dev
* remove checkstyle
* revert to 1.3.3
* change proess service test to executor service
* add process service test
* add process service test
* revert
* revert
* add comments
* change dev to 1.3.3-release
* revert
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907)
* [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message
* fix code smell
* fix code smell
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
Co-authored-by: Kirs <acm_master@163.com>
* Repair check box cannot be canceled
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly
Co-authored-by: Kirs <acm_master@163.com>
* [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un
* Workflow definition name re-modified and added check
* [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly.
* update code.
* [#3931][ui]Field name optimization for spark, flink, and mr
* change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934)
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935)
* fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master
* [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty
* solve too many files, close logClientService (#3971)
* fix #3966 sub process doesnot send alert mail after process instance ending. (#3972)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975)
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3618][server] resolve task executed finished but not release the file handle
* [Fix-#3958][api] files should not be created successfully in the directory of the authorized file
* [FIX-3966] The timeout warning does not take effect in sub_process (#3982)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* fix import dolphinscheduler_mysql.sql insert admin user data
* [FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.
* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.
* fix code smell
* fix code smell
* fix code smell
* update worker group inherit from parent
* remove stdout in logback configuration
* fix bug #3929 condition task would post error when failover.
* remove unused test
* add comments
* add skip node judge
* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* revert pom version to 1.3.3-release
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* [release]revert pom version to 1.3.3-release
* fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
* [maven-release-plugin] prepare release 1.3.3
* [maven-release-plugin] prepare for next development iteration
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut test
* refactor ut test
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor ut
* merge from 1.3.3-release
* refactor ut
* refactor ut
* refactor
* refactor
* refactor code style
* refactor code style
* refactor code style
* refactor code style
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* merge from 1.3.3-release
* refactor code style
Co-authored-by: break60 <790061044@qq.com>
Co-authored-by: wuchunfu <319355703@qq.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: Yelli <amarantine@my.com>
Co-authored-by: Eights-Li <yelli.hl@gmail.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com>
Co-authored-by: Yichao Yang <1048262223@qq.com>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: Jave-Chen <baicai.chen@gmail.com>
Co-authored-by: zhuangchong <zhuangchong6@163.com>
Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: lgcareer <lgcareer@apache.org>
Co-authored-by: wulingqi <wulingqi@baijiahulian.com>
4 years ago
|
|
|
Map<String, Object> result = new HashMap<>(5);
|
|
|
|
//only admin can operate
|
|
|
|
if (check(result, !isAdmin(loginUser), Status.USER_NO_OPERATION_PERM)) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
List<User> userList = userMapper.queryUserListByAlertGroupId(alertgroupId);
|
|
|
|
result.put(Constants.DATA_LIST, userList);
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param tenantId tenant id
|
|
|
|
* @return true if tenant exists, otherwise return false
|
|
|
|
*/
|
|
|
|
private boolean checkTenantExists(int tenantId) {
|
|
|
|
return tenantMapper.queryById(tenantId) != null ? true : false;
|
|
|
|
}
|
merge dev-db to dev (#1426)
* [dolphinscheduler-1345] [newfeature] Add DB2 Datasource (#1391)
* Fix the problem that the 'queueId' is not present when creating a tenant based on the default queue. (#1409)
* dolphinscheduler-#1403][bug]improve the check rules (#1408)
1. When check failed, we don’t know whitch parameter has is wrong, Because username、password、email and phone were checks together. I refactored the check method ,Now it will return failed msg by each field.
2. The email check regex support [_|\-|\.]?) in createUser.vue, But it do not support in backend server , I fix it, Now they have the same check regex both in frontend and backend
* jcip-annotations define version information and maven-assembly-plugin add groupId (#1413)
* "v-for" add key (#1419)
* [dolphinscheduler-#1397] [bug]Resources can not be previewed or updated (#1406)
When create an resource the name will add the suffix, But When rename the resource there is no suffix add to the name, So When update resource name without suffix just like "test.sh" => "test" , Then the bug reproduced.
To fix this bug i add the logic bellow:
When rename, if the name without suffix then add it ,else use the origin name
* simply server module configs (#1424)
* move updateTaskState into try/catch block in case of exception
* fix NPE
* using conf.getInt instead of getString
* for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
for AlertDao, correct the spelling.
* duplicate
* refactor getTaskWorkerGroupId
* add friendly log
* update hearbeat thread num = 1
* fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
* 1. move verifyTaskInstanceIsNull after taskInstance
2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
* fix the message
* delete before check to avoid KeeperException$NoNodeException
* fix the message
* check processInstance state before delete tenant
* check processInstance state before delete worker group
* refactor
* merge api constants into common constatns
* update the resource perm
* update the dataSource perm
* fix CheckUtils.checkUserParams method
* update AlertGroupService, extends from BaseService, remove duplicate methods
* refactor
* modify method name
* add hasProjectAndPerm method
* using checkProject instead of getResultStatus
* delete checkAuth method, using hasProjectAndPerm instead.
* correct spelling
* add transactional for deleteWorkerGroupById
* add Transactional for deleteProcessInstanceById method
* change sqlSessionTemplate singleton
* change sqlSessionTemplate singleton and reformat code
* fix unsuitable error message
* update shutdownhook methods
* fix worker log bug
* fix api server debug mode bug
* upgrade zk version
* delete this line ,for zkClient.close() will do the whole thing
* fix master server shutdown error
* degrade zk version and add FourLetterWordMain class
* fix PathChildrenCache not close
* add Transactional for createSession method
* add more message for java-doc
* delete App, let spring manage connectionFactory
* add license
* add class Application for test support
* refactor masterServer and workerServer
* add args
* fix the spring transaction not work bug
* remove author
* delete @Bean annotation
* delete master/worker properties
* updates
* rename application.properties to application-dao.properties
* delete this class
* delete master/worker properties and refactory master/worker
* delete unused imports
* merge
* delete unused config
5 years ago
|
|
|
|
|
|
|
/**
|
|
|
|
*
|
|
|
|
* @param userName
|
|
|
|
* @param password
|
|
|
|
* @param email
|
|
|
|
* @param phone
|
|
|
|
* @return if check failed return the field, otherwise return null
|
|
|
|
*/
|
|
|
|
private String checkUserParams(String userName, String password, String email, String phone) {
|
|
|
|
|
|
|
|
String msg = null;
|
|
|
|
if (!CheckUtils.checkUserName(userName)) {
|
|
|
|
|
|
|
|
msg = userName;
|
|
|
|
} else if (!CheckUtils.checkPassword(password)) {
|
|
|
|
|
|
|
|
msg = password;
|
|
|
|
} else if (!CheckUtils.checkEmail(email)) {
|
|
|
|
|
|
|
|
msg = email;
|
|
|
|
} else if (!CheckUtils.checkPhone(phone)) {
|
|
|
|
|
|
|
|
msg = phone;
|
|
|
|
}
|
|
|
|
|
|
|
|
return msg;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* copy resource files
|
|
|
|
* @param resourceComponent resource component
|
|
|
|
* @param srcBasePath src base path
|
|
|
|
* @param dstBasePath dst base path
|
|
|
|
* @throws IOException io exception
|
|
|
|
*/
|
|
|
|
private void copyResourceFiles(ResourceComponent resourceComponent, String srcBasePath, String dstBasePath) throws IOException {
|
|
|
|
List<ResourceComponent> components = resourceComponent.getChildren();
|
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(components)) {
|
|
|
|
for (ResourceComponent component:components) {
|
|
|
|
// verify whether exist
|
|
|
|
if (!HadoopUtils.getInstance().exists(String.format("%s/%s",srcBasePath,component.getFullName()))){
|
|
|
|
logger.error("resource file: {} not exist,copy error",component.getFullName());
|
|
|
|
throw new ServiceException(Status.RESOURCE_NOT_EXIST);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!component.isDirctory()) {
|
|
|
|
// copy it to dst
|
|
|
|
HadoopUtils.getInstance().copy(String.format("%s/%s",srcBasePath,component.getFullName()),String.format("%s/%s",dstBasePath,component.getFullName()),false,true);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(CollectionUtils.isEmpty(component.getChildren())) {
|
|
|
|
// if not exist,need create it
|
|
|
|
if (!HadoopUtils.getInstance().exists(String.format("%s/%s",dstBasePath,component.getFullName()))) {
|
|
|
|
HadoopUtils.getInstance().mkdir(String.format("%s/%s",dstBasePath,component.getFullName()));
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
copyResourceFiles(component,srcBasePath,dstBasePath);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* register user, default state is 0, default tenant_id is 1, no phone, no queue
|
|
|
|
*
|
|
|
|
* @param userName user name
|
|
|
|
* @param userPassword user password
|
|
|
|
* @param repeatPassword repeat password
|
|
|
|
* @param email email
|
|
|
|
* @return register result code
|
|
|
|
* @throws Exception exception
|
|
|
|
*/
|
|
|
|
@Transactional(rollbackFor = RuntimeException.class)
|
|
|
|
public Map<String, Object> registerUser(String userName, String userPassword, String repeatPassword, String email) {
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
|
|
|
|
|
//check user params
|
|
|
|
String msg = this.checkUserParams(userName, userPassword, email, "");
|
|
|
|
|
|
|
|
if (!StringUtils.isEmpty(msg)) {
|
|
|
|
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,msg);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!userPassword.equals(repeatPassword)) {
|
|
|
|
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "two passwords are not same");
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
User user = createUser(userName, userPassword, email, 1, "", "", Flag.NO.ordinal());
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
result.put(Constants.DATA_LIST, user);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* activate user, only system admin have permission, change user state code 0 to 1
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @param userName user name
|
|
|
|
* @return create result code
|
|
|
|
*/
|
|
|
|
public Map<String, Object> activateUser(User loginUser, String userName) {
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
|
result.put(Constants.STATUS, false);
|
|
|
|
|
|
|
|
if (!isAdmin(loginUser)) {
|
|
|
|
putMsg(result, Status.USER_NO_OPERATION_PERM);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!CheckUtils.checkUserName(userName)){
|
|
|
|
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, userName);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
User user = userMapper.queryByUserNameAccurately(userName);
|
|
|
|
|
|
|
|
if (user == null) {
|
|
|
|
putMsg(result, Status.USER_NOT_EXIST, userName);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (user.getState() != Flag.NO.ordinal()) {
|
|
|
|
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, userName);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
user.setState(Flag.YES.ordinal());
|
|
|
|
Date now = new Date();
|
|
|
|
user.setUpdateTime(now);
|
|
|
|
userMapper.updateById(user);
|
|
|
|
User responseUser = userMapper.queryByUserNameAccurately(userName);
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
result.put(Constants.DATA_LIST, responseUser);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* activate user, only system admin have permission, change users state code 0 to 1
|
|
|
|
*
|
|
|
|
* @param loginUser login user
|
|
|
|
* @param userNames user name
|
|
|
|
* @return create result code
|
|
|
|
*/
|
|
|
|
public Map<String, Object> batchActivateUser(User loginUser, List<String> userNames) {
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
|
|
|
|
|
if (!isAdmin(loginUser)) {
|
|
|
|
putMsg(result, Status.USER_NO_OPERATION_PERM);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
int totalSuccess = 0;
|
|
|
|
List<String> successUserNames = new ArrayList<>();
|
|
|
|
Map<String, Object> successRes = new HashMap<>();
|
|
|
|
int totalFailed = 0;
|
|
|
|
List<Map<String, String>> failedInfo = new ArrayList<>();
|
|
|
|
Map<String, Object> failedRes = new HashMap<>();
|
|
|
|
for (String userName : userNames) {
|
|
|
|
Map<String, Object> tmpResult = activateUser(loginUser, userName);
|
|
|
|
if (tmpResult.get(Constants.STATUS) != Status.SUCCESS) {
|
|
|
|
totalFailed++;
|
|
|
|
Map<String, String> failedBody = new HashMap<>();
|
|
|
|
failedBody.put("userName", userName);
|
|
|
|
Status status = (Status) tmpResult.get(Constants.STATUS);
|
|
|
|
String errorMessage = MessageFormat.format(status.getMsg(), userName);
|
|
|
|
failedBody.put("msg", errorMessage);
|
|
|
|
failedInfo.add(failedBody);
|
|
|
|
} else {
|
|
|
|
totalSuccess++;
|
|
|
|
successUserNames.add(userName);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
successRes.put("sum", totalSuccess);
|
|
|
|
successRes.put("userName", successUserNames);
|
|
|
|
failedRes.put("sum", totalFailed);
|
|
|
|
failedRes.put("info", failedInfo);
|
|
|
|
Map<String, Object> res = new HashMap<>();
|
|
|
|
res.put("success", successRes);
|
|
|
|
res.put("failed", failedRes);
|
|
|
|
putMsg(result, Status.SUCCESS);
|
|
|
|
result.put(Constants.DATA_LIST, res);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|