diff --git a/backend/src/main/java/io/metersphere/Application.java b/backend/src/main/java/io/metersphere/Application.java index 693b24040f..2527f95107 100644 --- a/backend/src/main/java/io/metersphere/Application.java +++ b/backend/src/main/java/io/metersphere/Application.java @@ -1,5 +1,6 @@ package io.metersphere; +import io.metersphere.config.JmeterProperties; import io.metersphere.config.KafkaProperties; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -9,11 +10,12 @@ import org.springframework.boot.web.servlet.ServletComponentScan; @SpringBootApplication(exclude = {QuartzAutoConfiguration.class}) @ServletComponentScan -@EnableConfigurationProperties(KafkaProperties.class) +@EnableConfigurationProperties({ + KafkaProperties.class, + JmeterProperties.class +}) public class Application { public static void main(String[] args) { SpringApplication.run(Application.class, args); } - - } diff --git a/backend/src/main/java/io/metersphere/config/JmeterProperties.java b/backend/src/main/java/io/metersphere/config/JmeterProperties.java new file mode 100644 index 0000000000..fa49d34ed6 --- /dev/null +++ b/backend/src/main/java/io/metersphere/config/JmeterProperties.java @@ -0,0 +1,20 @@ +package io.metersphere.config; + + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = JmeterProperties.JMETER_PREFIX) +public class JmeterProperties { + + public static final String JMETER_PREFIX = "jmeter"; + + private String image = "registry.fit2cloud.com/metersphere/jmeter-master:0.0.3"; + + public String getImage() { + return image; + } + + public void setImage(String image) { + this.image = image; + } +} diff --git a/backend/src/main/java/io/metersphere/engine/AbstractEngine.java b/backend/src/main/java/io/metersphere/engine/AbstractEngine.java index e407f9b6f5..f04cc74747 100644 --- a/backend/src/main/java/io/metersphere/engine/AbstractEngine.java +++ b/backend/src/main/java/io/metersphere/engine/AbstractEngine.java @@ -10,6 +10,7 @@ import io.metersphere.commons.constants.ResourcePoolTypeEnum; import io.metersphere.commons.constants.TestStatus; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.CommonBeanFactory; +import io.metersphere.config.JmeterProperties; import io.metersphere.service.LoadTestService; import io.metersphere.service.TestResourcePoolService; import io.metersphere.service.TestResourceService; @@ -20,9 +21,7 @@ import java.util.List; import java.util.UUID; public abstract class AbstractEngine implements Engine { - public static final String REGISTRY = "registry.fit2cloud.com/metersphere/"; - public static final String JMETER_IMAGE = "jmeter-master:0.0.2"; - + protected String JMETER_IMAGE; private Long startTime; private String reportId; protected LoadTestWithBLOBs loadTest; @@ -36,6 +35,7 @@ public abstract class AbstractEngine implements Engine { public AbstractEngine() { testResourcePoolService = CommonBeanFactory.getBean(TestResourcePoolService.class); testResourceService = CommonBeanFactory.getBean(TestResourceService.class); + JMETER_IMAGE = CommonBeanFactory.getBean(JmeterProperties.class).getImage(); this.startTime = System.currentTimeMillis(); this.reportId = UUID.randomUUID().toString(); } diff --git a/backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java b/backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java index df7e35b3ec..2e555fbdbb 100644 --- a/backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java +++ b/backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java @@ -80,7 +80,7 @@ public class DockerTestEngine extends AbstractEngine { testRequest.setSize(1); testRequest.setTestId(testId); testRequest.setFileString(content); - testRequest.setImage(REGISTRY + JMETER_IMAGE); + testRequest.setImage(JMETER_IMAGE); testRequest.setTestData(context.getTestData()); // todo 判断测试状态 diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java b/backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java index 25b6ee6f35..dedb5e7a8a 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java +++ b/backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java @@ -87,7 +87,7 @@ public class KubernetesTestEngine extends AbstractEngine { }}); jmeter.setSpec(new JmeterSpec() {{ setReplicas(1); - setImage(REGISTRY + JMETER_IMAGE); + setImage(JMETER_IMAGE); }}); LogUtil.info("Load test started. " + context.getTestId()); kubernetesProvider.applyCustomResource(jmeter); @@ -111,7 +111,7 @@ public class KubernetesTestEngine extends AbstractEngine { }}); jmeter.setSpec(new JmeterSpec() {{ setReplicas(1); - setImage(REGISTRY + JMETER_IMAGE); + setImage(JMETER_IMAGE); }}); provider.deleteCustomResource(jmeter); } catch (Exception e) { diff --git a/frontend/src/business/components/performance/report/PerformanceTestReport.vue b/frontend/src/business/components/performance/report/PerformanceTestReport.vue index 75c54461da..0ce159c58b 100644 --- a/frontend/src/business/components/performance/report/PerformanceTestReport.vue +++ b/frontend/src/business/components/performance/report/PerformanceTestReport.vue @@ -8,9 +8,9 @@ {{$t('commons.report')}} + prefix-icon="el-icon-search" + maxlength="60" + v-model="condition" @change="search" clearable/> @@ -19,12 +19,6 @@ - - {{ scope.row.updateTime | timestampFormatDate }} + + + @@ -145,7 +160,7 @@ }); }, _handleDelete(report) { - this.result = this.$post(this.deletePath + report.id, {},() => { + this.result = this.$post(this.deletePath + report.id, {}, () => { this.$message({ message: this.$t('commons.delete_success'), type: 'success' diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 089d9ebeb8..249cb129aa 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -30,7 +30,7 @@ export default { 'phone': 'Phone', 'role': 'Role', 'personal_info': 'Personal Info', - 'status': 'Enable/Disable', + 'status': 'Status', 'show_all': 'Show All', 'report': 'Report', 'user': 'User', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 6cb55418bd..86ba6c76d5 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -30,7 +30,7 @@ export default { 'phone': '电话', 'role': '角色', 'personal_info': '个人信息', - 'status': '启用/禁用', + 'status': '状态', 'show_all': '显示全部', 'report': '报告', 'user': '用户',