处理JBException

zangyilin · zangyilin · commit 43998284fbc3 · 2018-08-14T12:04:41.000+08:00
diff --git a/src/main/java/com/javabaas/javasdk/JB.java b/src/main/java/com/javabaas/javasdk/JB.java
@@ -134,19 +134,16 @@ public void addHookListener(String name, HookEvent event, HookListener listener)
      * @param body        请求主体
      */
     public static JBResponse onRequest(String requestType, String body) throws Throwable {
-        try {
-            //整理请求体
-            if (requestType.equals(JBRequest.REQUEST_CLOUD)) {
-                //云方法
-                CloudRequest cloudRequest = JBUtils.readValue(body, CloudRequest.class);
-                return onCloudRequest(cloudRequest);
-            } else if (requestType.equals(JBRequest.REQUEST_HOOK)) {
-                //钩子
-                HookRequest hookRequest = JBUtils.readValue(body, HookRequest.class);
-                return onHookRequest(hookRequest);
-            }  //请求类型不匹配
-        } catch (JBException ignored) {
-        }
+        //整理请求体
+        if (requestType.equals(JBRequest.REQUEST_CLOUD)) {
+            //云方法
+            CloudRequest cloudRequest = JBUtils.readValue(body, CloudRequest.class);
+            return onCloudRequest(cloudRequest);
+        } else if (requestType.equals(JBRequest.REQUEST_HOOK)) {
+            //钩子
+            HookRequest hookRequest = JBUtils.readValue(body, HookRequest.class);
+            return onHookRequest(hookRequest);
+        }  //请求类型不匹配
         return null;
     }
 
diff --git a/src/main/java/com/javabaas/javasdk/annotation/scanner/OnCloudScanner.java b/src/main/java/com/javabaas/javasdk/annotation/scanner/OnCloudScanner.java
@@ -1,6 +1,7 @@
 package com.javabaas.javasdk.annotation.scanner;
 
 import com.javabaas.javasdk.JB;
+import com.javabaas.javasdk.JBException;
 import com.javabaas.javasdk.annotation.OnCloud;
 import com.javabaas.javasdk.cloud.CloudListener;
 import com.javabaas.javasdk.cloud.CloudRequest;
@@ -39,7 +40,14 @@ public CloudResponse onCloud(CloudRequest request) throws Throwable {
                 try {
                     return (CloudResponse) method.invoke(object, args);
                 } catch (IllegalAccessException | InvocationTargetException e) {
-                    throw e.getCause();
+                    if (e.getCause() instanceof JBException) {
+                        CloudResponse response = new CloudResponse();
+                        response.setCode(((JBException) e.getCause()).getCode());
+                        response.setMessage(e.getCause().getMessage());
+                        return response;
+                    } else {
+                        throw e.getCause();
+                    }
                 }
             }
         });
