diff --git a/app.db b/app.db index 028094f..e693238 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/com/iflytop/digester/DigestionTaskThread.java b/src/main/java/com/iflytop/digester/DigestionTaskThread.java index 8ee7d05..05eea2a 100644 --- a/src/main/java/com/iflytop/digester/DigestionTaskThread.java +++ b/src/main/java/com/iflytop/digester/DigestionTaskThread.java @@ -94,7 +94,7 @@ public class DigestionTaskThread extends Thread { public void run() { try { this.prepare(); - var rounds = this.solution.getRounds(); + var rounds = this.solution.getDigestionRounds(); var firstRound = rounds.remove(0); var lastRound = rounds.remove(rounds.size() - 1); @@ -159,7 +159,7 @@ public class DigestionTaskThread extends Thread { try { // 异常处理执行 - var errorRound = this.solution.getErrorRounds(); + var errorRound = this.solution.getDigestionErrorRounds(); for ( int i=0; i getRounds() { + public List getDigestionRounds() { ObjectMapper jsonMapper = new ObjectMapper(); JsonNode roundsJsonTree = null; try { @@ -53,7 +53,7 @@ public class MdbDigestionSolution extends UfActiveRecord { } // get error round - public DigestionSolutionErrorRound getErrorRounds() { + public DigestionSolutionErrorRound getDigestionErrorRounds() { ObjectMapper jsonMapper = new ObjectMapper(); JsonNode errorRoundsJsonTree = null; try { diff --git a/src/main/java/com/iflytop/digester/underframework/controller/TsApiSnippet.java b/src/main/java/com/iflytop/digester/underframework/controller/TsApiSnippet.java index 9ec3e8b..9638f58 100644 --- a/src/main/java/com/iflytop/digester/underframework/controller/TsApiSnippet.java +++ b/src/main/java/com/iflytop/digester/underframework/controller/TsApiSnippet.java @@ -37,10 +37,25 @@ public class TsApiSnippet extends UfApiControllerBase { @PostMapping("/api/snippet/execute") @ResponseBody - public UfApiResponse execute(@RequestBody UfMdbSnippet snippet ) { + public UfApiResponse execute(@RequestBody Map params ) { try { - snippet = UfActiveRecord.findOne(UfMdbSnippet.class, snippet.id); - UfCmdSnippetExecutor.execute(snippet.key); + String id = (String)params.get("id"); + Map snippetParams = (Map)params.get("params"); + var snippet = UfActiveRecord.findOne(UfMdbSnippet.class, id); + UfCmdSnippetExecutor.execute(snippet.key, snippetParams); + } catch ( Exception e ) { + return error(e.getMessage()); + } + return success(); + } + + @PostMapping("/api/snippet/execute-by-key") + @ResponseBody + public UfApiResponse executeByKey(@RequestBody Map params ) { + try { + String key = (String)params.get("key"); + Map snippetParams = (Map)params.get("params"); + UfCmdSnippetExecutor.execute(key, snippetParams); } catch ( Exception e ) { return error(e.getMessage()); } diff --git a/src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java b/src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java index be5c68d..b7f865c 100644 --- a/src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java +++ b/src/main/java/com/iflytop/digester/underframework/controller/UfApiControllerExceptionHandler.java @@ -5,13 +5,13 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; @ControllerAdvice public class UfApiControllerExceptionHandler { - @ExceptionHandler(RuntimeException.class) - public ResponseEntity handleException(RuntimeException ex) { - var response = new UfApiResponse(); - response.success = false; - response.code = "500"; - response.message = ex.getMessage(); - response.data = null; - return new ResponseEntity<>(response, HttpStatus.OK); - } +// @ExceptionHandler(RuntimeException.class) +// public ResponseEntity handleException(RuntimeException ex) { +// var response = new UfApiResponse(); +// response.success = false; +// response.code = "500"; +// response.message = ex.getMessage(); +// response.data = null; +// return new ResponseEntity<>(response, HttpStatus.OK); +// } } diff --git a/web b/web index c02d1dc..53712a5 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit c02d1dcba08ea7ff724791e191264cb70ea90435 +Subproject commit 53712a58ceb4f19c7dba9204587134b88d86e3e5