Skip to content
This repository was archived by the owner on Dec 4, 2025. It is now read-only.

Commit ce2a04f

Browse files
authored
Merge pull request #781 from shalousun/master
feat: Optimize the names generated by JMeter scripts
2 parents c1a1bc3 + ee594de commit ce2a04f

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

src/main/java/com/ly/doc/builder/JMeterBuilder.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.ly.doc.model.ApiDoc;
2929
import com.ly.doc.template.IDocBuildTemplate;
3030
import com.power.common.util.DateTimeUtil;
31+
import com.power.common.util.StringUtil;
3132
import com.thoughtworks.qdox.JavaProjectBuilder;
3233

3334
import java.util.List;
@@ -61,13 +62,18 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB
6162
builderTemplate.checkAndInit(config, Boolean.TRUE);
6263
config.setAdoc(false);
6364
config.setShowJavaType(true);
64-
config.setParamsDataToTree(false);
65+
config.setParamsDataToTree(Boolean.FALSE);
6566
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
6667
IDocBuildTemplate<ApiDoc> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework());
6768
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
6869
List<ApiDoc> apiDocList = docBuildTemplate.getApiData(configBuilder);
6970
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+
}
7177
builderTemplate.buildAllInOne(apiDocList, config, javaProjectBuilder, DocGlobalConstants.JMETER_TPL, docName);
7278
}
7379
}

0 commit comments

Comments
 (0)