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 2020-12-28 14:20:51 +08:00
parent f323e737e1 6dfda405ec
commit 85b90f3226
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/main/java/io/metersphere/api/parse/old/JmeterDocumentParser.java
View File

@ -18,6 +18,8 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamResult;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.StringWriter; import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -26,7 +28,7 @@ public class JmeterDocumentParser {
private final static String STRING_PROP = "stringProp"; private final static String STRING_PROP = "stringProp";
private final static String ARGUMENTS = "Arguments"; private final static String ARGUMENTS = "Arguments";
private final static String COLLECTION_PROP = "collectionProp"; private final static String COLLECTION_PROP = "collectionProp";
private final static String HTTP_SAMPLER_PROXY = "MsHTTPSamplerProxy"; private final static String HTTP_SAMPLER_PROXY = "HTTPSamplerProxy";
private final static String ELEMENT_PROP = "elementProp"; private final static String ELEMENT_PROP = "elementProp";
public static byte[] parse(byte[] source) { public static byte[] parse(byte[] source) {
@ -154,7 +156,14 @@ public class JmeterDocumentParser {
if (!StringUtils.equals("?", u)) { if (!StringUtils.equals("?", u)) {
u += "&"; u += "&";
} }
u += k + "=" + ScriptEngineUtils.calculate(v); v = ScriptEngineUtils.calculate(v);
// urlencoder
try {
v = URLEncoder.encode(v, "UTF-8");
} catch (UnsupportedEncodingException e) {
LogUtil.error(e);
}
u += k + "=" + v;
return u; return u;
}); });
ele.setTextContent(url + ((params != null && !params.equals("?")) ? params : "")); ele.setTextContent(url + ((params != null && !params.equals("?")) ? params : ""));

2
frontend/src/business/components/common/router/router.js
View File

@ -11,7 +11,7 @@ Vue.use(VueRouter);
const router = new VueRouter({ const router = new VueRouter({
routes: [ routes: [
{path: "/", redirect: '/track/home'}, {path: "/", redirect: '/setting/personsetting'},
{ {
path: "/sidebar", path: "/sidebar",
components: { components: {

2
frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue
View File

@ -122,7 +122,7 @@ export default {
this.fileList = JSON.parse(JSON.stringify(files)); this.fileList = JSON.parse(JSON.stringify(files));
this.tableData = JSON.parse(JSON.stringify(files)); this.tableData = JSON.parse(JSON.stringify(files));
this.tableData.map(f => { this.tableData.map(f => {
f.size = f.size + ' Bytes'; f.size = (f.size / 1024).toFixed(2) + ' KB';
}); });
}) })
}, },