diff --git a/src/main/java/com/power/doc/builder/TornaBuilder.java b/src/main/java/com/power/doc/builder/TornaBuilder.java index 2c49d98..b395fd3 100644 --- a/src/main/java/com/power/doc/builder/TornaBuilder.java +++ b/src/main/java/com/power/doc/builder/TornaBuilder.java @@ -155,7 +155,7 @@ public class TornaBuilder { * build apis * @param a api * @param hasDebugEnv has debug environment - * @return + * @return List of Api */ public static List buildApis(ApiDoc a, boolean hasDebugEnv) { List apiMethodDocs = a.getList(); diff --git a/src/main/java/com/power/doc/helper/FormDataBuildHelper.java b/src/main/java/com/power/doc/helper/FormDataBuildHelper.java index cec0d87..519e1c0 100644 --- a/src/main/java/com/power/doc/helper/FormDataBuildHelper.java +++ b/src/main/java/com/power/doc/helper/FormDataBuildHelper.java @@ -123,7 +123,7 @@ public class FormDataBuildHelper { if (StringUtil.isNotEmpty(comment)) { comment = DocUtil.replaceNewLineToHtmlBr(comment); } - if (fieldGicName.contains(DocGlobalConstants.MULTIPART_FILE_FULLY)) { + if (JavaClassValidateUtil.isFile(fieldGicName)) { FormData formData = new FormData(); formData.setKey(pre + fieldName); formData.setType("file"); diff --git a/src/main/java/com/power/doc/helper/ParamsBuildHelper.java b/src/main/java/com/power/doc/helper/ParamsBuildHelper.java index ff666a2..5b082e7 100644 --- a/src/main/java/com/power/doc/helper/ParamsBuildHelper.java +++ b/src/main/java/com/power/doc/helper/ParamsBuildHelper.java @@ -232,7 +232,7 @@ public class ParamsBuildHelper { comment = DocUtil.replaceNewLineToHtmlBr(comment); } // file - if (fieldGicName.contains(DocGlobalConstants.MULTIPART_FILE_FULLY)) { + if (JavaClassValidateUtil.isFile(fieldGicName)) { ApiParam param = ApiParam.of().setField(pre + fieldName).setType("file") .setPid(pid).setId(paramList.size() + pid + 1) .setMaxLength(maxLength) diff --git a/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java b/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java index ab8f32f..0ae372a 100644 --- a/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java +++ b/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java @@ -391,7 +391,7 @@ public class SpringBootDocBuildTemplate implements IDocBuildTemplate { continue; } //file upload - if (gicTypeName.contains(DocGlobalConstants.MULTIPART_FILE_FULLY)) { + if (JavaClassValidateUtil.isFile(gicTypeName)) { apiMethodDoc.setContentType(FILE_CONTENT_TYPE); FormData formData = new FormData(); formData.setKey(paramName); @@ -588,7 +588,7 @@ public class SpringBootDocBuildTemplate implements IDocBuildTemplate { paramName = StringUtil.camelToUnderline(paramName); } //file upload - if (typeName.contains(DocGlobalConstants.MULTIPART_FILE_FULLY)) { + if (JavaClassValidateUtil.isFile(typeName)) { ApiParam param = ApiParam.of().setField(paramName).setType("file") .setId(paramList.size() + 1).setQueryParam(true) .setRequired(true).setVersion(DocGlobalConstants.DEFAULT_VERSION) @@ -687,7 +687,7 @@ public class SpringBootDocBuildTemplate implements IDocBuildTemplate { "true", responseFieldMap, Boolean.FALSE, new HashMap<>(), builder, groupClasses, 0)); } else { throw new RuntimeException("Spring MVC can't support binding Collection on method " - + javaMethod.getName() + "Check it in " + javaMethod.getDeclaringClass().getCanonicalName()); + + javaMethod.getName() + ",Check it in " + javaMethod.getDeclaringClass().getCanonicalName()); } } } else if (JavaClassValidateUtil.isPrimitive(fullTypeName)) { diff --git a/src/main/java/com/power/doc/utils/JavaClassValidateUtil.java b/src/main/java/com/power/doc/utils/JavaClassValidateUtil.java index a141a82..6f0d4b6 100644 --- a/src/main/java/com/power/doc/utils/JavaClassValidateUtil.java +++ b/src/main/java/com/power/doc/utils/JavaClassValidateUtil.java @@ -267,6 +267,9 @@ public class JavaClassValidateUtil { public static boolean isFile(String typeName){ switch (typeName) { case "org.springframework.web.multipart.MultipartFile": + case "org.springframework.web.multipart.MultipartFile[]": + case "org.springframework.web.multipart.commons.CommonsMultipartFile": + case "org.springframework.web.multipart.commons.CommonsMultipartFile[]": return true; default: return false; @@ -275,8 +278,8 @@ public class JavaClassValidateUtil { /** * check reactor param - * @param typeName - * @return + * @param typeName class name + * @return boolean */ public static boolean isReactor(String typeName) { switch (typeName) {