Unverified Commit b28b4adf authored by BoYiZhang's avatar BoYiZhang Committed by GitHub
Browse files

Merge pull request #7 from apache/dev 

update code
parents f644bab7 daea87a5

docker/postgres/docker-entrypoint-initdb/init.sql

+2 −1
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ CREATE TABLE t_ds_user ( 
  create_time timestamp DEFAULT NULL ,

  update_time timestamp DEFAULT NULL ,

  queue varchar(64) DEFAULT NULL ,

  state int DEFAULT 1 ,

  PRIMARY KEY (id)

);
@@ -749,7 +750,7 @@ ALTER TABLE t_ds_worker_server ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_worker_ 




-- Records of t_ds_user?user : admin , password : dolphinscheduler123

INSERT INTO t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,create_time,update_time) VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');

INSERT INTO t_ds_user(user_name,user_password,user_type,email,phone,state,tenant_id,create_time,update_time) VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', 1, '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');



-- Records of t_ds_alertgroup，dolphinscheduler warning group

INSERT INTO t_ds_alertgroup(group_name,group_type,description,create_time,update_time)  VALUES ('dolphinscheduler warning group', '0', 'dolphinscheduler warning group','2018-11-29 10:20:39', '2018-11-29 10:20:39');

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java

+14 −11
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ public class UsersController extends BaseController { 
            @ApiImplicitParam(name = "tenantId", value = "TENANT_ID", dataType = "Int", example = "100"),

            @ApiImplicitParam(name = "queue", value = "QUEUE", dataType = "Int", example = "100"),

            @ApiImplicitParam(name = "email", value = "EMAIL", dataType = "Int", example = "100"),

            @ApiImplicitParam(name = "phone", value = "PHONE", dataType = "Int", example = "100")

            @ApiImplicitParam(name = "phone", value = "PHONE", dataType = "Int", example = "100"),

            @ApiImplicitParam(name = "state", value = "STATE", dataType = "Int", example = "1")

    })

    @PostMapping(value = "/create")

    @ResponseStatus(HttpStatus.CREATED)
@@ -83,11 +84,11 @@ public class UsersController extends BaseController { 
                             @RequestParam(value = "tenantId") int tenantId,

                             @RequestParam(value = "queue", required = false, defaultValue = "") String queue,

                             @RequestParam(value = "email") String email,

                             @RequestParam(value = "phone", required = false) String phone) throws Exception {

        logger.info("login user {}, create user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}",

                loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone, queue);



        Map<String, Object> result = usersService.createUser(loginUser, userName, userPassword, email, tenantId, phone, queue);

                             @RequestParam(value = "phone", required = false) String phone,

                             @RequestParam(value = "state", required = false) int state) throws Exception {

        logger.info("login user {}, create user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}, state: {}",

                loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone, queue, state);

        Map<String, Object> result = usersService.createUser(loginUser, userName, userPassword, email, tenantId, phone, queue, state);

        return returnDataList(result);

    }
@@ -146,7 +147,8 @@ public class UsersController extends BaseController { 
            @ApiImplicitParam(name = "tenantId", value = "TENANT_ID", dataType = "Int", example = "100"),

            @ApiImplicitParam(name = "queue", value = "QUEUE", dataType = "Int", example = "100"),

            @ApiImplicitParam(name = "email", value = "EMAIL", dataType = "Int", example = "100"),

            @ApiImplicitParam(name = "phone", value = "PHONE", dataType = "Int", example = "100")

            @ApiImplicitParam(name = "phone", value = "PHONE", dataType = "Int", example = "100"),

            @ApiImplicitParam(name = "state", value = "STATE", dataType = "Int", example = "1")

    })

    @PostMapping(value = "/update")

    @ResponseStatus(HttpStatus.OK)
@@ -158,10 +160,11 @@ public class UsersController extends BaseController { 
                             @RequestParam(value = "queue", required = false, defaultValue = "") String queue,

                             @RequestParam(value = "email") String email,

                             @RequestParam(value = "tenantId") int tenantId,

                             @RequestParam(value = "phone", required = false) String phone) throws Exception {

        logger.info("login user {}, updateProcessInstance user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}",

                loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone, queue);

        Map<String, Object> result = usersService.updateUser(id, userName, userPassword, email, tenantId, phone, queue);

                             @RequestParam(value = "phone", required = false) String phone,

                             @RequestParam(value = "state", required = false) int state) throws Exception {

        logger.info("login user {}, updateProcessInstance user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}, state: {}",

                loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone, queue, state);

        Map<String, Object> result = usersService.updateUser(id, userName, userPassword, email, tenantId, phone, queue, state);

        return returnDataList(result);

    }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java

+0 −51
Original line number Diff line number Diff line
@@ -52,35 +52,7 @@ public class WorkerGroupController extends BaseController { 
    WorkerGroupService workerGroupService;





    /**

     * create or update a worker group

     *

     * @param loginUser login user

     * @param id        worker group id

     * @param name      worker group name

     * @param ipList    ip list

     * @return create or update result code

     */

    @ApiOperation(value = "saveWorkerGroup", notes = "CREATE_WORKER_GROUP_NOTES")

    @ApiImplicitParams({

            @ApiImplicitParam(name = "id", value = "WORKER_GROUP_ID", dataType = "Int", example = "10", defaultValue = "0"),

            @ApiImplicitParam(name = "name", value = "WORKER_GROUP_NAME", required = true, dataType = "String"),

            @ApiImplicitParam(name = "ipList", value = "WORKER_IP_LIST", required = true, dataType = "String")

    })

    @PostMapping(value = "/save")

    @ResponseStatus(HttpStatus.OK)

    @ApiException(SAVE_ERROR)

    public Result saveWorkerGroup(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,

                                  @RequestParam(value = "id", required = false, defaultValue = "0") int id,

                                  @RequestParam(value = "name") String name,

                                  @RequestParam(value = "ipList") String ipList

    ) {

        logger.info("save worker group: login user {}, id:{}, name: {}, ipList: {} ",

                loginUser.getUserName(), id, name, ipList);



        Map<String, Object> result = workerGroupService.saveWorkerGroup(loginUser, id, name, ipList);

        return returnDataList(result);

    }



    /**

     * query worker groups paging
@@ -132,28 +104,5 @@ public class WorkerGroupController extends BaseController { 
        return returnDataList(result);

    }



    /**

     * delete worker group by id

     *

     * @param loginUser login user

     * @param id        group id

     * @return delete result code

     */

    @ApiOperation(value = "deleteById", notes = "DELETE_WORKER_GROUP_BY_ID_NOTES")

    @ApiImplicitParams({

            @ApiImplicitParam(name = "id", value = "WORKER_GROUP_ID", required = true, dataType = "Int", example = "10"),



    })

    @GetMapping(value = "/delete-by-id")

    @ResponseStatus(HttpStatus.OK)

    @ApiException(DELETE_WORKER_GROUP_FAIL)

    public Result deleteById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,

                             @RequestParam("id") Integer id

    ) {

        logger.info("delete worker group: login user {}, id:{} ",

                loginUser.getUserName(), id);



        Map<String, Object> result = workerGroupService.deleteWorkerGroupById(id);

        return returnDataList(result);

    }

}

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/ResourceTreeVisitor.java

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public class ResourceTreeVisitor implements Visitor{ 
     * visit

     * @return resoruce component

     */

    @Override

    public ResourceComponent visit() {

        ResourceComponent rootDirectory = new Directory();

        for (Resource resource : resourceList) {
@@ -117,6 +118,7 @@ public class ResourceTreeVisitor implements Visitor{ 
        }else{

            tempResourceComponent = new FileLeaf();

        }

        

        tempResourceComponent.setName(resource.getAlias());

        tempResourceComponent.setFullName(resource.getFullName().replaceFirst("/",""));

        tempResourceComponent.setId(resource.getId());

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ public enum Status { 
    QUERY_WORKER_GROUP_FAIL(10146,"query worker group fail ", "查询worker分组失败"),

    DELETE_WORKER_GROUP_FAIL(10147,"delete worker group fail ", "删除worker分组失败"),

    COPY_PROCESS_DEFINITION_ERROR(10148,"copy process definition error", "复制工作流错误"),

    USER_DISABLED(10149,"The current user is disabled", "当前用户已停用"),



    UDF_FUNCTION_NOT_EXIST(20001, "UDF function not found", "UDF函数不存在"),

    UDF_FUNCTION_EXISTS(20002, "UDF function already exists", "UDF函数已存在"),