You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/06/18 10:24:25 UTC
[shardingsphere-elasticjob-lite] branch master updated: fix Change
request path from 'disable' to 'enable' (#788) (#789)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-lite.git
The following commit(s) were added to refs/heads/master by this push:
new 3ace316 fix Change request path from 'disable' to 'enable' (#788) (#789)
3ace316 is described below
commit 3ace316d79ab7f73038a846988581b1a22f5028f
Author: Tboy <gu...@immomo.com>
AuthorDate: Thu Jun 18 18:24:12 2020 +0800
fix Change request path from 'disable' to 'enable' (#788) (#789)
---
.../elasticjob/lite/console/restful/JobOperationRESTfulAPI.java | 5 ++---
.../elasticjob/lite/console/restful/ServerOperationRESTfulAPI.java | 4 ++--
.../src/main/resources/console/js/status/job/job_status_detail.js | 4 ++--
.../src/main/resources/console/js/status/job/jobs_status_overview.js | 4 ++--
.../main/resources/console/js/status/server/server_status_detail.js | 4 ++--
.../resources/console/js/status/server/servers_status_overview.js | 4 ++--
6 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/JobOperationRESTfulAPI.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/JobOperationRESTfulAPI.java
index fdde66f..78b9bd0 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/JobOperationRESTfulAPI.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/JobOperationRESTfulAPI.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.JobBriefInfo;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.ShardingInfo;
import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -141,8 +140,8 @@ public final class JobOperationRESTfulAPI {
* @param jobName job name
* @param item sharding item
*/
- @DELETE
- @Path("/{jobName}/sharding/{item}/disable")
+ @POST
+ @Path("/{jobName}/sharding/{item}/enable")
@Consumes(MediaType.APPLICATION_JSON)
public void enableSharding(@PathParam("jobName") final String jobName, @PathParam("item") final String item) {
jobAPIService.getShardingOperateAPI().enable(jobName, item);
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/ServerOperationRESTfulAPI.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/ServerOperationRESTfulAPI.java
index cf99c5e..4b24a59 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/ServerOperationRESTfulAPI.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/ServerOperationRESTfulAPI.java
@@ -136,8 +136,8 @@ public final class ServerOperationRESTfulAPI {
* @param serverIp server IP address
* @param jobName job name
*/
- @DELETE
- @Path("/{serverIp}/jobs/{jobName}/disable")
+ @POST
+ @Path("/{serverIp}/jobs/{jobName}/enable")
public void enableServerJob(@PathParam("serverIp") final String serverIp, @PathParam("jobName") final String jobName) {
jobAPIService.getJobOperatorAPI().enable(jobName, serverIp);
}
diff --git a/elastic-job-lite-console/src/main/resources/console/js/status/job/job_status_detail.js b/elastic-job-lite-console/src/main/resources/console/js/status/job/job_status_detail.js
index e067edb..9855e76 100644
--- a/elastic-job-lite-console/src/main/resources/console/js/status/job/job_status_detail.js
+++ b/elastic-job-lite-console/src/main/resources/console/js/status/job/job_status_detail.js
@@ -94,8 +94,8 @@ function bindEnableButton() {
var jobName = $("#index-job-name").text();
var item = $(event.currentTarget).attr("item");
$.ajax({
- url: "/api/jobs/" + jobName + "/sharding/" + item + "/disable",
- type: "DELETE",
+ url: "/api/jobs/" + jobName + "/sharding/" + item + "/enable",
+ type: "POST",
success: function () {
showSuccessDialog();
$("#sharding").bootstrapTable("refresh");
diff --git a/elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js b/elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js
index 1c74e71..161a85b 100644
--- a/elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js
+++ b/elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js
@@ -166,8 +166,8 @@ function bindEnableButton() {
$(document).on("click", "button[operation='enable-job'][data-toggle!='modal']", function(event) {
var jobName = $(event.currentTarget).attr("job-name");
$.ajax({
- url: "/api/jobs/" + jobName + "/disable",
- type: "DELETE",
+ url: "/api/jobs/" + jobName + "/enable",
+ type: "POST",
success: function() {
showSuccessDialog();
$("#jobs-status-overview-tbl").bootstrapTable("refresh");
diff --git a/elastic-job-lite-console/src/main/resources/console/js/status/server/server_status_detail.js b/elastic-job-lite-console/src/main/resources/console/js/status/server/server_status_detail.js
index a77b8ef..e7545eb 100644
--- a/elastic-job-lite-console/src/main/resources/console/js/status/server/server_status_detail.js
+++ b/elastic-job-lite-console/src/main/resources/console/js/status/server/server_status_detail.js
@@ -91,8 +91,8 @@ function bindEnableButton() {
$(document).off("click", "button[operation='enable-server-job'][data-toggle!='modal']");
$(document).on("click", "button[operation='enable-server-job'][data-toggle!='modal']", function(event) {
$.ajax({
- url: "/api/servers/" + $("#server-ip").text() + "/jobs/" + $(event.currentTarget).attr("job-name") + "/disable",
- type: "DELETE",
+ url: "/api/servers/" + $("#server-ip").text() + "/jobs/" + $(event.currentTarget).attr("job-name") + "/enable",
+ type: "POST",
success: function() {
$("#server-jobs-tbl").bootstrapTable("refresh");
showSuccessDialog();
diff --git a/elastic-job-lite-console/src/main/resources/console/js/status/server/servers_status_overview.js b/elastic-job-lite-console/src/main/resources/console/js/status/server/servers_status_overview.js
index abebe63..b56c1f0 100644
--- a/elastic-job-lite-console/src/main/resources/console/js/status/server/servers_status_overview.js
+++ b/elastic-job-lite-console/src/main/resources/console/js/status/server/servers_status_overview.js
@@ -105,8 +105,8 @@ function bindEnableServerButton() {
$(document).on("click", "button[operation='enable-server'][data-toggle!='modal']", function(event) {
var serverIp = $(event.currentTarget).attr("server-ip");
$.ajax({
- url: "/api/servers/" + serverIp + "/disable",
- type: "DELETE",
+ url: "/api/servers/" + serverIp + "/enable",
+ type: "POST",
success: function() {
showSuccessDialog();
$("#servers-overview-tbl").bootstrapTable("refresh");