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

Change the default value of server url.

This commit is contained in:
oppofind 2020-09-29 10:13:22 +08:00
parent c3767b5333
commit b0dc00ede7
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/power/doc/constants/DocGlobalConstants.java
View File

@ -133,7 +133,7 @@ public interface DocGlobalConstants {
String SHORT_MULTIPART_FILE_FULLY = "MultipartFile"; String SHORT_MULTIPART_FILE_FULLY = "MultipartFile";
String DEFAULT_SERVER_URL = "http://{server}"; String DEFAULT_SERVER_URL = "";
String SHORT_REQUEST_BODY = "RequestBody"; String SHORT_REQUEST_BODY = "RequestBody";

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

@ -198,7 +198,8 @@ public class ParamsBuildHelper {
//cover comment //cover comment
CustomRespField customResponseField = responseFieldMap.get(field.getName()); CustomRespField customResponseField = responseFieldMap.get(field.getName());
String comment; String comment;
if (null != customResponseField && StringUtil.isNotEmpty(customResponseField.getDesc())) { if (null != customResponseField && StringUtil.isNotEmpty(customResponseField.getDesc())
&& simpleName.equals(customResponseField.getOwnerClassName())) {
comment = customResponseField.getDesc(); comment = customResponseField.getDesc();
} else { } else {
comment = docField.getComment(); comment = docField.getComment();
@ -251,7 +252,7 @@ public class ParamsBuildHelper {
if (displayActualType) { if (displayActualType) {
if (globGicName.length > 0) { if (globGicName.length > 0) {
String gicName = genericMap.get(subTypeName) != null ? genericMap.get(subTypeName) : globGicName[0]; String gicName = genericMap.get(subTypeName) != null ? genericMap.get(subTypeName) : globGicName[0];
if(!simpleName.equals(gicName)){ if (!simpleName.equals(gicName)) {
appendComment = " (ActualType: " + JavaClassUtil.getClassSimpleName(gicName) + ")"; appendComment = " (ActualType: " + JavaClassUtil.getClassSimpleName(gicName) + ")";
} }
} }
@ -428,7 +429,8 @@ public class ParamsBuildHelper {
return paramList; return paramList;
} }
private static void commonHandleParam(List<ApiParam> paramList, ApiParam param, String isRequired, String comment, String since, boolean strRequired) { private static void commonHandleParam(List<ApiParam> paramList, ApiParam param, String isRequired,
String comment, String since, boolean strRequired) {
if (StringUtil.isEmpty(isRequired)) { if (StringUtil.isEmpty(isRequired)) {
param.setDesc(comment).setVersion(since); param.setDesc(comment).setVersion(since);
} else { } else {

23
src/main/java/com/power/doc/utils/Iterables.java
View File

@ -1,3 +1,26 @@
/*
* smart-doc
*
* Copyright (C) 2018-2020 smart-doc
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package com.power.doc.utils; package com.power.doc.utils;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;