From 7df26f09facecb412259561e26e463aef1fce8da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E9=97=B4?= <919317632@qq.com>
Date: Fri, 2 Dec 2022 17:28:04 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E7=BA=A7=E5=B5=8C?=
 =?UTF-8?q?=E5=A5=97=E7=9A=84=E5=AF=B9=E8=B1=A1=E5=86=85=E7=9A=84List<Obje?=
 =?UTF-8?q?ct>=E5=AD=97=E6=AE=B5=E4=B8=8D=E8=A7=A3=E6=9E=90=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 七间 <919317632@qq.com>
---
 pom.xml                                            |  2 +-
 yapidoc-core/pom.xml                               |  2 +-
 .../java/com/eeeffff/yapidoc/ModelResolver.java    | 14 +++++++++++++-
 yapidoc-maven-plugin/pom.xml                       |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 335842c..a7402ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.eeeffff.yapidoc</groupId>
     <artifactId>yapidoc</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.5</version>
+    <version>1.0.6</version>
 
     <name>${project.artifactId}</name>
     <description>Maven plugin used to generate yapi document for Java controllers</description>
diff --git a/yapidoc-core/pom.xml b/yapidoc-core/pom.xml
index 4e3a3e2..3e409ee 100644
--- a/yapidoc-core/pom.xml
+++ b/yapidoc-core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>yapidoc</artifactId>
 		<groupId>com.eeeffff.yapidoc</groupId>
-		<version>1.0.5</version>
+		<version>1.0.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/yapidoc-core/src/main/java/com/eeeffff/yapidoc/ModelResolver.java b/yapidoc-core/src/main/java/com/eeeffff/yapidoc/ModelResolver.java
index 245e44c..d938f30 100644
--- a/yapidoc-core/src/main/java/com/eeeffff/yapidoc/ModelResolver.java
+++ b/yapidoc-core/src/main/java/com/eeeffff/yapidoc/ModelResolver.java
@@ -297,6 +297,11 @@ public class ModelResolver implements ModelConverter {
 						.schemaProperty(true).propertyName(targetClass.getName());
 				propSchema = new ArraySchema().items(context.resolve(aType));
 			} else {
+				JavaClass fieldGenericityContentType = null;
+                if (genericityCount(field.getType()) > 0) {
+                    fieldGenericityContentType = genericityContentType(field.getType());
+                }
+
 				PrimitiveType primitiveType = PrimitiveType.fromType(field.getType().getFullyQualifiedName());
 				if (primitiveType != null) {
 					propSchema = primitiveType.createProperty();
@@ -310,7 +315,14 @@ public class ModelResolver implements ModelConverter {
 										&& context.getDefinedModels().containsKey(typeName)) {
 									propSchema.set$ref(constructRef(typeName));
 								}
-							}
+							} else if (fieldGenericityContentType != null && DocUtils.isList(
+                                field.getType().getBinaryName())) {
+                                aType = new AnnotatedType().javaClass(fieldGenericityContentType).parent(schema)
+                                    .resolveAsRef(annotatedType.isResolveAsRef())
+                                    .jsonViewAnnotation(annotatedType.getJsonViewAnnotation()).skipSchemaName(true)
+                                    .schemaProperty(true).propertyName(field.getType().getName());
+                                propSchema = new ArraySchema().items(context.resolve(aType));
+                            }
 						}
 					}
 				}
diff --git a/yapidoc-maven-plugin/pom.xml b/yapidoc-maven-plugin/pom.xml
index d370e94..9980551 100644
--- a/yapidoc-maven-plugin/pom.xml
+++ b/yapidoc-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>yapidoc</artifactId>
 		<groupId>com.eeeffff.yapidoc</groupId>
-		<version>1.0.5</version>
+		<version>1.0.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
-- 
Gitee