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

README.md

@@ -50,7 +50,7 @@ Easy Scheduler
 
 ### 近期研发计划
 
-EasyScheduler的工作计划：<a href="https://github.com/analysys/EasyScheduler/projects/1" target="_blank">研发计划</a> ，其中 In Develop卡片下是1.0.2版本的功能，TODO卡片是待做事项(包括 feature ideas)
+EasyScheduler的工作计划：<a href="https://github.com/analysys/EasyScheduler/projects/1" target="_blank">研发计划</a> ，其中 In Develop卡片下是1.1.0版本的功能，TODO卡片是待做事项(包括 feature ideas)
 
 ### 贡献代码
 

docs/zh_CN/快速上手.md

@@ -1,7 +1,7 @@
 # 快速上手
 
 * 管理员用户登录
-  >地址：192.168.xx.xx:8888 用户名密码：admin/esheduler123
+  >地址：192.168.xx.xx:8888 用户名密码：admin/escheduler123
 
 <p align="center">
    <img src="https://analysys.github.io/easyscheduler_docs_cn/images/login.jpg" width="60%" />

escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java

@@ -24,7 +24,7 @@ import cn.escheduler.api.utils.Constants;
 import cn.escheduler.api.utils.Result;
 import cn.escheduler.common.enums.*;
 import cn.escheduler.dao.model.User;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,9 +38,9 @@ import static cn.escheduler.api.enums.Status.*;
 
 
 /**
- * execute task controller
+ * execute process controller
  */
-@ApiIgnore
+@Api(tags = "PROCESS_INSTANCE_EXECUTOR_TAG", position = 1)
 @RestController
 @RequestMapping("projects/{projectName}/executors")
 public class ExecutorController extends BaseController {
@@ -53,10 +53,27 @@ public class ExecutorController extends BaseController {
     /**
      * execute process instance
      */
+    @ApiOperation(value = "startProcessInstance", notes= "RUN_PROCESS_INSTANCE_NOTES")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "processDefinitionId", value = "PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100"),
+            @ApiImplicitParam(name = "scheduleTime", value = "SCHEDULE_TIME", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "failureStrategy", value = "FAILURE_STRATEGY", required = true, dataType ="FailureStrategy"),
+            @ApiImplicitParam(name = "startNodeList", value = "START_NODE_LIST", dataType ="String"),
+            @ApiImplicitParam(name = "taskDependType", value = "TASK_DEPEND_TYPE", dataType ="TaskDependType"),
+            @ApiImplicitParam(name = "execType", value = "COMMAND_TYPE", dataType ="CommandType"),
+            @ApiImplicitParam(name = "warningType", value = "WARNING_TYPE",required = true, dataType ="WarningType"),
+            @ApiImplicitParam(name = "warningGroupId", value = "WARNING_GROUP_ID",required = true, dataType ="Int", example = "100"),
+            @ApiImplicitParam(name = "receivers", value = "RECEIVERS",dataType ="String" ),
+            @ApiImplicitParam(name = "receiversCc", value = "RECEIVERS_CC",dataType ="String" ),
+            @ApiImplicitParam(name = "runMode", value = "RUN_MODE",dataType ="RunMode" ),
+            @ApiImplicitParam(name = "processInstancePriority", value = "PROCESS_INSTANCE_PRIORITY", required = true, dataType = "Priority" ),
+            @ApiImplicitParam(name = "workerGroupId", value = "WORKER_GROUP_ID", dataType = "Int",example = "100"),
+            @ApiImplicitParam(name = "timeout", value = "TIMEOUT", dataType = "Int",example = "100"),
+    })
     @PostMapping(value = "start-process-instance")
     @ResponseStatus(HttpStatus.OK)
-    public Result startProcessInstance(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
-                                       @PathVariable String projectName,
+    public Result startProcessInstance(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                       @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                        @RequestParam(value = "processDefinitionId") int processDefinitionId,
                                        @RequestParam(value = "scheduleTime", required = false) String scheduleTime,
                                        @RequestParam(value = "failureStrategy", required = true) FailureStrategy failureStrategy,
@@ -102,10 +119,15 @@ public class ExecutorController extends BaseController {
      * @param processInstanceId
      * @return
      */
+    @ApiOperation(value = "execute", notes= "EXECUTE_ACTION_TO_PROCESS_INSTANCE_NOTES")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "processInstanceId", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100"),
+            @ApiImplicitParam(name = "executeType", value = "EXECUTE_TYPE", required = true, dataType = "ExecuteType")
+    })
     @PostMapping(value = "/execute")
     @ResponseStatus(HttpStatus.OK)
-    public Result execute(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
-                                                  @PathVariable String projectName,
+    public Result execute(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                          @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                                   @RequestParam("processInstanceId") Integer processInstanceId,
                                                   @RequestParam("executeType") ExecuteType executeType
     ) {
@@ -127,9 +149,13 @@ public class ExecutorController extends BaseController {
      * @param processDefinitionId
      * @return
      */
+    @ApiOperation(value = "startCheckProcessDefinition", notes= "START_CHECK_PROCESS_DEFINITION_NOTES")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "processDefinitionId", value = "PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100")
+    })
     @PostMapping(value = "/start-check")
     @ResponseStatus(HttpStatus.OK)
-    public Result startCheckProcessDefinition(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+    public Result startCheckProcessDefinition(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                              @RequestParam(value = "processDefinitionId") int processDefinitionId) {
         logger.info("login user {}, check process definition", loginUser.getUserName(), processDefinitionId);
         try {
@@ -149,9 +175,16 @@ public class ExecutorController extends BaseController {
      * @param processDefinitionId
      * @return
      */
+    @ApiIgnore
+    @ApiOperation(value = "getReceiverCc", notes= "GET_RECEIVER_CC_NOTES")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "processDefinitionId", value = "PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100"),
+            @ApiImplicitParam(name = "processInstanceId", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100")
+
+    })
     @GetMapping(value = "/get-receiver-cc")
     @ResponseStatus(HttpStatus.OK)
-    public Result getReceiverCc(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+    public Result getReceiverCc(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam(value = "processDefinitionId",required = false) Integer processDefinitionId,
                                 @RequestParam(value = "processInstanceId",required = false) Integer processInstanceId) {
         logger.info("login user {}, get process definition receiver and cc", loginUser.getUserName());

escheduler-common/src/main/java/cn/escheduler/common/utils/DependentUtils.java

@@ -95,6 +95,9 @@ public class DependentUtils {
             case "last7Days":
                 result = DependentDateUtils.getLastDayInterval(businessDate, 7);
                 break;
+            case "thisWeek":
+                result = DependentDateUtils.getThisWeekInterval(businessDate);
+                break;
             case "lastWeek":
                 result = DependentDateUtils.getLastWeekInterval(businessDate);
                 break;
@@ -119,6 +122,9 @@ public class DependentUtils {
             case "lastSunday":
                 result = DependentDateUtils.getLastWeekOneDayInterval(businessDate, 7);
                 break;
+            case "thisMonth":
+                result = DependentDateUtils.getThisMonthInterval(businessDate);
+                break;
             case "lastMonth":
                 result = DependentDateUtils.getLastMonthInterval(businessDate);
                 break;

escheduler-common/src/main/java/cn/escheduler/common/utils/dependent/DependentDateUtils.java

@@ -76,6 +76,16 @@ public class DependentDateUtils {
         return dateIntervals;
     }
 
+    /**
+     * get interval between this month first day and businessDate
+     * @param businessDate
+     * @return
+     */
+    public static List<DateInterval> getThisMonthInterval(Date businessDate) {
+        Date firstDay = DateUtils.getFirstDayOfMonth(businessDate);
+        return getDateIntervalListBetweenTwoDates(firstDay, businessDate);
+    }
+
     /**
      * get interval between last month first day and last day
      * @param businessDate
@@ -108,6 +118,16 @@ public class DependentDateUtils {
         }
     }
 
+    /**
+     * get interval between monday to businessDate of this week
+     * @param businessDate
+     * @return
+     */
+    public static List<DateInterval> getThisWeekInterval(Date businessDate) {
+        Date mondayThisWeek = DateUtils.getMonday(businessDate);
+        return getDateIntervalListBetweenTwoDates(mondayThisWeek, businessDate);
+    }
+
     /**
      * get interval between monday to sunday of last week
      * default set monday the first day of week

escheduler-common/src/test/java/cn/escheduler/common/utils/DependentUtilsTest.java

@@ -80,6 +80,26 @@ public class DependentUtilsTest {
         Assert.assertEquals(dateIntervals.get(0), diCur);
 
 
+        dateValue = "thisWeek";
+        Date firstWeekDay = DateUtils.getMonday(curDay);
+        dateIntervals = DependentUtils.getDateIntervalList(curDay, dateValue);
+
+        DateInterval weekHead = new DateInterval(DateUtils.getStartOfDay(firstWeekDay), DateUtils.getEndOfDay(firstWeekDay));
+        DateInterval weekThis = new DateInterval(DateUtils.getStartOfDay(curDay), DateUtils.getEndOfDay(curDay));
+
+        Assert.assertEquals(dateIntervals.get(0), weekHead);
+        Assert.assertEquals(dateIntervals.get(dateIntervals.size() - 1), weekThis);
+
+
+        dateValue = "thisMonth";
+        Date firstMonthDay = DateUtils.getFirstDayOfMonth(curDay);
+        dateIntervals = DependentUtils.getDateIntervalList(curDay, dateValue);
+
+        DateInterval monthHead = new DateInterval(DateUtils.getStartOfDay(firstMonthDay), DateUtils.getEndOfDay(firstMonthDay));
+        DateInterval monthThis = new DateInterval(DateUtils.getStartOfDay(curDay), DateUtils.getEndOfDay(curDay));
+
+        Assert.assertEquals(dateIntervals.get(0), monthHead);
+        Assert.assertEquals(dateIntervals.get(dateIntervals.size() - 1), monthThis);
 
     }
 

escheduler-server/src/main/java/cn/escheduler/server/master/MasterServer.java

@@ -216,7 +216,7 @@ public class MasterServer implements CommandLineRunner, IStoppable {
                 if(Stopper.isRunning()) {
                     // send heartbeat to zk
                     if (StringUtils.isBlank(zkMasterClient.getMasterZNode())) {
-                        logger.error("master send heartbeat to zk failed");
+                        logger.error("master send heartbeat to zk failed: can't find zookeeper regist path of master server");
                         return;
                     }
 

escheduler-server/src/main/java/cn/escheduler/server/quartz/QuartzExecutors.java

@@ -230,6 +230,8 @@ public class QuartzExecutors {
       if(scheduler.checkExists(jobKey)){
         logger.info("try to delete job, job name: {}, job group name: {},", jobName, jobGroupName);
         return scheduler.deleteJob(jobKey);
+      }else {
+        return true;
       }
 
     } catch (SchedulerException e) {

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js

@@ -64,6 +64,10 @@ const dateValueList = {
     }
   ],
   'week': [
+    {
+      value: 'thisWeek',
+      label: `${i18n.$t('ThisWeek')}`
+    },
     {
       value: 'lastWeek',
       label: `${i18n.$t('LastWeek')}`
@@ -98,6 +102,10 @@ const dateValueList = {
     }
   ],
   'month': [
+    {
+      value: 'thisMonth',
+      label: `${i18n.$t('ThisMonth')}`
+    },
     {
       value: 'lastMonth',
       label: `${i18n.$t('LastMonth')}`

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/util.js

@@ -37,7 +37,7 @@ let warningTypeList = [
 ]
 
 const isEmial = (val) => {
-  let regEmail = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // eslint-disable-line
+  let regEmail = /^([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // eslint-disable-line
   return regEmail.test(val)
 }
 

escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

@@ -129,7 +129,7 @@
         }
       },
       _verification () {
-        let regEmail = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // eslint-disable-line
+        let regEmail = /^([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // eslint-disable-line
         // Mobile phone number regular
         let regPhone = /^1(3|4|5|6|7|8)\d{9}$/; // eslint-disable-line
 

escheduler-ui/src/js/module/i18n/locale/en_US.js

@@ -395,6 +395,7 @@ export default {
   'Last2Days': 'Last2Days',
   'Last3Days': 'Last3Days',
   'Last7Days': 'Last7Days',
+  'ThisWeek': 'ThisWeek',
   'LastWeek': 'LastWeek',
   'LastMonday': 'LastMonday',
   'LastTuesday': 'LastTuesday',
@@ -403,6 +404,7 @@ export default {
   'LastFriday': 'LastFriday',
   'LastSaturday': 'LastSaturday',
   'LastSunday': 'LastSunday',
+  'ThisMonth': 'ThisMonth',
   'LastMonth': 'LastMonth',
   'LastMonthBegin': 'LastMonthBegin',
   'LastMonthEnd': 'LastMonthEnd',

escheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -395,6 +395,7 @@ export default {
   'Last2Days': '前两天',
   'Last3Days': '前三天',
   'Last7Days': '前七天',
+  'ThisWeek': '本周',
   'LastWeek': '上周',
   'LastMonday': '上周一',
   'LastTuesday': '上周二',
@@ -403,6 +404,7 @@ export default {
   'LastFriday': '上周五',
   'LastSaturday': '上周六',
   'LastSunday': '上周日',
+  'ThisMonth': '本月',
   'LastMonth': '上月',
   'LastMonthBegin': '上月初',
   'LastMonthEnd': '上月末',