From de7c6fc7d0e3d72f2130930c4b3305a6dc632fd3 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Thu, 25 Jul 2024 17:12:35 +0800
Subject: [PATCH] 1

---
 .../java/a8k/hardware/controler/Controler.java     | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/a8k/hardware/controler/Controler.java b/src/main/java/a8k/hardware/controler/Controler.java
index 3e612b8..178490f 100644
--- a/src/main/java/a8k/hardware/controler/Controler.java
+++ b/src/main/java/a8k/hardware/controler/Controler.java
@@ -177,6 +177,8 @@ public class Controler {
 			action.put("key", method.getName());
 			action.put("name", actionAnnotation.name());
 			action.put("group", actionAnnotation.group());
+//			action.put("order", actionAnnotation.order());
+//			action.put("newline", actionAnnotation.newline());
 
 			var actionParams = new ArrayList<Map<String,Object>>();
 			var actionParamList = method.getParameters();
@@ -224,7 +226,7 @@ public class Controler {
 
 	@PostMapping("/api/service-config/service-action-exec")
 	@ResponseBody
-	public AppRet<Object> serviceActionExecute( @RequestBody Map<String, Object> params ) throws Exception {
+	public AppRet<Object> serviceActionExecute( @RequestBody Map<String, Object> params ) throws Throwable {
 		String serviceKey = (String)params.get("serviceKey");
 		Class<?> serviceClass = null;
 		var classes = UfClassHelper.getAllClassesInPackage("a8k");
@@ -261,16 +263,19 @@ public class Controler {
 		}
 
 		var service = UfApplication.getContext().getBean(serviceClass);
-		if ( method.getReturnType().equals(Void.TYPE) ) {
-			method.invoke(service, actionParams.toArray());
-			return AppRet.success();
-		}
-
-		var actionResult = method.invoke(service, actionParams.toArray());
-		if ( actionResult instanceof AppRet ) {
-			return (AppRet)actionResult;
+		try {
+			if ( method.getReturnType().equals(Void.TYPE) ) {
+				method.invoke(service, actionParams.toArray());
+				return AppRet.success();
+			}
+			var actionResult = method.invoke(service, actionParams.toArray());
+			if ( actionResult instanceof AppRet ) {
+				return (AppRet)actionResult;
+			}
+			return AppRet.success(actionResult);
+		} catch ( InvocationTargetException e ) {
+			throw e.getTargetException();
 		}
-		return AppRet.success(actionResult);
 	}
 
 	@PostMapping("/api/service-config/class-struct-info-get")