From ef14195e71bf11d2ae6a454a39a12fa4811c3501 Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Fri, 18 Sep 2020 22:58:10 +0800
Subject: [PATCH]

---
 src/org/redkale/net/http/Rest.java     | 19 +++++++++++++++++--
 src/org/redkale/service/RetResult.java |  7 ++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/org/redkale/net/http/Rest.java b/src/org/redkale/net/http/Rest.java
index 79e98c0fa..f938998af 100644
--- a/src/org/redkale/net/http/Rest.java
+++ b/src/org/redkale/net/http/Rest.java
@@ -188,12 +188,27 @@ public final class Rest {
         return (!controller.name().isEmpty()) ? controller.name().trim() : serviceType.getSimpleName().replaceAll("Service.*$", "");
     }
 
-    static boolean isRestDyn(HttpServlet servlet) {
+    /**
+     * 判断HttpServlet是否为Rest动态生成的
+     *
+     * @param servlet 检测的HttpServlet
+     *
+     * @return 是否是动态生成的RestHttpServlet
+     */
+    public static boolean isRestDyn(HttpServlet servlet) {
         return servlet.getClass().getAnnotation(RestDyn.class) != null;
     }
 
-    static Service getService(HttpServlet servlet) {
+    /**
+     * 获取Rest动态生成HttpServlet里的Service对象，若不是Rest动态生成的HttpServlet，返回null
+     *
+     * @param servlet HttpServlet
+     *
+     * @return Service
+     */
+    public static Service getService(HttpServlet servlet) {
         if (servlet == null) return null;
+        if (!isRestDyn(servlet)) return null;
         try {
             Field ts = servlet.getClass().getDeclaredField(REST_SERVICE_FIELD_NAME);
             ts.setAccessible(true);
diff --git a/src/org/redkale/service/RetResult.java b/src/org/redkale/service/RetResult.java
index 0e555c991..99c4828de 100644
--- a/src/org/redkale/service/RetResult.java
+++ b/src/org/redkale/service/RetResult.java
@@ -46,8 +46,9 @@ public class RetResult<T> implements Serializable {
 
     @ConvertColumn(index = 3)
     protected T result;
-
-    @ConvertColumn(index = 4)
+    
+    //success index = 4
+    @ConvertColumn(index = 5)
     protected Map<String, String> attach;
 
     protected Convert convert;
@@ -320,7 +321,7 @@ public class RetResult<T> implements Serializable {
      *
      * @return 是否成功
      */
-    @ConvertColumn(index = 5)
+    @ConvertColumn(index = 4)
     public boolean isSuccess() {
         return retcode == 0;
     }