fix console stop / start

孙健 · 孙健 · commit 4c2fcec1506f · 2016-12-20T17:44:29.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'nlpcn.org'
-version '2.1.2'
+version '2.1.3'
 
 apply plugin: 'java'
 apply plugin: 'war'
diff --git a/src/main/java/org/nlpcn/jcoder/controller/ApiAction.java b/src/main/java/org/nlpcn/jcoder/controller/ApiAction.java
@@ -473,9 +473,9 @@ public Object stopApi(@Param("json") String jsonTask) {
 
 		String taskName = null;
 		try {
-			LOG.info(taskName + " will be to stop ! ");
 			JSONObject json = JSONObject.parseObject(jsonTask);
-			taskName = json.getString("task.name") + "@" + "0@" + Mvcs.getReq().getRemoteAddr();
+			taskName = JavaSourceUtil.findClassName(json.getString("task.code")) + "@" + "0@" + Mvcs.getReq().getRemoteAddr();
+			LOG.info(taskName + " will be to stop ! ");
 			ThreadManager.stop(taskName);
 			LOG.info(taskName + " stoped ! ");
 			return StaticValue.OK;
diff --git a/src/main/webapp/js/console_socket.js b/src/main/webapp/js/console_socket.js
@@ -154,43 +154,28 @@ $(function() {
 	});
 
 	$("#script_start").click(function() {
-		if (status) {
-			$("#code").val(editor.getValue());
-			var json = $("#taskForm").serializeJson()
-			if (status) {
-				$.post("/run_api", {
-					"json" : JSON.stringify(json)
-				}, function(result) {
-					content.append("<p>" + JSON.stringify(result) + "</p>");
-				}, "json").error(function() {
-					content.append("<p>run err !</p>");
-				});
-			} else {
-				content.append("<p>server has beein break ! please reconnect</p>");
-			}
-		} else {
-			content.append("<p>server has beein break ! please reconnect</p>");
-		}
+		$("#code").val(editor.getValue());
+		var json = $("#taskForm").serializeJson();
+
+		$.post("/run_api", {
+			"json" : JSON.stringify(json)
+		}, function(result) {
+			content.append("<p>" + JSON.stringify(result) + "</p>");
+		}, "json").error(function() {
+			content.append("<p>run err !</p>");
+		});
 	});
 
 	$("#script_stop").click(function() {
-		if (status) {
-			$("#code").val(editor.getValue());
-			var json = $("#taskForm").serializeJson()
-			if (status) {
-				$.post("/stop_api", {
-					"json" : JSON.stringify(json)
-				}, function(result) {
-					content.append("<p>" + JSON.stringify(result) + "</p>");
-				}, "json").error(function() {
-					content.append("<p>run err !" + JSON.stringify(result) + "</p>");
-				});
-			} else {
-				content.append("<p>server has beein break ! please reconnect</p>");
-			}
-		} else {
-			content.append("<p>server has beein break ! please reconnect</p>");
-		}
+		$("#code").val(editor.getValue());
+		var json = $("#taskForm").serializeJson();
+		$.post("/stop_api", {
+			"json" : JSON.stringify(json)
+		}, function(result) {
+			content.append("<p>" + JSON.stringify(result) + "</p>");
+		}, "json").error(function() {
+			content.append("<p>run err !" + JSON.stringify(result) + "</p>");
+		});
 	});
 
 	$("#socket_connected").click(function() {
diff --git a/src/main/webapp/task/task_editor.jsp b/src/main/webapp/task/task_editor.jsp
@@ -30,7 +30,7 @@
 					<div class="box-inner">
 						<div class="box-header well " data-original-title="">
 							<h2>
-								<i class="glyphicon glyphicon-edit"></i> Code Platform
+								<i class="glyphicon glyphicon-edit"></i> Code Platform - ${task.name }.java
 							</h2>
 							<i class="col-md-6"></i>
 							<h2 class="progress" class="col-md-4">
diff --git a/src/main/webapp/thread_list.jsp b/src/main/webapp/thread_list.jsp
@@ -124,7 +124,7 @@
 										<td class="center">${task.runStatus}</td>
 										<td class="center">${task.message}</td>
 										<td class="center">
-											<a class="btn btn-info" href="${ctx }/task/editor/${task.groupId }/${task.name}"> <i class="glyphicon glyphicon-edit icon-white"></i> Edit </a> 
+											<a class="btn btn-info" href="${ctx }/task/editor/${task.groupId }/${task.id}"> <i class="glyphicon glyphicon-edit icon-white"></i> Edit </a> 
 										</td>
 									</tr>
 									</c:if>
