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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
oppofind 2020-08-07 00:35:50 +08:00
parent e7bdb55b5d ba33cf2b60
commit 998506295e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/power/doc/helper/JsonBuildHelper.java
View File

@ -109,7 +109,7 @@ public class JsonBuildHelper {
//添加泛型对应关系
if (cls != null && null != cls.getTypeParameters()) {
List<JavaTypeVariable<JavaGenericDeclaration>> variables = cls.getTypeParameters();
for (int i = 0; i < cls.getTypeParameters().size(); i++) {
for (int i = 0; i < cls.getTypeParameters().size() && i<globGicName.length; i++) {
genericMap.put(variables.get(i).getName(), globGicName[i]);
}
}

2
src/main/java/com/power/doc/helper/ParamsBuildHelper.java
View File

@ -76,7 +76,7 @@ public class ParamsBuildHelper {
//如果存在泛型 则将泛型与类名的对应关系存起来
if (cls != null && null != cls.getTypeParameters()) {
List<JavaTypeVariable<JavaGenericDeclaration>> variables = cls.getTypeParameters();
for (int i = 0; i < cls.getTypeParameters().size(); i++) {
for (int i = 0; i < cls.getTypeParameters().size() && i<globGicName.length; i++) {
genericMap.put(variables.get(i).getName(), globGicName[i]);
}
}

16
src/main/java/com/power/doc/template/RpcDocBuildTemplate.java vendored
View File

@ -97,14 +97,14 @@ public class RpcDocBuildTemplate implements IDocBuildTemplate<RpcApiDoc> {
throw new RuntimeException("Unable to find comment for method " + method.getName() + " in " + cls.getCanonicalName());
}
boolean deprecated = false;
//RPC没有注解
// List<JavaAnnotation> annotations = method.getAnnotations();
// for (JavaAnnotation annotation : annotations) {
// String annotationName = annotation.getType().getName();
// if (DocAnnotationConstants.DEPRECATED.equals(annotationName)) {
// deprecated = true;
// }
// }
//设置当前接口是否过时
List<JavaAnnotation> annotations = method.getAnnotations();
for (JavaAnnotation annotation : annotations) {
String annotationName = annotation.getType().getName();
if (DocAnnotationConstants.DEPRECATED.equals(annotationName)) {
deprecated = true;
}
}
methodOrder++;
JavaMethodDoc apiMethodDoc = new JavaMethodDoc();
String methodDefine = methodDefinition(method);