From ae6f7b8e715bf61fa6b50f588b6037e102d6962b Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 30 Apr 2020 11:04:37 +0800
Subject: [PATCH] properties

---
 backend/pom.xml                               |  6 ++++
 .../metersphere/config/JmeterProperties.java  |  2 +-
 .../src/main/resources/application.properties | 29 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 011c51a609..10ee9e77ab 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -39,6 +39,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
diff --git a/backend/src/main/java/io/metersphere/config/JmeterProperties.java b/backend/src/main/java/io/metersphere/config/JmeterProperties.java
index fa49d34ed6..5621c4c247 100644
--- a/backend/src/main/java/io/metersphere/config/JmeterProperties.java
+++ b/backend/src/main/java/io/metersphere/config/JmeterProperties.java
@@ -8,7 +8,7 @@ public class JmeterProperties {
 
     public static final String JMETER_PREFIX = "jmeter";
 
-    private String image = "registry.fit2cloud.com/metersphere/jmeter-master:0.0.3";
+    private String image;
 
     public String getImage() {
         return image;
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 728e362036..5488751529 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -36,4 +36,31 @@ spring.flyway.baseline-version=0
 spring.flyway.encoding=UTF-8
 spring.flyway.validate-on-migrate=false
 
-spring.messages.basename=i18n/messages
\ No newline at end of file
+spring.messages.basename=i18n/messages
+
+# kafka
+kafka.acks=1
+kafka.fields=
+kafka.timestamp=yyyy-MM-dd'T'HH:mm:ss.SSSZZ
+kafka.sample-filter=
+kafka.test-mode=info
+kafka.parse-all-req-headers=false
+kafka.parse-all-res-headers=false
+kafka.compression-type=
+kafka.batch-size=16384
+kafka.client-id=JMeterKafkaBackendListener
+kafka.connections-max-idle-ms=180000
+kafka.ssl.enabled=false
+kafka.ssl.key-password=
+kafka.ssl.keystore-location=
+kafka.ssl.keystore-password=
+kafka.ssl.truststore-location=
+kafka.ssl.truststore-password=
+kafka.ssl.enabled-protocols=TLSv1.2,TLSv1.1,TLSv1
+kafka.ssl.keystore-type=JKS
+kafka.ssl.protocol=TLS
+kafka.ssl.provider=
+kafka.ssl.truststore-type=
+
+# jmeter
+jmeter.image=registry.fit2cloud.com/metersphere/jmeter-master:0.0.4
\ No newline at end of file