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

backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java

@@ -701,9 +701,11 @@ public class JmeterDocumentParser implements DocumentParser {
         switch (unit) {
             case "M":
                 duration = String.valueOf(Long.parseLong(duration) * 60);
+                rampUp = String.valueOf(Long.parseLong(rampUp) * 60);
                 break;
             case "H":
                 duration = String.valueOf(Long.parseLong(duration) * 60 * 60);
+                rampUp = String.valueOf(Long.parseLong(rampUp) * 60 * 60);
                 break;
             default:
                 break;
@@ -804,9 +806,11 @@ public class JmeterDocumentParser implements DocumentParser {
         switch (unit) {
             case "M":
                 hold = String.valueOf(Long.parseLong(hold) * 60);
+                rampUp = String.valueOf(Long.parseLong(rampUp) * 60);
                 break;
             case "H":
                 hold = String.valueOf(Long.parseLong(hold) * 60 * 60);
+                rampUp = String.valueOf(Long.parseLong(rampUp) * 60 * 60);
                 break;
             default:
                 break;

backend/src/main/resources/db/migration/V79__v1.8.1_release.sql

@@ -1,3 +1,4 @@
+-- file name length change
 ALTER TABLE file_metadata
     MODIFY name VARCHAR(250) NOT NULL COMMENT 'File name';
 -- api_scenario_report modify column length

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd
+Subproject commit 2115bd28a90854d2b6276a90878934715498c584