diff --git a/src/main/java/com/power/doc/helper/ParamsBuildHelper.java b/src/main/java/com/power/doc/helper/ParamsBuildHelper.java index c02384a..7f66920 100644 --- a/src/main/java/com/power/doc/helper/ParamsBuildHelper.java +++ b/src/main/java/com/power/doc/helper/ParamsBuildHelper.java @@ -489,7 +489,7 @@ public class ParamsBuildHelper { } String enumComments = javaClass.getComment(); if (projectBuilder.getApiConfig().getInlineEnum()) { - ApiDataDictionary dataDictionary = projectBuilder.getApiConfig().getDataDictionary(javaClass.getSimpleName()); + ApiDataDictionary dataDictionary = projectBuilder.getApiConfig().getDataDictionary(javaClass.getCanonicalName()); if (Objects.isNull(dataDictionary)) { comment = comment + "
" + JavaClassUtil.getEnumParams(javaClass); } else { diff --git a/src/main/java/com/power/doc/model/ApiConfig.java b/src/main/java/com/power/doc/model/ApiConfig.java index 517c670..215ded5 100644 --- a/src/main/java/com/power/doc/model/ApiConfig.java +++ b/src/main/java/com/power/doc/model/ApiConfig.java @@ -527,12 +527,12 @@ public class ApiConfig { this.dataDictionaries = CollectionUtil.asList(dataDictConfigs); } - public ApiDataDictionary getDataDictionary(String enumClassSimpleName) { + public ApiDataDictionary getDataDictionary(String enumClassName) { if (Objects.isNull(this.dataDictionaries)) { return null; } return this.dataDictionaries.stream().filter((apiDataDictionary -> - enumClassSimpleName.equalsIgnoreCase(apiDataDictionary.getEnumClassName()))) + enumClassName.equalsIgnoreCase(apiDataDictionary.getEnumClassName()))) .findFirst().orElse(new ApiDataDictionary()); } diff --git a/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java b/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java index 3d92c3d..5472f86 100644 --- a/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java +++ b/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java @@ -470,7 +470,7 @@ public class SpringBootDocBuildTemplate implements IDocBuildTemplate { url = UrlUtil.simplifyUrl(url); if (requestExample.isJson()) { - if (StringUtil.isNotEmpty(requestExample.getJsonBody())) { + if (StringUtil.isNotEmpty(body)) { url = url + "?" + body; } CurlRequest curlRequest = CurlRequest.builder()