wanjia950611
/
smart-doc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix List of file upload error

This commit is contained in:
oppofind 2021-05-10 00:31:51 +08:00
parent 7d81f5c00b
commit 5bb00d3e72
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java vendored
View File

@ -46,7 +46,8 @@ import java.util.stream.Stream;
import static com.power.doc.constants.DocGlobalConstants.FILE_CONTENT_TYPE;
import static com.power.doc.constants.DocGlobalConstants.JSON_CONTENT_TYPE;
import static com.power.doc.constants.DocTags.*;
import static com.power.doc.constants.DocTags.IGNORE;
import static com.power.doc.constants.DocTags.IGNORE_REQUEST_BODY_ADVICE;
/**
* @author yu 2019/12/21.
@ -371,7 +372,7 @@ public class SpringBootDocBuildTemplate implements IDocBuildTemplate<ApiDoc> {
typeName = configBuilder.getApiConfig().getRequestBodyAdvice().getClassName();
gicTypeName = requestBodyAdvice + "<" + gicTypeName + ">";
}
}
if (JavaClassValidateUtil.isPrimitive(simpleTypeName)) {
StringBuilder builder = new StringBuilder();
@ -420,7 +421,7 @@ public class SpringBootDocBuildTemplate implements IDocBuildTemplate<ApiDoc> {
gicName = gicName.substring(0, gicName.indexOf("["));
}
if (!JavaClassValidateUtil.isPrimitive(gicName)
&&!configBuilder.getJavaProjectBuilder().getClassByName(gicName).isEnum()) {
&& !configBuilder.getJavaProjectBuilder().getClassByName(gicName).isEnum()) {
throw new RuntimeException("Spring MVC can't support binding Collection on method "
+ method.getName() + "Check it in " + method.getDeclaringClass().getCanonicalName());
}
@ -602,7 +603,7 @@ public class SpringBootDocBuildTemplate implements IDocBuildTemplate<ApiDoc> {
.setId(paramList.size() + 1).setQueryParam(true)
.setRequired(true).setVersion(DocGlobalConstants.DEFAULT_VERSION)
.setDesc(comment);
if (typeName.contains("[]")) {
if (typeName.contains("[]") || typeName.endsWith(">")) {
comment = comment + "(array of file)";
param.setDesc(comment);
param.setHasItems(true);
@ -661,7 +662,7 @@ public class SpringBootDocBuildTemplate implements IDocBuildTemplate<ApiDoc> {
if (Objects.nonNull(builder.getApiConfig().getRequestBodyAdvice())
&& Objects.isNull(javaMethod.getTagByName(IGNORE_REQUEST_BODY_ADVICE))) {
String requestBodyAdvice = builder.getApiConfig().getRequestBodyAdvice().getClassName();
fullTypeName = typeName = requestBodyAdvice + "<" + typeName + ">";
fullTypeName = typeName = requestBodyAdvice + "<" + typeName + ">";
}
requestBodyCounter++;
@ -683,7 +684,7 @@ public class SpringBootDocBuildTemplate implements IDocBuildTemplate<ApiDoc> {
gicName = gicName.substring(0, gicName.indexOf("["));
}
JavaClass gicJavaClass = builder.getJavaProjectBuilder().getClassByName(gicName);
if(gicJavaClass.isEnum()){
if (gicJavaClass.isEnum()) {
Object value = JavaClassUtil.getEnumValue(gicJavaClass, Boolean.TRUE);
ApiParam param = ApiParam.of().setField(paramName).setDesc(comment + ",[array of enum]")
.setRequired(required)
@ -704,7 +705,7 @@ public class SpringBootDocBuildTemplate implements IDocBuildTemplate<ApiDoc> {
.setQueryParam(queryParam)
.setId(paramList.size() + 1)
.setType("array")
.setValue(DocUtil.getValByTypeAndFieldName(gicName,paramName));
.setValue(DocUtil.getValByTypeAndFieldName(gicName, paramName));
paramList.add(param);
if (requestBodyCounter > 0) {
Map<String, Object> map = OpenApiSchemaUtil.arrayTypeSchema(gicName);

1
src/main/java/com/power/doc/utils/JavaClassValidateUtil.java
View File

@ -270,6 +270,7 @@ public class JavaClassValidateUtil {
case "org.springframework.web.multipart.MultipartFile[]":
case "org.springframework.web.multipart.commons.CommonsMultipartFile":
case "org.springframework.web.multipart.commons.CommonsMultipartFile[]":
case "java.util.List<org.springframework.web.multipart.MultipartFile>":
return true;
default:
return false;