From 6b6acf4ca7c941c1013af1e0666dde2c8fa788f3 Mon Sep 17 00:00:00 2001 From: BugKing Date: Tue, 5 Jan 2021 17:25:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?build:=20Jenkinsfile=20=E4=B8=8D=E5=A3=B0?= =?UTF-8?q?=E6=98=8E=20parameter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 65ab9ec657..994ddca141 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,9 +5,9 @@ pipeline { } } options { quietPeriod(600) } - parameters { - string(name: 'IMAGE_NAME', defaultValue: 'metersphere', description: '构建后的 Docker 镜像名称') - string(name: 'IMAGE_PREFIX', defaultValue: 'registry.cn-qingdao.aliyuncs.com/metersphere', description: '构建后的 Docker 镜像带仓库名的前缀') + environment { + IMAGE_NAME = 'metersphere' + IMAGE_PREFIX = 'registry.cn-qingdao.aliyuncs.com/metersphere' } stages { stage('Build/Test') { From d89de179b366bb7459a25b3d4188b31c550243fd Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Wed, 6 Jan 2021 10:03:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=E6=96=87=E4=BB=B6=E5=90=8D=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=A7=A3=E6=9E=90=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/performance/service/JmeterFileService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java b/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java index 29dad1b809..65f0396d00 100644 --- a/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java +++ b/backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java @@ -88,7 +88,7 @@ public class JmeterFileService { if (!CollectionUtils.isEmpty(testData)) { for (String k : testData.keySet()) { 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)) { for (String k : jarFiles.keySet()) { byte[] v = jarFiles.get(k); - files.put("k", v); + files.put(k, v); } }