From b5a2e3bbd201cbe439c5d07df146429be32d8e87 Mon Sep 17 00:00:00 2001 From: ligang Date: Tue, 14 May 2019 11:18:04 +0800 Subject: [PATCH 1/7] add Determine if the login user is the owner of the schedule --- .../java/cn/escheduler/api/service/SchedulerService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java index f2cf8e1905..5ea5faf83d 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java @@ -514,6 +514,13 @@ public class SchedulerService extends BaseService { putMsg(result, Status.SCHEDULE_CRON_NOT_EXISTS, scheduleId); return result; } + + // Determine if the login user is the owner of the schedule + if (loginUser.getId() != schedule.getUserId()) { + putMsg(result, Status.USER_NO_OPERATION_PERM); + return result; + } + // check schedule is already online if(schedule.getReleaseState() == ReleaseState.ONLINE){ putMsg(result, Status.SCHEDULE_CRON_STATE_ONLINE,schedule.getId()); From f785d113092f35e89e133ad910cc0092deb55536 Mon Sep 17 00:00:00 2001 From: huyuanming Date: Mon, 20 May 2019 10:15:10 +0800 Subject: [PATCH 2/7] env --- escheduler-ui/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/escheduler-ui/.env b/escheduler-ui/.env index fc1b619f69..5cd5ba736d 100644 --- a/escheduler-ui/.env +++ b/escheduler-ui/.env @@ -1,5 +1,5 @@ -# 后端接口地址11 +# 后端接口地址 API_BASE = http://192.168.xx.xx:12345 # 本地开发如需ip访问项目把"#"号去掉 From 8116a1a532b76aadc0c9e58cc17cb9d08d2f43bb Mon Sep 17 00:00:00 2001 From: huyuanming Date: Mon, 20 May 2019 10:29:57 +0800 Subject: [PATCH 3/7] test --- escheduler-ui/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/escheduler-ui/.env b/escheduler-ui/.env index 5cd5ba736d..fb4477af99 100644 --- a/escheduler-ui/.env +++ b/escheduler-ui/.env @@ -1,5 +1,5 @@ -# 后端接口地址 +# 后端接口地址22 API_BASE = http://192.168.xx.xx:12345 # 本地开发如需ip访问项目把"#"号去掉 From a869796140e8d4e3d35343a2eff4bb3d355355e9 Mon Sep 17 00:00:00 2001 From: huyuanming Date: Mon, 20 May 2019 10:33:53 +0800 Subject: [PATCH 4/7] env --- escheduler-ui/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/escheduler-ui/.env b/escheduler-ui/.env index fb4477af99..5cd5ba736d 100644 --- a/escheduler-ui/.env +++ b/escheduler-ui/.env @@ -1,5 +1,5 @@ -# 后端接口地址22 +# 后端接口地址 API_BASE = http://192.168.xx.xx:12345 # 本地开发如需ip访问项目把"#"号去掉 From 02d5c53a1cf134c0606419e2a4110e600e40713f Mon Sep 17 00:00:00 2001 From: huyuanming Date: Mon, 20 May 2019 16:54:18 +0800 Subject: [PATCH 5/7] add taskInstance link, add email title input --- .../pages/dag/_source/formModel/tasks/sql.vue | 17 +++++++++++++++++ .../pages/taskInstance/_source/list.vue | 12 +++++++----- .../src/js/module/i18n/locale/en_US.js | 2 ++ .../src/js/module/i18n/locale/zh_CN.js | 2 ++ 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue index 0ff75b91d8..6be4b5c2d6 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue @@ -28,6 +28,17 @@