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

2021-03-24 13:40:23 +08:00 · 2021-03-24 13:40:23 +08:00 · f13746e655
parent b86a220007 4067968132
commit f13746e655
18 changed files with 288 additions and 90 deletions
--- a/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseResult.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseResult.java
@ -11,6 +11,7 @@ public class ApiTestCaseResult extends ApiTestCaseWithBLOBs {
    private String createUser;
    private String updateUser;
    private String execResult;
+    private String apiMethod;
    private Long execTime;
    private boolean active = false;
    private boolean responseActive = false;
--- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/HarParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/HarParser.java
@ -173,7 +173,7 @@ public class HarParser extends HarAbstractParser {
            return;
        }
        HarPostData content = requestBody.postData;
-        if (!StringUtils.equalsIgnoreCase("GET", requestBody.method) || requestBody.postData == null) {
+        if (StringUtils.equalsIgnoreCase("GET", requestBody.method) || requestBody.postData == null) {
            return;
        }
        String contentType = content.mimeType;
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@ -792,7 +792,7 @@ public class ApiDefinitionService {
                    res.setCaseStatus("-");
                }

-                if (StringUtils.equals("ESB", res.getMethod())) {
+                if (StringUtils.equalsIgnoreCase("esb", res.getMethod())) {
                    esbApiParamService.handleApiEsbParams(res);
                }
            }
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@ -85,7 +85,9 @@ public class ApiTestCaseService {
        List<ApiTestCaseResult> returnList = extApiTestCaseMapper.list(request);

        for (ApiTestCaseResult res : returnList) {
-            esbApiParamService.handleApiEsbParams(res);
+            if(StringUtils.equalsIgnoreCase(res.getApiMethod(),"esb")){
+                esbApiParamService.handleApiEsbParams(res);
+            }
        }
        return returnList;
    }
@ -145,9 +147,13 @@ public class ApiTestCaseService {
    }

    public ApiTestCaseWithBLOBs get(String id) {
-        ApiTestCaseWithBLOBs returnBlobs = apiTestCaseMapper.selectByPrimaryKey(id);
-        esbApiParamService.handleApiEsbParams(returnBlobs);
-        return returnBlobs;
+//        ApiTestCaseWithBLOBs returnBlobs = apiTestCaseMapper.selectByPrimaryKey(id);
+        ApiTestCaseInfo model = extApiTestCaseMapper.selectApiCaseInfoByPrimaryKey(id);
+        if(StringUtils.equalsIgnoreCase(model.getApiMethod(),"esb")){
+            esbApiParamService.handleApiEsbParams(model);
+        }
+
+        return model;
    }

    public ApiTestCase create(SaveApiTestCaseRequest request, List<MultipartFile> bodyFiles) {
@ -440,9 +446,11 @@ public class ApiTestCaseService {
    }

    public Map<String, String> getRequest(ApiTestCaseRequest request) {
-        List<ApiTestCaseWithBLOBs> list = extApiTestCaseMapper.getRequest(request);
-        for (ApiTestCaseWithBLOBs model : list) {
-            esbApiParamService.handleApiEsbParams(model);
+        List<ApiTestCaseInfo> list = extApiTestCaseMapper.getRequest(request);
+        for (ApiTestCaseInfo model : list) {
+            if(StringUtils.equalsIgnoreCase(model.getApiMethod(),"esb")){
+                esbApiParamService.handleApiEsbParams(model);
+            }
        }
        return list.stream().collect(Collectors.toMap(ApiTestCaseWithBLOBs::getId, ApiTestCaseWithBLOBs::getRequest));
    }
--- a/backend/src/main/java/io/metersphere/api/service/EsbApiParamService.java
+++ b/backend/src/main/java/io/metersphere/api/service/EsbApiParamService.java
@ -107,6 +107,9 @@ public class EsbApiParamService {
    }

    public void handleApiEsbParams(ApiDefinitionResult res) {
+        if(res == null){
+            return;
+        }
        EsbApiParamsWithBLOBs esbParamBlobs = this.getEsbParamBLOBsByResourceID(res.getId());
        if (esbParamBlobs == null) {
            return;
@ -141,6 +144,9 @@ public class EsbApiParamService {
    }

    public void handleApiEsbParams(ApiTestCaseWithBLOBs res) {
+        if(res==null){
+            return;
+        }
        EsbApiParamsWithBLOBs esbParamBlobs = this.getEsbParamBLOBsByResourceID(res.getId());
        if (esbParamBlobs == null) {
            return;
@ -184,6 +190,9 @@ public class EsbApiParamService {
    }

    public void handleApiEsbParams(ApiTestCaseResult res) {
+        if(res == null){
+            return;
+        }
        EsbApiParamsWithBLOBs esbParamBlobs = this.getEsbParamBLOBsByResourceID(res.getId());
        if (esbParamBlobs == null) {
            return;
@ -195,20 +204,6 @@ public class EsbApiParamService {
            }

        }
-//        try {
-//            if (StringUtils.isNotEmpty(res.getRequest())) {
-//                JSONObject jsonObj = JSONObject.parseObject(res.getRequest());
-//                JSONArray esbDataArray = JSONArray.parseArray(esbParamBlobs.getDataStruct());
-//                jsonObj.put("esbDataStruct", esbDataArray);
-//                jsonObj.put("esbFrontedScript", esbParamBlobs.getFrontedScript());
-//
-//                JSONArray responseDataArray = JSONArray.parseArray(esbParamBlobs.getResponseDataStruct());
-//                jsonObj.put("backEsbDataStruct", responseDataArray);
-//
-//                res.setRequest(jsonObj.toJSONString());
-//            }
-//        } catch (Exception e) {
-//        }
    }

    public SaveApiDefinitionRequest updateEsbRequest(SaveApiDefinitionRequest request) {
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
@ -2,16 +2,13 @@ package io.metersphere.base.mapper.ext;

 import io.metersphere.api.dto.datacount.ApiDataCountResult;
 import io.metersphere.api.dto.definition.ApiTestCaseDTO;
+import io.metersphere.api.dto.definition.ApiTestCaseInfo;
 import io.metersphere.api.dto.definition.ApiTestCaseRequest;
 import io.metersphere.api.dto.definition.ApiTestCaseResult;
 import io.metersphere.base.domain.ApiTestCase;
-import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
-import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;

 import java.util.List;
-import java.util.Map;

 public interface ExtApiTestCaseMapper {

@ -27,7 +24,9 @@ public interface ExtApiTestCaseMapper {

    long countByProjectIDAndCreateInThisWeek(@Param("projectId") String projectId, @Param("firstDayTimestamp") long firstDayTimestamp, @Param("lastDayTimestamp") long lastDayTimestamp);

-    List<ApiTestCaseWithBLOBs> getRequest(@Param("request") ApiTestCaseRequest request);
+    List<ApiTestCaseInfo> getRequest(@Param("request") ApiTestCaseRequest request);

    ApiTestCase getNextNum(@Param("definitionId") String definitionId);
+
+    ApiTestCaseInfo selectApiCaseInfoByPrimaryKey(String id);
 }
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@ -196,13 +196,25 @@
        </if>

    </sql>
+
+    <select id="selectApiCaseInfoByPrimaryKey" resultType="io.metersphere.api.dto.definition.ApiTestCaseInfo">
+        SELECT
+            t1.*,
+            a.method AS apiMethod
+        FROM
+            api_test_case t1
+            inner join api_definition a on  t1.api_definition_id = a.id
+        WHERE t1.id = #{0}
+    </select>
+
    <select id="list" resultType="io.metersphere.api.dto.definition.ApiTestCaseResult">
        SELECT
        t1.*,
        t2.STATUS AS execResult,
        t2.create_time AS execTime,
        u2.NAME AS createUser,
-        u1.NAME AS updateUser
+        u1.NAME AS updateUser,
+        a.method AS apiMethod
        FROM
        api_test_case t1
        LEFT JOIN api_definition_exec_result t2 ON t1.last_result_id = t2.id
@ -361,15 +373,16 @@
        AND testCase.create_time BETWEEN #{firstDayTimestamp} AND #{lastDayTimestamp}
    </select>

-    <select id="getRequest" resultType="io.metersphere.base.domain.ApiTestCaseWithBLOBs">
-        select id, request
-        from api_test_case
+    <select id="getRequest" resultType="io.metersphere.api.dto.definition.ApiTestCaseInfo">
+        select t1.id, t1.request,a.method AS apiMethod
+        from api_test_case t1
+        inner join api_definition a on  t1.api_definition_id = a.id
        where 1
        <if test="request.id != null and request.id!=''">
-            and id = #{request.id}
+            and t1.id = #{request.id}
        </if>
        <if test="request.ids != null and request.ids.size() > 0">
-            and id in
+            and t1.id in
            <foreach collection="request.ids" item="caseId" separator="," open="(" close=")">
                #{caseId}
            </foreach>
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@ -148,5 +148,6 @@
        <if test="request.name!=null">
            AND file_metadata.name LIKE CONCAT('%', #{request.name}, '%')
        </if>
+        order by update_time DESC
    </select>
 </mapper>
--- a/frontend/package.json
+++ b/frontend/package.json
@ -22,14 +22,22 @@
    "el-table-infinite-scroll": "^1.0.10",
    "el-tree-transfer": "^2.4.7",
    "element-ui": "^2.13.0",
-    "generate-schema": "^2.6.0",
    "html2canvas": "^1.0.0-rc.7",
    "js-base64": "^3.4.4",
+    "jsencrypt": "^3.1.0",
    "json-bigint": "^1.0.0",
    "json-schema-faker": "^0.5.0-rcv.32",
    "json5": "^2.1.3",
    "jsoneditor": "^9.1.2",
+    "jsonpath": "^1.1.0",
    "jspdf": "^2.1.1",
+    "lodash.isboolean": "^3.0.3",
+    "lodash.isempty": "^4.4.0",
+    "lodash.isinteger": "^4.0.4",
+    "lodash.isnull": "^3.0.0",
+    "lodash.isnumber": "^3.0.3",
+    "lodash.isobject": "^3.0.2",
+    "lodash.isstring": "^4.0.1",
    "md5": "^2.3.0",
    "mockjs": "^1.1.0",
    "nprogress": "^0.2.0",
@ -41,16 +49,14 @@
    "vue-float-action-button": "^0.6.6",
    "vue-i18n": "^8.15.3",
    "vue-jsonpath-picker": "^1.1.5",
+    "vue-minder-editor-plus": "^1.0.19",
    "vue-papa-parse": "^2.0.0",
    "vue-pdf": "^4.2.0",
    "vue-router": "^3.1.3",
    "vuedraggable": "^2.24.3",
    "vuex": "^3.1.2",
    "xml-js": "^1.6.11",
-    "yan-progress": "^1.0.3",
-    "jsonpath": "^1.1.0",
-    "vue-minder-editor-plus": "^1.0.19",
-    "jsencrypt": "^3.1.0"
+    "yan-progress": "^1.0.3"
  },
  "devDependencies": {
    "@vue/cli-plugin-babel": "^4.1.0",
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@ -31,7 +31,7 @@
          <el-switch v-model="data.enable" class="enable-switch" size="mini" :disabled="data.disabled"/>
        </el-tooltip>
        <slot name="button"></slot>
-        <step-extend-btns style="display: contents" :data="data" @copy="copyRow" @remove="remove" @openScenario="openScenario" v-if="showBtn && !data.disabled"/>
+        <step-extend-btns style="display: contents" :data="data" @copy="copyRow" @remove="remove" @openScenario="openScenario" v-if="showBtn && (!data.disabled || data.root)"/>
      </div>

    </div>
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@ -83,9 +83,10 @@
  import ApiBaseComponent from "../common/ApiBaseComponent";
  import ApiResponseComponent from "./ApiResponseComponent";
  import CustomizeReqInfo from "@/business/components/api/automation/scenario/common/CustomizeReqInfo";
+
  const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
-  const esbDefinition = (requireComponent!=null&&requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinition.vue") : {};
-  const esbDefinitionResponse = (requireComponent!=null&&requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinitionResponse.vue") : {};
+  const esbDefinition = (requireComponent != null && requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinition.vue") : {};
+  const esbDefinitionResponse = (requireComponent != null && requireComponent.keys().length) > 0 ? requireComponent("./apidefinition/EsbDefinitionResponse.vue") : {};

  export default {
    name: "MsApiComponent",
@ -122,7 +123,7 @@
        reportId: "",
        runData: [],
        isShowInput: false,
-        showXpackCompnent:false,
+        showXpackCompnent: false,
      }
    },
    created() {
@ -148,7 +149,7 @@
          }
        }
      }
-      if (requireComponent != null && JSON.stringify(esbDefinition) != '{}'&& JSON.stringify(esbDefinitionResponse) != '{}') {
+      if (requireComponent != null && JSON.stringify(esbDefinition) != '{}' && JSON.stringify(esbDefinitionResponse) != '{}') {
        this.showXpackCompnent = true;
      }
    },
@ -245,7 +246,8 @@
              }
              this.request.requestResult = requestResult;
              this.request.id = response.data.id;
-              //this.request.disabled = true;
+              this.request.disabled = true;
+              this.request.root = true;
              if (!this.request.projectId) {
                this.request.projectId = response.data.projectId;
              }
@ -311,7 +313,7 @@
        this.request.requestResult = data;
        this.request.result = undefined;
        this.loading = false;
-        this.$emit('refReload',this.request,this.node);
+        this.$emit('refReload', this.request, this.node);
      },
      reload() {
        this.loading = true
--- a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
+++ b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
@ -7,9 +7,9 @@

        <el-tabs v-model="activeName">
          <el-tab-pane :label="$t('api_test.scenario.variables')" name="variable">
-            <div style="margin-top: 10px">
+            <div>
              <el-row style="margin-bottom: 10px">
-                <el-col :span="8">
+                <div style="float: left">
                  <el-input placeholder="变量名称搜索" v-model="selectVariable" size="small" @change="filter"
                            @keyup.enter="filter">
                    <el-select v-model="searchType" slot="prepend" placeholder="类型" style="width: 90px" @change="filter">
@ -20,9 +20,9 @@
                      <el-option value="RANDOM" label="随机数"></el-option>
                    </el-select>
                  </el-input>
-                </el-col>
+                </div>

-                <el-col :span="6">
+                <div style="float: right">
                  <el-dropdown split-button type="primary" @command="handleClick" @click="handleClick('CONSTANT')"
                               size="small" style="margin-left: 10px">
                    {{ $t('commons.add') }}
@ -37,7 +37,7 @@
                  <el-button size="small" style="margin-left: 10px" @click="deleteVariable">{{ $t('commons.delete') }}
                  </el-button>

-                </el-col>
+                </div>
              </el-row>
              <el-row>
                <el-col :span="12">
@ -219,10 +219,10 @@
        return this.selection.includes(row.id)
      },
      open: function (variables, headers, disabled) {
-        if(variables){
+        if (variables) {
          this.variables = variables;
        }
-        if(headers){
+        if (headers) {
          this.headers = headers;
        }
        this.visible = true;
@ -313,6 +313,7 @@
    float: right;
    margin-right: 45px;
  }
+
  fieldset {
    padding: 0px;
    margin: 0px;
--- a/frontend/src/business/components/common/json-schema/JsonSchemaEditor.vue
+++ b/frontend/src/business/components/common/json-schema/JsonSchemaEditor.vue
@ -21,8 +21,8 @@
 <script>
  import {schemaToJson} from './common';
  import MsImportJson from './import/ImportJson';
-
-  const GenerateSchema = require('generate-schema/src/schemas/json.js');
+  const Convert = require('./convert/convert.js');
+  const MsConvert = new Convert();

  export default {
    name: 'App',
@ -32,7 +32,7 @@
    },
    created() {
      if (!this.body.jsonSchema && this.body.raw && this.checkIsJson(this.body.raw)) {
-        let obj = {"root": GenerateSchema(JSON.parse(this.body.raw))}
+        let obj = {"root": MsConvert.format(JSON.parse(this.body.raw))}
        this.schema = obj;
      }
      else if (this.body.jsonSchema) {
--- a/frontend/src/business/components/common/json-schema/convert/convert.js
+++ b/frontend/src/business/components/common/json-schema/convert/convert.js
@ -0,0 +1,178 @@
+const isBoolean = require("lodash.isboolean")
+const isEmpty = require("lodash.isempty")
+const isInteger = require("lodash.isinteger")
+const isNull = require("lodash.isnull")
+const isNumber = require("lodash.isnumber")
+const isObject = require("lodash.isobject")
+const isString = require("lodash.isstring")
+const isArray = Array.isArray
+
+
+class Convert {
+  constructor() {
+    this._option = {
+      $id: "http://example.com/root.json",
+      $schema: "http://json-schema.org/draft-07/schema#",
+    }
+    this._object = null
+  }
+
+  /**
+   * 转换函数
+   * @param {*} object 需要转换的对象
+   * @param {*} ?option 可选参数，目前只有能设置 root 节点的 $id 和 $schema
+   */
+  format(object, option = {}) {
+    // 数据校验，确保传入的的object只能是对象或数组
+    if (!isObject(object)) {
+      throw new TypeError("传入参数只能是对象或数组")
+    }
+    // 合并属性
+    this._option = Object.assign(this._option, option)
+    // 需要转换的对象
+    this._object = object
+    let convertRes
+    // 数组类型和对象类型结构不一样
+    if (isArray(object)) {
+      convertRes = this._arrayToSchema()
+    } else {
+      convertRes = this._objectToSchema()
+    }
+    // 释放
+    this._object = null
+    return convertRes
+  }
+
+  /**
+   * 数组类型转换成JSONSCHEMA
+   */
+  _arrayToSchema() {
+    // root节点基本信息
+    let result = this._value2object(this._object, this._option.$id, "", true)
+    if (this._object.length > 0) {
+      // 创建items对象的基本信息
+      let objectItem = this._object[0]
+      result["items"] = this._value2object(objectItem, `#/items`, 'items')
+      if (isObject(objectItem) && !isEmpty(objectItem)) {
+        // 递归遍历
+        let objectItemSchema = this._json2schema(objectItem, `#/items`)
+        // 合并对象
+        result["items"] = Object.assign(result["items"], objectItemSchema)
+      }
+    }
+    return result
+  }
+
+  /**
+   * 对象类型转换成JSONSCHEMA
+   */
+  _objectToSchema() {
+    let baseResult = this._value2object(this._object, this._option.$id, "", true)
+    let objectSchema = this._json2schema(this._object)
+    baseResult = Object.assign(baseResult, objectSchema)
+    return baseResult
+  }
+
+  /**
+   * 递归函数，转换object对象为json schmea 格式
+   * @param {*} object 需要转换对象
+   * @param {*} name $id值
+   */
+  _json2schema(object, name = "") {
+    // 如果递归值不是对象，那么return掉
+    if (!isObject(object)) {
+      return;
+    }
+    // 处理当前路径$id
+    if (name === "" || name == undefined) {
+      name = "#"
+    }
+    let result = {};
+    // 判断传入object是对象还是数组。
+    if (isArray(object)) {
+      result.items = {}
+    } else {
+      result.properties = {}
+    }
+    // 遍历传入的对象
+    for (const key in object) {
+      if (object.hasOwnProperty(key)) {
+        const element = object[key];
+        // 如果只是undefined。跳过
+        if (element === undefined) {
+          continue
+        }
+        let $id = `${name}/properties/${key}`
+        // 判断当前 element 的值 是否也是对象，如果是就继续递归，不是就赋值给result
+        if (isObject(element)) {
+          // 创建当前属性的基本信息
+          result["properties"][key] = this._value2object(element, $id, key)
+          if (isArray(element)) {
+            // 针对空数组和有值的数组做不同处理
+            if (element.length > 0) {
+              // 如果是数组，那么就取第一项
+              let elementItem = element[0]
+              // 创建items对象的基本信息
+              result["properties"][key]["items"] = this._value2object(elementItem, `${$id}/items`, key + 'items')
+              // 判断第一项是否是对象,且对象属性不为空
+              if (isObject(elementItem) && !isEmpty(elementItem)) {
+                // 新增的properties才合并进来
+                result["properties"][key]["items"] = Object.assign(result["properties"][key]["items"], this._json2schema(elementItem, `${$id}/items`))
+              }
+            }
+          } else {
+            // 不是数组，递归遍历获取，然后合并对象属性
+            result["properties"][key] = Object.assign(result["properties"][key], this._json2schema(element, $id))
+          }
+        } else {
+          // 一般属性直接获取基本信息
+          result["properties"][key] = this._value2object(element, $id, key)
+        }
+      }
+    }
+    return result;
+  }
+
+  /**
+   * 把json的值转换成对象类型
+   * @param {*} value
+   * @param {*} $id
+   * @param {*} key
+   */
+  _value2object(value, $id, key = '', root = false) {
+    let objectTemplate = {
+      $id: $id,
+      title: `The ${key} Schema`,
+      mock: {
+        "mock": value
+      },
+    }
+
+    // 判断是否为初始化root数据
+    if (root) {
+      objectTemplate["$schema"] = this._option.$schema
+      objectTemplate["title"] = `The Root Schema`
+      objectTemplate["mock"] = undefined
+    }
+
+    if (isInteger(value)) {
+      objectTemplate.type = "integer"
+    } else if (isNumber(value)) {
+      objectTemplate.type = "number"
+    } else if (isString(value)) {
+      objectTemplate.type = "string"
+    } else if (isBoolean(value)) {
+      objectTemplate.type = "boolean"
+    } else if (isNull(value)) {
+      objectTemplate.type = "null"
+    } else if (isArray(value)) {
+      objectTemplate.type = "array"
+    } else if (isObject(value)) {
+      objectTemplate.type = "object"
+    }
+
+    return objectTemplate
+  }
+}
+
+module.exports = Convert
--- a/frontend/src/business/components/common/json-schema/import/ImportJson.vue
+++ b/frontend/src/business/components/common/json-schema/import/ImportJson.vue
@ -36,8 +36,8 @@
  import MsDialogFooter from '../../../common/components/MsDialogFooter'
  import MsCodeEdit from "../../../common/components/MsCodeEdit";
  import json5 from 'json5';
-
-  const GenerateSchema = require('generate-schema/src/schemas/json.js');
+  const Convert = require('../convert/convert.js');
+  const MsConvert = new Convert();

  export default {
    name: "MsImportJson",
@ -93,7 +93,8 @@
            this.$error("导入的数据非JSON格式");
            return;
          }
-          let jsonData = GenerateSchema(json5.parse(this.json));
+          let jsonData = MsConvert.format(json5.parse(this.json));
+          //let jsonData = GenerateSchema(json5.parse(this.json));
          this.$emit('jsonData', jsonData);
        } else {
          if (!this.checkIsJsonSchema(this.jsonSchema)) {
--- a/frontend/src/business/components/performance/test/components/ExistFiles.vue
+++ b/frontend/src/business/components/performance/test/components/ExistFiles.vue
@ -221,15 +221,6 @@ export default {
      f().then(res => {
        let response = res.data;
        if (response.data.length === 0) {
-          let type = file.name.substring(file.name.lastIndexOf(".") + 1);
-
-          this.tableData.push({
-            name: file.name,
-            size: (file.size / 1024).toFixed(2) + ' KB',
-            type: type.toUpperCase(),
-            updateTime: file.lastModified,
-          });
-
          callback();
        } else {
          this.$error(this.$t('load_test.project_file_exist') + ', name: ' + file.name);
@ -241,21 +232,21 @@ export default {

      let file = uploadResources.file;
      this.checkFileExist(file, () => {
-        self.uploadList.push(file);
-        let type = file.name.substring(file.name.lastIndexOf(".") + 1);
-        if (type.toLowerCase() !== 'jmx') {
-          return;
+        let formData = new FormData();
+        let url = '/project/upload/files/' + getCurrentProjectID()
+        formData.append("file", file);
+        let options = {
+          method: 'POST',
+          url: url,
+          data: formData,
+          headers: {
+            'Content-Type': undefined
+          }
        }
-        let jmxReader = new FileReader();
-        jmxReader.onload = (event) => {
-          let threadGroups = findThreadGroup(event.target.result, file.name);
-          threadGroups.forEach(tg => {
-            tg.options = {};
-            self.scenarios.push(tg);
-          });
-          self.$emit('fileChange', self.scenarios);
-        };
-        jmxReader.readAsText(file);
+        self.$request(options, (response) => {
+          self.$success(this.$t('commons.save_success'));
+          self.getProjectFiles();
+        });
      })
    },
    handleExceed() {
--- a/frontend/src/business/components/performance/test/components/ResourceFiles.vue
+++ b/frontend/src/business/components/performance/test/components/ResourceFiles.vue
@ -84,11 +84,13 @@ export default {
      fileList: [],
      uploadList: [],
      fileNumLimit: 10,
-      condition: {}
+      condition: {},
+      projectId: getCurrentProjectID(),
    }
  },
  methods: {
-    open() {
+    open(project) {
+      this.projectId = project.id;
      this.loadFileVisible = true;
      this.getProjectFiles();
    },
@ -97,7 +99,7 @@ export default {
      this.selectIds.clear();
    },
    getProjectFiles() {
-      this.projectLoadingResult = this.$post('/performance/project/all/' + getCurrentProjectID() + "/" + this.currentPage + "/" + this.pageSize, this.condition, res => {
+      this.projectLoadingResult = this.$post('/performance/project/all/' + this.projectId + "/" + this.currentPage + "/" + this.pageSize, this.condition, res => {
        let data = res.data;
        this.total = data.itemCount;
        this.existFiles = data.listObject;
@ -118,7 +120,7 @@ export default {
    handleUpload(uploadResources) {
      let file = uploadResources.file;
      let formData = new FormData();
-      let url = '/project/upload/files/' + getCurrentProjectID()
+      let url = '/project/upload/files/' + this.projectId
      formData.append("file", file);
      let options = {
        method: 'POST',
--- a/frontend/src/business/components/settings/project/MsProject.vue
+++ b/frontend/src/business/components/settings/project/MsProject.vue
@ -7,8 +7,6 @@
          <template v-slot:button>
            <ms-table-button :is-tester-permission="true" icon="el-icon-box"
                             :content="$t('api_test.jar_config.title')" @click="openJarConfig"/>
-            <ms-table-button :is-tester-permission="true" icon="el-icon-files"
-                             :content="$t('load_test.other_resource')" @click="openFiles"/>
          </template>
        </ms-table-header>
      </template>
@ -45,6 +43,8 @@
              <template v-slot:behind>
                <ms-table-operator-button :is-tester-permission="true" :tip="$t('api_test.environment.environment_config')" icon="el-icon-setting"
                                          type="info" @exec="openEnvironmentConfig(scope.row)"/>
+                <ms-table-operator-button :is-tester-permission="true" :tip="$t('load_test.other_resource')" icon="el-icon-files"
+                                          type="success" @exec="openFiles(scope.row)"/>
              </template>
            </ms-table-operator>
          </template>
@ -228,8 +228,8 @@ export default {
    openJarConfig() {
      this.$refs.jarConfig.open();
    },
-    openFiles() {
-      this.$refs.resourceFiles.open();
+    openFiles(project) {
+      this.$refs.resourceFiles.open(project);
    },
    handleDelete(project) {
      this.$refs.deleteConfirm.open(project);