diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md index 782b8abc59..3295e1fe23 100644 --- a/docs/zh_CN/README.md +++ b/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 + + diff --git a/docs/zh_CN/images/global_parameter.png b/docs/zh_CN/images/global_parameter.png index 98b961383f..9fb415c126 100644 Binary files a/docs/zh_CN/images/global_parameter.png and b/docs/zh_CN/images/global_parameter.png differ diff --git a/docs/zh_CN/images/local_parameter.png b/docs/zh_CN/images/local_parameter.png index 560f1d3c31..1eac919add 100644 Binary files a/docs/zh_CN/images/local_parameter.png and b/docs/zh_CN/images/local_parameter.png differ diff --git a/docs/zh_CN/快速上手.md b/docs/zh_CN/快速上手.md index cfba93faee..9834fba4d4 100644 --- a/docs/zh_CN/快速上手.md +++ b/docs/zh_CN/快速上手.md @@ -1,7 +1,7 @@ # 快速上手 * 管理员用户登录 - >地址:192.168.xx.xx:8888 用户名密码:admin/esheduler123 + >地址:192.168.xx.xx:8888 用户名密码:admin/escheduler123
diff --git a/escheduler-api/src/main/java/cn/escheduler/api/quartz/QuartzExecutors.java b/escheduler-api/src/main/java/cn/escheduler/api/quartz/QuartzExecutors.java index 5cb3b33853..916e4f3792 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/quartz/QuartzExecutors.java +++ b/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) { diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java b/escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java index 89822e710c..3e85b55b91 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java +++ b/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);