From 43102b9d35cf2b0f704609965e2e32e2f09b556f Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Mon, 26 Sep 2016 09:41:40 +0800
Subject: [PATCH]

---
 src/org/redkale/boot/ApiDocs.java         | 2 +-
 src/org/redkale/boot/apidoc-template.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/redkale/boot/ApiDocs.java b/src/org/redkale/boot/ApiDocs.java
index cb33cc602..12fa70e06 100644
--- a/src/org/redkale/boot/ApiDocs.java
+++ b/src/org/redkale/boot/ApiDocs.java
@@ -92,7 +92,7 @@ public class ApiDocs extends HttpBaseServlet {
                                 if (Modifier.isStatic(field.getModifiers())) continue;
 
                                 Map<String, String> fieldmap = new LinkedHashMap<>();
-                                fieldmap.put("type", field.getType().isArray() ? (field.getType().getComponentType().getName() + "[]") : field.getType().getName());
+                                fieldmap.put("type", field.getType().isArray() ? (field.getType().getComponentType().getName() + "[]") : field.getGenericType().getTypeName());
 
                                 Comment comment = field.getAnnotation(Comment.class);
                                 if (comment != null) fieldmap.put("comment", comment.value());
diff --git a/src/org/redkale/boot/apidoc-template.html b/src/org/redkale/boot/apidoc-template.html
index b4a8d4d06..33cbfb642 100644
--- a/src/org/redkale/boot/apidoc-template.html
+++ b/src/org/redkale/boot/apidoc-template.html
@@ -66,7 +66,7 @@
                     html.push(' <tr><td colspan="5"><table class="typetable">');
                     for (var fieldname in classmap[type]) {
                         var field = classmap[type][fieldname];
-                        var t = field.type.substring(field.type.lastIndexOf('.') + 1);
+                        var t = field.type.replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/([a-zA-Z0-9_\$]+\.)+/g, "");
                         html.push(' <tr class="l"><td>' + fieldname + '</td><td>' + t + '</td><td colspan="2">' + (field.comment || '') + '</td></tr>');
                     }
                     html.push(' </table></td></tr>');