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

docs/zh_CN/README.md

@@ -57,6 +57,8 @@ Easy Scheduler
 
 ### 帮助
 The fastest way to get response from our developers is to submit issues,   or add our wechat : 510570367
+
+
  
 
 

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/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-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java

@@ -189,6 +189,12 @@ public class SqlTask extends AbstractTask {
             return new SqlBinds(sqlBuilder.toString(), sqlParamsMap);
         }
 
+        if (StringUtils.isNotEmpty(sqlParameters.getTitle())){
+            String title = ParameterUtils.convertParameterPlaceholders(sqlParameters.getTitle(), ParamUtils.convert(paramsMap));
+            logger.info(title);
+            sqlParameters.setTitle(title);
+        }
+
         // special characters need to be escaped, ${} needs to be escaped
         String rgex = "'?\\$\\{(.*?)\\}'?";
         setSqlParamsMap(sql,rgex,sqlParamsMap,paramsMap);