Merge branch 'master' of https://github.com/metersphere/metersphere

backend/src/main/java/io/metersphere/api/parse/JmeterDocumentParser.java

@@ -161,7 +161,9 @@ public class JmeterDocumentParser {
                 break;
             case "Argument.value":
                 String textContent = ele.getTextContent();
+                if (StringUtils.startsWith(textContent, "@")) {
                     ele.setTextContent(ScriptEngineUtils.calculate(textContent));
+                }
                 break;
             default:
                 break;

frontend/src/login/Login.vue

@@ -260,6 +260,10 @@ export default {
   background: url(../assets/info.png);
   height: 560px;
 }
+
+.login-logo {
+  background: url(../assets/logo-dark-MeterSphere.svg);
+}
 </style>
 
 <style>