diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md index 782b8abc5951f117786ee034251c869d622e0956..3295e1fe233e0b6ca30b2a152246ea9c77c44cd3 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 98b961383f01479b04477a8f63f77f5df59c0c16..9fb415c126f2e7193df5b898f18a270ffff9cbf6 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 560f1d3c31babc3c0ecbcf4d10a3d23cec5905f5..1eac919addfd6b142b6b5db1b4eb8f17e1612b43 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/\345\277\253\351\200\237\344\270\212\346\211\213.md" "b/docs/zh_CN/\345\277\253\351\200\237\344\270\212\346\211\213.md" index cfba93faeec5ca63ef13ea21f9f940bcddd73f5c..9834fba4d44debfc431d1347af43b31397f48edf 100644 --- "a/docs/zh_CN/\345\277\253\351\200\237\344\270\212\346\211\213.md" +++ "b/docs/zh_CN/\345\277\253\351\200\237\344\270\212\346\211\213.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 5cb3b338535461635f691351383fd9f97b0e6436..916e4f37922abc91330a699cd7b73481e666b5f3 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 89822e710c948814ac7ff7de1895e84860d2c312..3e85b55b918f1132b604109b408e3d622a87e13e 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);