From eac00ca008475b124ab35c5624454e1958a0833e Mon Sep 17 00:00:00 2001 From: zhanglong Date: Tue, 31 Mar 2020 16:52:49 +0800 Subject: [PATCH 1/3] Remove invalid code --- .../dolphinscheduler/api/controller/ResourcesController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java index 40effb641d..1d83fcea2b 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java @@ -154,8 +154,7 @@ public class ResourcesController extends BaseController{ @ApiImplicitParam(name = "id", value = "RESOURCE_ID", required = true, dataType ="Int", example = "100"), @ApiImplicitParam(name = "type", value = "RESOURCE_TYPE", required = true, dataType ="ResourceType"), @ApiImplicitParam(name = "name", value = "RESOURCE_NAME", required = true, dataType ="String"), - @ApiImplicitParam(name = "description", value = "RESOURCE_DESC", dataType ="String"), - @ApiImplicitParam(name = "file", value = "RESOURCE_FILE", required = true,dataType = "MultipartFile") + @ApiImplicitParam(name = "description", value = "RESOURCE_DESC", dataType ="String") }) @PostMapping(value = "/update") public Result updateResource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser, From d6602f21b51dd78e4cf9425b65bc810e4458a97b Mon Sep 17 00:00:00 2001 From: zhanglong Date: Wed, 8 Apr 2020 17:48:11 +0800 Subject: [PATCH 2/3] fix document errors --- .../dolphinscheduler/api/controller/SchedulerController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java index 96038dcf8c..d246a0f73a 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java @@ -76,7 +76,7 @@ public class SchedulerController extends BaseController { @ApiOperation(value = "createSchedule", notes= "CREATE_SCHEDULE_NOTES") @ApiImplicitParams({ @ApiImplicitParam(name = "processDefinitionId", value = "PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100"), - @ApiImplicitParam(name = "schedule", value = "SCHEDULE", dataType = "Int", example = "100"), + @ApiImplicitParam(name = "schedule", value = "SCHEDULE", dataType = "String", example = "{'startTime':'2019-06-10 00:00:00','endTime':'2019-06-13 00:00:00','crontab':'0 0 3/6 * * ? *'}"), @ApiImplicitParam(name = "warningType", value = "WARNING_TYPE", type ="WarningType"), @ApiImplicitParam(name = "warningGroupId", value = "WARNING_GROUP_ID", dataType = "Int", example = "100"), @ApiImplicitParam(name = "failureStrategy", value = "FAILURE_STRATEGY", type ="FailureStrategy"), @@ -132,7 +132,7 @@ public class SchedulerController extends BaseController { @ApiOperation(value = "updateSchedule", notes= "UPDATE_SCHEDULE_NOTES") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "SCHEDULE_ID", required = true, dataType = "Int", example = "100"), - @ApiImplicitParam(name = "schedule", value = "SCHEDULE", dataType = "Int", example = "100"), + @ApiImplicitParam(name = "schedule", value = "SCHEDULE", dataType = "String", example = "{'startTime':'2019-06-10 00:00:00','endTime':'2019-06-13 00:00:00','crontab':'0 0 3/6 * * ? *'}"), @ApiImplicitParam(name = "warningType", value = "WARNING_TYPE", type ="WarningType"), @ApiImplicitParam(name = "warningGroupId", value = "WARNING_GROUP_ID", dataType = "Int", example = "100"), @ApiImplicitParam(name = "failureStrategy", value = "FAILURE_STRATEGY", type ="FailureStrategy"), From 20007264b1e1ab634be2b2e0e17ef10d57163a8b Mon Sep 17 00:00:00 2001 From: BoYiZhang Date: Thu, 21 May 2020 09:45:50 +0800 Subject: [PATCH 3/3] Sync file name --- .../src/js/conf/home/pages/dag/_source/dag.scss | 6 +++--- ...toobar_CONDITIONS.png => toolbar_CONDITIONS.png} | Bin .../dag/img/{toobar_FLINK.png => toolbar_FLINK.png} | Bin .../dag/img/{toobar_HTTP.png => toolbar_HTTP.png} | Bin 4 files changed, 3 insertions(+), 3 deletions(-) rename dolphinscheduler-ui/src/js/conf/home/pages/dag/img/{toobar_CONDITIONS.png => toolbar_CONDITIONS.png} (100%) rename dolphinscheduler-ui/src/js/conf/home/pages/dag/img/{toobar_FLINK.png => toolbar_FLINK.png} (100%) rename dolphinscheduler-ui/src/js/conf/home/pages/dag/img/{toobar_HTTP.png => toolbar_HTTP.png} (100%) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss index 886ee692bf..5b171bb4ca 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss @@ -87,7 +87,7 @@ background: url("../img/toolbar_SPARK.png") no-repeat 50% 50%; } .icos-FLINK { - background: url("../img/toobar_FLINK.png") no-repeat 50% 50%; + background: url("../img/toolbar_FLINK.png") no-repeat 50% 50%; } .icos-MR { background: url("../img/toolbar_MR.png") no-repeat 50% 50%; @@ -99,7 +99,7 @@ background: url("../img/toolbar_DEPENDENT.png") no-repeat 50% 50%; } .icos-HTTP { - background: url("../img/toobar_HTTP.png") no-repeat 50% 50%; + background: url("../img/toolbar_HTTP.png") no-repeat 50% 50%; } .icos-DATAX { background: url("../img/toolbar_DATAX.png") no-repeat 50% 50%; @@ -108,7 +108,7 @@ background: url("../img/toolbar_SQOOP.png") no-repeat 50% 50%; } .icos-CONDITIONS { - background: url("../img/toobar_CONDITIONS.png") no-repeat 50% 50%; + background: url("../img/toolbar_CONDITIONS.png") no-repeat 50% 50%; } .toolbar { width: 60px; diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toobar_CONDITIONS.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_CONDITIONS.png similarity index 100% rename from dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toobar_CONDITIONS.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_CONDITIONS.png diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toobar_FLINK.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_FLINK.png similarity index 100% rename from dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toobar_FLINK.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_FLINK.png diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toobar_HTTP.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_HTTP.png similarity index 100% rename from dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toobar_HTTP.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_HTTP.png