Commit 415770c1 authored by lenboo's avatar lenboo
Browse files

Merge remote-tracking branch 'upstream/dev-1.1.0' into dev-1.1.0

parents 67f82d71 1b1e8e85

escheduler-alert/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    <parent>

        <groupId>cn.analysys</groupId>

        <artifactId>escheduler</artifactId>

        <version>1.0.4-SNAPSHOT</version>

        <version>1.1.0-SNAPSHOT</version>

    </parent>

    <artifactId>escheduler-alert</artifactId>

    <packaging>jar</packaging>

escheduler-api/pom.xml

+2 −3
Original line number Diff line number Diff line 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

  <modelVersion>4.0.0</modelVersion>

  <parent>

    <groupId>cn.analysys</groupId>

    <artifactId>escheduler</artifactId>

    <version>1.0.4-SNAPSHOT</version>

    <version>1.1.0-SNAPSHOT</version>

  </parent>

  <artifactId>escheduler-api</artifactId>

  <packaging>jar</packaging>

escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java

+6 −1
Original line number Diff line number Diff line
@@ -369,7 +369,12 @@ public class ResourcesService extends BaseService { 
    public Map<String, Object> queryResourceList(User loginUser, ResourceType type) {



        Map<String, Object> result = new HashMap<>(5);

        List<Resource> resourceList = resourcesMapper.queryResourceListAuthored(loginUser.getId(), type.ordinal());

        List<Resource> resourceList;

        if(isAdmin(loginUser)){

            resourceList = resourcesMapper.listAllResourceByType(type.ordinal());

        }else{

            resourceList = resourcesMapper.queryResourceListAuthored(loginUser.getId(), type.ordinal());

        }

        result.put(Constants.DATA_LIST, resourceList);

        putMsg(result,Status.SUCCESS);

escheduler-common/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<parent>

		<artifactId>escheduler</artifactId>

		<groupId>cn.analysys</groupId>

		<version>1.0.4-SNAPSHOT</version>

		<version>1.1.0-SNAPSHOT</version>

	</parent>

	<artifactId>escheduler-common</artifactId>

	<name>escheduler-common</name>

escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueZkImpl.java

+11 −8
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public class TaskQueueZkImpl extends AbstractZKClient implements ITaskQueue { 
                    String taskDetail = list.get(i);

                    String[] taskDetailArrs = taskDetail.split(Constants.UNDERLINE);



                    //向前版本兼ProcessInstanceService容

                    //forward compatibility 向前版本兼容

                    if(taskDetailArrs.length >= 4){



                        //format ${processInstancePriority}_${processInstanceId}_${taskInstancePriority}_${taskId}
@@ -227,15 +227,18 @@ public class TaskQueueZkImpl extends AbstractZKClient implements ITaskQueue { 
        String[] taskArray = formatTask.split(Constants.UNDERLINE);

        int processInstanceId = Integer.parseInt(taskArray[1]);

        int taskId = Integer.parseInt(taskArray[3]);

        String suffix = "";



        StringBuilder sb = new StringBuilder(50);

        String destTask = String.format("%s_%s_%s_%s", taskArray[0], processInstanceId, taskArray[3], taskId);



        sb.append(destTask);



        if(taskArray.length > 4){

            for(int index = 4; index < taskArray.length; index++){

            suffix += taskArray[index] + Constants.UNDERLINE;

                sb.append(Constants.UNDERLINE).append(taskArray[index]);

            }

        String destTask = String.format("%s_%s_%s_%s", taskArray[0], processInstanceId, taskArray[3], taskId);

        if(StringUtils.isNotEmpty(suffix)){

            destTask += Constants.UNDERLINE + suffix;

        }

        return destTask;

        return sb.toString();

    }



    @Override