Merge pull request #1057 from netdied/master

Fix issue 1046

Author: shalousun

src/main/java/com/ly/doc/builder/openapi/AbstractOpenApiBuilder.java

@@ -155,6 +155,9 @@ public Map<String, Object> buildPaths(ApiConfig apiConfig, ApiSchema<ApiDoc> api
 				String[] paths = methodDoc.getPath().split(";");
 				for (String path : paths) {
 					path = path.trim();
+					if (StringUtil.isNotEmpty(apiConfig.getPathPrefix())) {
+						path = path.replace(apiConfig.getPathPrefix(), "");
+					}
 					Map<String, Object> request = this.buildPathUrls(apiConfig, methodDoc, methodDoc.getClazzDoc(),
 							apiSchema.getApiExceptionStatuses());
 					if (!pathMap.containsKey(path)) {

src/main/java/com/ly/doc/template/IRestDocTemplate.java

@@ -284,7 +284,7 @@ default void handleApiDoc(JavaClass cls, List<ApiDoc> apiDocList, List<ApiMethod
 			apiDoc.setAlias(name);
 		}
 		String desc = DocUtil.getEscapeAndCleanComment(cls.getComment());
-		apiDoc.setDesc(desc);
+		apiDoc.setDesc(StringUtil.isEmpty(desc) ? controllerName : desc);
 		apiDoc.setList(apiMethodDocs);
 		apiDocList.add(apiDoc);
 
@@ -822,6 +822,9 @@ else if (Objects.nonNull(classMediaType)) {
 			if (StringUtil.isEmpty(common)) {
 				common = JavaClassUtil.getSameSignatureMethodCommonFromInterface(cls, method);
 			}
+			if (StringUtil.isEmpty(common)) {
+				common = apiMethodDoc.getName();
+			}
 			apiMethodDoc.setDesc(common);
 			apiMethodDoc.setAuthor(docJavaMethod.getAuthor());
 			apiMethodDoc.setDetail(docJavaMethod.getDetail());

src/main/java/com/ly/doc/template/JAXRSDocBuildTemplate.java

@@ -217,7 +217,9 @@ private List<ApiMethodDoc> buildControllerMethod(final JavaClass cls, ApiConfig
 			methodOrder++;
 			apiMethodDoc.setName(method.getName());
 			apiMethodDoc.setOrder(methodOrder);
-			apiMethodDoc.setDesc(docJavaMethod.getDesc());
+			String desc = StringUtil.isEmpty(docJavaMethod.getDesc()) ? docJavaMethod.getClass().getName()
+					: docJavaMethod.getDesc();
+			apiMethodDoc.setDesc(desc);
 			String methodUid = DocUtil.generateId(clzName + method.getName() + methodOrder);
 			apiMethodDoc.setMethodId(methodUid);
 			apiMethodDoc.setAuthor(docJavaMethod.getAuthor());

src/main/java/com/ly/doc/utils/DocUtil.java

@@ -1208,7 +1208,9 @@ public static List<ApiDocDict> buildDictionary(ApiConfig config, JavaProjectBuil
 						DocletTag apiNoteTag = javaClass.getTagByName(DocTags.API_NOTE);
 						ApiDocDict apiDocDict = new ApiDocDict();
 						apiDocDict.setOrder(order++);
-						apiDocDict.setTitle(javaClass.getComment());
+						String title = StringUtils.isBlank(javaClass.getComment()) ? javaClass.getName()
+								: javaClass.getComment();
+						apiDocDict.setTitle(title);
 						apiDocDict.setDescription(DocUtil.getEscapeAndCleanComment(
 								Optional.ofNullable(apiNoteTag).map(DocletTag::getValue).orElse(StringUtil.EMPTY)));
 						List<DataDict> enumDictionaryList = EnumUtil.getEnumInformation(enumClass,
@@ -1230,7 +1232,8 @@ public static List<ApiDocDict> buildDictionary(ApiConfig config, JavaProjectBuil
 					apiDocDict.setDescription(DocUtil.getEscapeAndCleanComment(
 							Optional.ofNullable(apiNoteTag).map(DocletTag::getValue).orElse(StringUtil.EMPTY)));
 					if (apiDataDictionary.getTitle() == null) {
-						apiDocDict.setTitle(javaClass.getComment());
+						apiDocDict.setTitle(StringUtils.isBlank(javaClass.getComment()) ? javaClass.getName()
+								: javaClass.getComment());
 					}
 					List<DataDict> enumDictionaryList = EnumUtil.getEnumInformation(clazz,
 							apiDataDictionary.getCodeField(), apiDataDictionary.getDescField());