|
28 | 28 | import com.ly.doc.model.ApiDoc; |
29 | 29 | import com.ly.doc.template.IDocBuildTemplate; |
30 | 30 | import com.power.common.util.DateTimeUtil; |
| 31 | +import com.power.common.util.StringUtil; |
31 | 32 | import com.thoughtworks.qdox.JavaProjectBuilder; |
32 | 33 |
|
33 | 34 | import java.util.List; |
@@ -61,13 +62,18 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB |
61 | 62 | builderTemplate.checkAndInit(config, Boolean.TRUE); |
62 | 63 | config.setAdoc(false); |
63 | 64 | config.setShowJavaType(true); |
64 | | - config.setParamsDataToTree(false); |
| 65 | + config.setParamsDataToTree(Boolean.FALSE); |
65 | 66 | ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); |
66 | 67 | IDocBuildTemplate<ApiDoc> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework()); |
67 | 68 | Objects.requireNonNull(docBuildTemplate, "doc build template is null"); |
68 | 69 | List<ApiDoc> apiDocList = docBuildTemplate.getApiData(configBuilder); |
69 | 70 | String version = config.isCoverOld() ? "" : "-V" + DateTimeUtil.long2Str(System.currentTimeMillis(), DocGlobalConstants.DATE_FORMAT_YYYY_MM_DD_HH_MM); |
70 | | - String docName = builderTemplate.allInOneDocName(config, "JmeterApiDoc" + version + JMETER_SCRIPT_EXTENSION, JMETER_SCRIPT_EXTENSION); |
| 71 | + String docName; |
| 72 | + if (StringUtil.isNotEmpty(config.getProjectName())) { |
| 73 | + docName = config.getProjectName() + version + JMETER_SCRIPT_EXTENSION; |
| 74 | + } else { |
| 75 | + docName = "jmeter-script"+ version + JMETER_SCRIPT_EXTENSION; |
| 76 | + } |
71 | 77 | builderTemplate.buildAllInOne(apiDocList, config, javaProjectBuilder, DocGlobalConstants.JMETER_TPL, docName); |
72 | 78 | } |
73 | 79 | } |
0 commit comments