From 330d524543eec259ed6127202bbd69a300d91227 Mon Sep 17 00:00:00 2001 From: rj276016 Date: Tue, 3 Jun 2025 11:54:47 +0800 Subject: [PATCH 1/5] fix --- .../src/main/java/org/zstack/rest/RestServerController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rest/src/main/java/org/zstack/rest/RestServerController.java b/rest/src/main/java/org/zstack/rest/RestServerController.java index 7303704..51934fb 100644 --- a/rest/src/main/java/org/zstack/rest/RestServerController.java +++ b/rest/src/main/java/org/zstack/rest/RestServerController.java @@ -5,12 +5,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.zstack.header.rest.RESTConstant; - +import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.InvocationTargetException; + /** * Created by xing5 on 2016/12/7. */ @@ -27,6 +29,6 @@ public class RestServerController { } ) public void api(HttpServletRequest request, HttpServletResponse response) throws IOException, IllegalAccessException, NoSuchMethodException, InvocationTargetException { - server.handle(request, response); + server.handle(request, response) } } From 836c92128121478872786aaf466f317650f960ae Mon Sep 17 00:00:00 2001 From: rj276016 Date: Tue, 3 Jun 2025 12:02:19 +0800 Subject: [PATCH 2/5] fix --- rest/src/main/java/org/zstack/rest/RestServerController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/rest/src/main/java/org/zstack/rest/RestServerController.java b/rest/src/main/java/org/zstack/rest/RestServerController.java index 51934fb..039d874 100644 --- a/rest/src/main/java/org/zstack/rest/RestServerController.java +++ b/rest/src/main/java/org/zstack/rest/RestServerController.java @@ -8,6 +8,7 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import java.lang.reflect.InvocationTargetException; From 8767104e351391c65630d4777ce8dad4414febc2 Mon Sep 17 00:00:00 2001 From: rj276016 Date: Tue, 3 Jun 2025 12:06:25 +0800 Subject: [PATCH 3/5] fix --- rest/src/main/java/org/zstack/rest/RestServerController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rest/src/main/java/org/zstack/rest/RestServerController.java b/rest/src/main/java/org/zstack/rest/RestServerController.java index 039d874..e4ecaf7 100644 --- a/rest/src/main/java/org/zstack/rest/RestServerController.java +++ b/rest/src/main/java/org/zstack/rest/RestServerController.java @@ -5,13 +5,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.zstack.header.rest.RESTConstant; -import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; - +import java.lang.reflect.InvocationTargetException +import java.util.Date; import java.lang.reflect.InvocationTargetException; /** From 7f7b0837e2615c364b912876328509ccf8f7e191 Mon Sep 17 00:00:00 2001 From: rj276016 Date: Tue, 3 Jun 2025 13:51:45 +0800 Subject: [PATCH 4/5] fix --- rest/src/main/java/org/zstack/rest/RestServerController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest/src/main/java/org/zstack/rest/RestServerController.java b/rest/src/main/java/org/zstack/rest/RestServerController.java index e4ecaf7..364d75d 100644 --- a/rest/src/main/java/org/zstack/rest/RestServerController.java +++ b/rest/src/main/java/org/zstack/rest/RestServerController.java @@ -29,6 +29,7 @@ public class RestServerController { } ) public void api(HttpServletRequest request, HttpServletResponse response) throws IOException, IllegalAccessException, NoSuchMethodException, InvocationTargetException { - server.handle(request, response) + server.handle(request, response); + Map testInfl = new HashMap<>(); } } From 8fbfa44c22d9bf7f31fa55ea49ff9b5844a7a23a Mon Sep 17 00:00:00 2001 From: rj276016 Date: Tue, 3 Jun 2025 13:56:54 +0800 Subject: [PATCH 5/5] fix --- .../main/java/org/zstack/rest/RestServerController.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rest/src/main/java/org/zstack/rest/RestServerController.java b/rest/src/main/java/org/zstack/rest/RestServerController.java index 364d75d..6e8cbb7 100644 --- a/rest/src/main/java/org/zstack/rest/RestServerController.java +++ b/rest/src/main/java/org/zstack/rest/RestServerController.java @@ -9,10 +9,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.reflect.InvocationTargetException +import java.lang.reflect.InvocationTargetException; import java.util.Date; import java.lang.reflect.InvocationTargetException; - /** * Created by xing5 on 2016/12/7. */ @@ -29,7 +28,11 @@ public class RestServerController { } ) public void api(HttpServletRequest request, HttpServletResponse response) throws IOException, IllegalAccessException, NoSuchMethodException, InvocationTargetException { + Map testInfo = new HashMap<>(); + testInfo.put("A","good"); + request.setAttribute("info",testInfo); server.handle(request, response); - Map testInfl = new HashMap<>(); + + } }