Commit abf58f8c authored by qiaozhanwei's avatar qiaozhanwei
Browse files

Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2

parents ce6c53eb f638d428

docs/zh_CN/README.md

+2 −0
Original line number Diff line number Diff line
@@ -65,3 +65,5 @@ The fastest way to get response from our developers is to submit issues, or ad

docs/zh_CN/images/global_parameter.png

+12.1 KiB (113 KiB)
Loading image diff...

docs/zh_CN/images/local_parameter.png

+1.82 KiB (25.1 KiB)
Loading image diff...

docs/zh_CN/快速上手.md

+1 −1
Original line number Diff line number Diff line 
# 快速上手



* 管理员用户登录

  >地址：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/quartz/QuartzExecutors.java

+2 −0
Original line number Diff line number Diff line
@@ -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) {