test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

调整JMeter Home设置方式

This commit is contained in:
q4speed 2020-05-11 10:23:07 +08:00
parent a1b7d214b0
commit 84716a42ef
4 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -2,10 +2,12 @@ FROM registry.fit2cloud.com/metersphere/fabric8-java-alpine-openjdk8-jre
MAINTAINER FIT2CLOUD <support@fit2cloud.com> MAINTAINER FIT2CLOUD <support@fit2cloud.com>
RUN mkdir -p /opt/apps RUN mkdir -p /opt/apps && mkdi -p /opt/jmeter
ADD backend/target/backend-1.0.jar /opt/apps ADD backend/target/backend-1.0.jar /opt/apps
ADD backend/target/classes/jmeter/ /opt/jmeter/
ENV JAVA_APP_JAR=/opt/apps/backend-1.0.jar ENV JAVA_APP_JAR=/opt/apps/backend-1.0.jar
ENV AB_OFF=true ENV AB_OFF=true

17
backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
View File

@ -1,16 +1,13 @@
package io.metersphere.api.jmeter; package io.metersphere.api.jmeter;
import io.metersphere.commons.exception.MSException; import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.config.JmeterProperties; import io.metersphere.config.JmeterProperties;
import io.metersphere.i18n.Translator; import io.metersphere.i18n.Translator;
import org.apache.jmeter.save.SaveService; import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.util.JMeterUtils; import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree; import org.apache.jorphan.collections.HashTree;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ResourceUtils;
import java.io.FileNotFoundException;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -25,8 +22,8 @@ public class JMeterService {
public void run(InputStream is) { public void run(InputStream is) {
String JMETER_HOME = jmeterProperties.getHome(); String JMETER_HOME = jmeterProperties.getHome();
String JMETER_PROPERTIES = JMETER_HOME + "/bin/jmeter.properties"; String JMETER_PROPERTIES = JMETER_HOME + "/bin/jmeter.properties";
JMeterUtils.loadJMeterProperties(getPath(JMETER_PROPERTIES)); JMeterUtils.loadJMeterProperties(JMETER_PROPERTIES);
JMeterUtils.setJMeterHome(getPath(JMETER_HOME)); JMeterUtils.setJMeterHome(JMETER_HOME);
try { try {
Object scriptWrapper = SaveService.loadElement(is); Object scriptWrapper = SaveService.loadElement(is);
HashTree testPlan = getHashTree(scriptWrapper); HashTree testPlan = getHashTree(scriptWrapper);
@ -43,14 +40,4 @@ public class JMeterService {
field.setAccessible(true); field.setAccessible(true);
return (HashTree) field.get(scriptWrapper); return (HashTree) field.get(scriptWrapper);
} }
private String getPath(String path) {
try {
return ResourceUtils.getURL(ResourceUtils.CLASSPATH_URL_PREFIX + path).getPath();
} catch (FileNotFoundException e) {
LogUtil.error("file not found: " + path, e);
MSException.throwException(Translator.get("api_file_not_found_error"));
}
return null;
}
} }

1
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -31,4 +31,3 @@ password_is_null=Password cannot be null
workspace_not_exists=Workspace is not exists workspace_not_exists=Workspace is not exists
#api #api
api_load_script_error="Load script error" api_load_script_error="Load script error"
api_file_not_found_error="File not found"

1
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -31,4 +31,3 @@ password_is_null=密码不能为空
workspace_not_exists=工作空间不存在 workspace_not_exists=工作空间不存在
#api #api
api_load_script_error="读取脚本失败" api_load_script_error="读取脚本失败"
api_file_not_found_error="文件未找到"