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

Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6

This commit is contained in:
chenjianxing 2021-01-06 12:04:40 +08:00
parent 55e8d9fec6 d89de179b3
commit e975dcbc18
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -5,9 +5,9 @@ pipeline {
} }
} }
options { quietPeriod(600) } options { quietPeriod(600) }
parameters { environment {
string(name: 'IMAGE_NAME', defaultValue: 'metersphere', description: '构建后的 Docker 镜像名称') IMAGE_NAME = 'metersphere'
string(name: 'IMAGE_PREFIX', defaultValue: 'registry.cn-qingdao.aliyuncs.com/metersphere', description: '构建后的 Docker 镜像带仓库名的前缀') IMAGE_PREFIX = 'registry.cn-qingdao.aliyuncs.com/metersphere'
} }
stages { stages {
stage('Build/Test') { stage('Build/Test') {

4
backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java
View File

@ -88,7 +88,7 @@ public class JmeterFileService {
if (!CollectionUtils.isEmpty(testData)) { if (!CollectionUtils.isEmpty(testData)) {
for (String k : testData.keySet()) { for (String k : testData.keySet()) {
String v = testData.get(k); String v = testData.get(k);
files.put("k", v.getBytes(StandardCharsets.UTF_8)); files.put(k, v.getBytes(StandardCharsets.UTF_8));
} }
} }
@ -97,7 +97,7 @@ public class JmeterFileService {
if (!CollectionUtils.isEmpty(jarFiles)) { if (!CollectionUtils.isEmpty(jarFiles)) {
for (String k : jarFiles.keySet()) { for (String k : jarFiles.keySet()) {
byte[] v = jarFiles.get(k); byte[] v = jarFiles.get(k);
files.put("k", v); files.put(k, v);
} }
} }