Unverified Commit 267df899 authored by 乔占卫's avatar 乔占卫 Committed by GitHub
Browse files

Merge pull request #81 from qiaozhanwei/dev-20190415 

dev merge
parents 9df5d43e cd60898a

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.0-SNAPSHOT</version>

        <version>1.0.1-SNAPSHOT</version>

    </parent>

    <artifactId>escheduler-alert</artifactId>

    <packaging>jar</packaging>

escheduler-api/pom.xml

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

    <groupId>cn.analysys</groupId>

    <artifactId>escheduler</artifactId>

    <version>1.0.0-SNAPSHOT</version>

    <version>1.0.1-SNAPSHOT</version>

  </parent>

  <artifactId>escheduler-api</artifactId>

  <packaging>jar</packaging>

escheduler-api/src/main/java/cn/escheduler/api/quartz/ProcessScheduleJob.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class ProcessScheduleJob implements Job { 
        }



        Command command = new Command();

        command.setCommandType(CommandType.START_PROCESS);

        command.setCommandType(CommandType.SCHEDULER);

        command.setExecutorId(schedule.getUserId());

        command.setFailureStrategy(schedule.getFailureStrategy());

        command.setProcessDefinitionId(schedule.getProcessDefinitionId());

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.0-SNAPSHOT</version>

		<version>1.0.1-SNAPSHOT</version>

	</parent>

	<artifactId>escheduler-common</artifactId>

	<name>escheduler-common</name>

escheduler-common/src/main/java/cn/escheduler/common/Constants.java

+7 −23
Original line number Diff line number Diff line
@@ -70,25 +70,6 @@ public final class Constants { 
     */

    public static final String YARN_APPLICATION_STATUS_ADDRESS = "yarn.application.status.address";



    /**

     * spring.redis.maxIdle

     */

    public static final String SPRING_REDIS_MAXIDLE = "spring.redis.maxIdle";



    /**

     * spring.redis.maxTotal

     */

    public static final String SPRING_REDIS_MAXTOTAL = "spring.redis.maxTotal";



    /**

     * spring.redis.host

     */

    public static final String SPRING_REDIS_HOST = "spring.redis.host";



    /**

     * spring.redis.port

     */

    public static final String SPRING_REDIS_PORT = "spring.redis.port";



    /**

     * hdfs configuration
@@ -117,9 +98,14 @@ public final class Constants { 
    public static final String ESCHEDULER_ENV_PATH = "escheduler.env.path";



    /**

     * escheduler.env.py

     * escheduler.env.sh

     */

    public static final String ESCHEDULER_ENV_PY = "escheduler.env.py";

    public static final String ESCHEDULER_ENV_SH = ".escheduler_env.sh";



    /**

     * python home

     */

    public static final String PYTHON_HOME="PYTHON_HOME";



    /**

     * resource.view.suffixs
@@ -255,8 +241,6 @@ public final class Constants { 


    public static final String SCHEDULER_QUEUE_IMPL = "escheduler.queue.impl";



    public static final String SCHEDULER_QUEUE_REDIS_IMPL = "redis";





    /**

     * date format of yyyy-MM-dd HH:mm:ss