From 90e857b10540251319efb162df2cb4d24612be10 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 10 Oct 2020 19:52:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20ho?=
 =?UTF-8?q?sts=20=E5=88=97=E8=A1=A8=E6=89=A7=E8=A1=8C=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/test/ApiTestConfig.vue     | 626 +++++++++---------
 .../api/test/model/ScenarioModel.js           |  21 +-
 2 files changed, 321 insertions(+), 326 deletions(-)

diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index e76812463e..9c19a6666e 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -70,348 +70,348 @@
 </template>
 
 <script>
-import MsApiScenarioConfig from "./components/ApiScenarioConfig";
-import {Scenario, Test} from "./model/ScenarioModel"
-import MsApiReportStatus from "../report/ApiReportStatus";
-import MsApiReportDialog from "./ApiReportDialog";
-import {checkoutTestManagerOrTestUser, downloadFile, getUUID} from "@/common/js/utils";
-import MsScheduleConfig from "../../common/components/MsScheduleConfig";
-import ApiImport from "./components/import/ApiImport";
-import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
-import MsContainer from "@/business/components/common/components/MsContainer";
-import MsMainContainer from "@/business/components/common/components/MsMainContainer";
+  import MsApiScenarioConfig from "./components/ApiScenarioConfig";
+  import {Scenario, Test} from "./model/ScenarioModel"
+  import MsApiReportStatus from "../report/ApiReportStatus";
+  import MsApiReportDialog from "./ApiReportDialog";
+  import {checkoutTestManagerOrTestUser, downloadFile, getUUID} from "@/common/js/utils";
+  import MsScheduleConfig from "../../common/components/MsScheduleConfig";
+  import ApiImport from "./components/import/ApiImport";
+  import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
+  import MsContainer from "@/business/components/common/components/MsContainer";
+  import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 
-export default {
-  name: "MsApiTestConfig",
+  export default {
+    name: "MsApiTestConfig",
 
-  components: {
-    MsMainContainer,
-    MsContainer, ApiImport, MsScheduleConfig, MsApiReportDialog, MsApiReportStatus, MsApiScenarioConfig
-  },
-
-  props: ["id"],
-
-  data() {
-    return {
-      reportVisible: false,
-      create: false,
-      result: {},
-      projects: [],
-      change: false,
-      test: new Test(),
-      isReadOnly: false,
-      debugReportId: ''
-    }
-  },
-
-  watch: {
-    '$route': 'init',
-    test: {
-      handler: function () {
-        this.change = true;
-      },
-      deep: true
-    }
-  },
-
-  methods: {
-    init() {
-      let projectId;
-
-      this.isReadOnly = !checkoutTestManagerOrTestUser();
-
-      if (this.id) {
-        this.create = false;
-        this.getTest(this.id);
-      } else {
-        this.create = true;
-        this.test = new Test();
-        if (this.$refs.config) {
-          this.$refs.config.reset();
-        }
-        // 仅创建时获取选择的项目
-        projectId = this.$store.state.common.projectId;
-      }
-      this.result = this.$get("/project/listAll", response => {
-        this.projects = response.data;
-        // 等待项目列表加载完
-        if (projectId) this.test.projectId = projectId;
-      })
+    components: {
+      MsMainContainer,
+      MsContainer, ApiImport, MsScheduleConfig, MsApiReportDialog, MsApiReportStatus, MsApiScenarioConfig
     },
-    updateReference() {
-      let updateIds = [];
-      this.test.scenarioDefinition.forEach(scenario => {
-        if (scenario.isReference()) {
-          updateIds.push(scenario.id.split("#")[0]);
-        }
-      })
 
-      if (updateIds.length === 0) return;
-      // 更新引用场景
-      this.result = this.$post("/api/list/ids", {ids: updateIds}, response => {
-        let scenarioMap = {};
-        if (response.data) {
-          response.data.forEach(test => {
-            JSON.parse(test.scenarioDefinition).forEach(options => {
-              let referenceId = test.id + "#" + options.id;
-              scenarioMap[referenceId] = new Scenario(options);
-              scenarioMap[referenceId].id = referenceId;
-            })
-          })
-        }
+    props: ["id"],
 
-        let scenarios = [];
+    data() {
+      return {
+        reportVisible: false,
+        create: false,
+        result: {},
+        projects: [],
+        change: false,
+        test: new Test(),
+        isReadOnly: false,
+        debugReportId: ''
+      }
+    },
+
+    watch: {
+      '$route': 'init',
+      test: {
+        handler: function () {
+          this.change = true;
+        },
+        deep: true
+      }
+    },
+
+    methods: {
+      init() {
+        let projectId;
+
+        this.isReadOnly = !checkoutTestManagerOrTestUser();
+
+        if (this.id) {
+          this.create = false;
+          this.getTest(this.id);
+        } else {
+          this.create = true;
+          this.test = new Test();
+          if (this.$refs.config) {
+            this.$refs.config.reset();
+          }
+          // 仅创建时获取选择的项目
+          projectId = this.$store.state.common.projectId;
+        }
+        this.result = this.$get("/project/listAll", response => {
+          this.projects = response.data;
+          // 等待项目列表加载完
+          if (projectId) this.test.projectId = projectId;
+        })
+      },
+      updateReference() {
+        let updateIds = [];
         this.test.scenarioDefinition.forEach(scenario => {
           if (scenario.isReference()) {
-            if (scenarioMap[scenario.id]) scenarios.push(scenarioMap[scenario.id]);
-          } else {
-            scenarios.push(scenario);
+            updateIds.push(scenario.id.split("#")[0]);
           }
         })
-        this.test.scenarioDefinition = scenarios;
-      })
-    },
-    getTest(id) {
-      this.result = this.$get("/api/get/" + id, response => {
-        if (response.data) {
-          let item = response.data;
 
-          this.test = new Test({
-            id: item.id,
-            projectId: item.projectId,
-            name: item.name,
-            status: item.status,
-            scenarioDefinition: JSON.parse(item.scenarioDefinition),
-            schedule: item.schedule ? item.schedule : {},
-          });
-          this.updateReference();
+        if (updateIds.length === 0) return;
+        // 更新引用场景
+        this.result = this.$post("/api/list/ids", {ids: updateIds}, response => {
+          let scenarioMap = {};
+          if (response.data) {
+            response.data.forEach(test => {
+              JSON.parse(test.scenarioDefinition).forEach(options => {
+                let referenceId = test.id + "#" + options.id;
+                scenarioMap[referenceId] = new Scenario(options);
+                scenarioMap[referenceId].id = referenceId;
+              })
+            })
+          }
 
-          this.$refs.config.reset();
-        }
-      });
-    },
-    save(callback) {
-      let validator = this.test.isValid();
-      if (!validator.isValid) {
-        this.$warning(this.$t(validator.info));
-        return;
-      }
-      this.change = false;
-      let bodyFiles = this.getBodyUploadFiles();
-      let url = this.create ? "/api/create" : "/api/update";
-      let jmx = this.test.toJMX();
-      let blob = new Blob([jmx.xml], {type: "application/octet-stream"});
-      let file = new File([blob], jmx.name);
-      this.result = this.$fileUpload(url, file, bodyFiles, this.test, () => {
-        if (callback) callback();
-        this.create = false;
-        this.resetBodyFile();
-      });
-    },
-    saveTest() {
-      this.save(() => {
-        this.$success(this.$t('commons.save_success'));
-        if (this.create) {
-          this.$router.push({
-            path: '/api/test/edit?id=' + this.test.id
+          let scenarios = [];
+          this.test.scenarioDefinition.forEach(scenario => {
+            if (scenario.isReference()) {
+              if (scenarioMap[scenario.id]) scenarios.push(scenarioMap[scenario.id]);
+            } else {
+              scenarios.push(scenario);
+            }
           })
-        }
-        // 发送广播，刷新 head 上的最新列表
-        ApiEvent.$emit(LIST_CHANGE);
-      })
-    },
-    runTest() {
-      this.result = this.$post("/api/run", {id: this.test.id, triggerMode: 'MANUAL'}, (response) => {
-        this.$success(this.$t('api_test.running'));
-        this.$router.push({
-          path: '/api/report/view/' + response.data
+          this.test.scenarioDefinition = scenarios;
         })
-      });
-    },
-    saveRunTest() {
-      this.change = false;
-      if (!this.validateEnableTest()) {
-        this.$warning(this.$t('api_test.enable_validate_tip'));
-        return;
-      }
-      this.save(() => {
-        this.$success(this.$t('commons.save_success'));
-        this.runTest();
-        // 发送广播，刷新 head 上的最新列表
-        ApiEvent.$emit(LIST_CHANGE);
-      })
-    },
-    getBodyUploadFiles() {
-      let bodyUploadFiles = [];
-      this.test.bodyUploadIds = [];
-      this.test.scenarioDefinition.forEach(scenario => {
-        scenario.requests.forEach(request => {
-          if (request.body) {
-            request.body.kvs.forEach(param => {
-              if (param.files) {
-                param.files.forEach(item => {
-                  if (item.file) {
-                    let fileId = getUUID().substring(0, 8);
-                    item.name = item.file.name;
-                    item.id = fileId;
-                    this.test.bodyUploadIds.push(fileId);
-                    bodyUploadFiles.push(item.file);
-                  }
-                });
-              }
+      },
+      getTest(id) {
+        this.result = this.$get("/api/get/" + id, response => {
+          if (response.data) {
+            let item = response.data;
+
+            this.test = new Test({
+              id: item.id,
+              projectId: item.projectId,
+              name: item.name,
+              status: item.status,
+              scenarioDefinition: JSON.parse(item.scenarioDefinition),
+              schedule: item.schedule ? item.schedule : {},
             });
+            this.updateReference();
+
+            this.$refs.config.reset();
           }
         });
-      });
-      return bodyUploadFiles;
-    },
-    validateEnableTest() {
-      for (let scenario of this.test.scenarioDefinition) {
-        if (scenario.enable) {
-          for (let request of scenario.requests) {
-            if (request.enable) {
-              return true;
+      },
+      save(callback) {
+        let validator = this.test.isValid();
+        if (!validator.isValid) {
+          this.$warning(this.$t(validator.info));
+          return;
+        }
+        this.change = false;
+        let bodyFiles = this.getBodyUploadFiles();
+        let url = this.create ? "/api/create" : "/api/update";
+        let jmx = this.test.toJMX();
+        let blob = new Blob([jmx.xml], {type: "application/octet-stream"});
+        let file = new File([blob], jmx.name);
+        this.result = this.$fileUpload(url, file, bodyFiles, this.test, () => {
+          if (callback) callback();
+          this.create = false;
+          this.resetBodyFile();
+        });
+      },
+      saveTest() {
+        this.save(() => {
+          this.$success(this.$t('commons.save_success'));
+          if (this.create) {
+            this.$router.push({
+              path: '/api/test/edit?id=' + this.test.id
+            })
+          }
+          // 发送广播，刷新 head 上的最新列表
+          ApiEvent.$emit(LIST_CHANGE);
+        })
+      },
+      runTest() {
+        this.result = this.$post("/api/run", {id: this.test.id, triggerMode: 'MANUAL'}, (response) => {
+          this.$success(this.$t('api_test.running'));
+          this.$router.push({
+            path: '/api/report/view/' + response.data
+          })
+        });
+      },
+      saveRunTest() {
+        this.change = false;
+        if (!this.validateEnableTest()) {
+          this.$warning(this.$t('api_test.enable_validate_tip'));
+          return;
+        }
+        this.save(() => {
+          this.$success(this.$t('commons.save_success'));
+          this.runTest();
+          // 发送广播，刷新 head 上的最新列表
+          ApiEvent.$emit(LIST_CHANGE);
+        })
+      },
+      getBodyUploadFiles() {
+        let bodyUploadFiles = [];
+        this.test.bodyUploadIds = [];
+        this.test.scenarioDefinition.forEach(scenario => {
+          scenario.requests.forEach(request => {
+            if (request.body) {
+              request.body.kvs.forEach(param => {
+                if (param.files) {
+                  param.files.forEach(item => {
+                    if (item.file) {
+                      let fileId = getUUID().substring(0, 8);
+                      item.name = item.file.name;
+                      item.id = fileId;
+                      this.test.bodyUploadIds.push(fileId);
+                      bodyUploadFiles.push(item.file);
+                    }
+                  });
+                }
+              });
+            }
+          });
+        });
+        return bodyUploadFiles;
+      },
+      validateEnableTest() {
+        for (let scenario of this.test.scenarioDefinition) {
+          if (scenario.enable) {
+            for (let request of scenario.requests) {
+              if (request.enable) {
+                return true;
+              }
             }
           }
         }
-      }
-      return false;
-    },
-    resetBodyFile() {
-      //下次保存不再上传已传文件
-      this.test.scenarioDefinition.forEach(scenario => {
-        scenario.requests.forEach(request => {
-          if (request.body) {
-            request.body.kvs.forEach(param => {
-              if (param.files) {
-                param.files.forEach(item => {
-                  if (item.file) {
-                    item.file = undefined;
-                  }
-                });
-              }
-            });
-          }
+        return false;
+      },
+      resetBodyFile() {
+        //下次保存不再上传已传文件
+        this.test.scenarioDefinition.forEach(scenario => {
+          scenario.requests.forEach(request => {
+            if (request.body) {
+              request.body.kvs.forEach(param => {
+                if (param.files) {
+                  param.files.forEach(item => {
+                    if (item.file) {
+                      item.file = undefined;
+                    }
+                  });
+                }
+              });
+            }
+          });
         });
-      });
-    },
-    cancel() {
-      this.$router.push('/api/test/list/all');
-    },
-    handleCommand(command) {
-      switch (command) {
-        case "report":
-          this.$refs.reportDialog.open();
-          break;
-        case "performance":
-          this.$store.commit('setTest', {
-            projectId: this.test.projectId,
-            name: this.test.name,
-            jmx: this.test.toJMX()
-          })
-          this.$router.push({
-            path: "/performance/test/create"
-          })
-          break;
-        case "export":
-          downloadFile(this.test.name + ".json", this.test.export());
-          break;
-        case "import":
-          this.$refs.apiImport.open();
-          break;
-      }
-    },
-    saveCronExpression(cronExpression) {
-      this.test.schedule.enable = true;
-      this.test.schedule.value = cronExpression;
-      this.saveSchedule();
-    },
-    saveSchedule() {
-      this.checkScheduleEdit();
-      let param = {};
-      param = this.test.schedule;
-      param.resourceId = this.test.id;
-      let url = '/api/schedule/create';
-      if (param.id) {
-        url = '/api/schedule/update';
-      }
-      this.$post(url, param, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.getTest(this.test.id);
-      });
-    },
-    checkScheduleEdit() {
-      if (this.create) {
-        this.$message(this.$t('api_test.environment.please_save_test'));
-        return false;
-      }
-      return true;
-    },
-    runDebug(scenario) {
-      if (this.create) {
-        this.$warning(this.$t('api_test.environment.please_save_test'));
-        return;
-      }
+      },
+      cancel() {
+        this.$router.push('/api/test/list/all');
+      },
+      handleCommand(command) {
+        switch (command) {
+          case "report":
+            this.$refs.reportDialog.open();
+            break;
+          case "performance":
+            this.$store.commit('setTest', {
+              projectId: this.test.projectId,
+              name: this.test.name,
+              jmx: this.test.toJMX()
+            })
+            this.$router.push({
+              path: "/performance/test/create"
+            })
+            break;
+          case "export":
+            downloadFile(this.test.name + ".json", this.test.export());
+            break;
+          case "import":
+            this.$refs.apiImport.open();
+            break;
+        }
+      },
+      saveCronExpression(cronExpression) {
+        this.test.schedule.enable = true;
+        this.test.schedule.value = cronExpression;
+        this.saveSchedule();
+      },
+      saveSchedule() {
+        this.checkScheduleEdit();
+        let param = {};
+        param = this.test.schedule;
+        param.resourceId = this.test.id;
+        let url = '/api/schedule/create';
+        if (param.id) {
+          url = '/api/schedule/update';
+        }
+        this.$post(url, param, () => {
+          this.$success(this.$t('commons.save_success'));
+          this.getTest(this.test.id);
+        });
+      },
+      checkScheduleEdit() {
+        if (this.create) {
+          this.$message(this.$t('api_test.environment.please_save_test'));
+          return false;
+        }
+        return true;
+      },
+      runDebug(scenario) {
+        if (this.create) {
+          this.$warning(this.$t('api_test.environment.please_save_test'));
+          return;
+        }
 
-      let url = "/api/run/debug";
-      let runningTest = new Test();
-      Object.assign(runningTest, this.test);
-      let bodyFiles = this.getBodyUploadFiles();
-      runningTest.scenarioDefinition = [];
-      runningTest.scenarioDefinition.push(scenario);
-      let validator = runningTest.isValid();
-      if (!validator.isValid) {
-        this.$warning(this.$t(validator.info));
-        return;
-      }
+        let url = "/api/run/debug";
+        let runningTest = new Test();
+        Object.assign(runningTest, this.test);
+        let bodyFiles = this.getBodyUploadFiles();
+        runningTest.scenarioDefinition = [];
+        runningTest.scenarioDefinition.push(scenario);
+        let validator = runningTest.isValid();
+        if (!validator.isValid) {
+          this.$warning(this.$t(validator.info));
+          return;
+        }
 
-      let jmx = runningTest.toJMX();
-      let blob = new Blob([jmx.xml], {type: "application/octet-stream"});
-      let file = new File([blob], jmx.name);
-      this.$fileUpload(url, file, bodyFiles, this.test, response => {
-        this.debugReportId = response.data;
-        this.resetBodyFile();
-      });
+        let jmx = runningTest.toJMX();
+        let blob = new Blob([jmx.xml], {type: "application/octet-stream"});
+        let file = new File([blob], jmx.name);
+        this.$fileUpload(url, file, bodyFiles, this.test, response => {
+          this.debugReportId = response.data;
+          this.resetBodyFile();
+        });
+      },
+      handleEvent(event) {
+        if (event.keyCode === 83 && event.ctrlKey) {
+          console.log('拦截到 ctrl + s');//ctrl+s
+          this.saveTest();
+          event.preventDefault();
+          event.returnValue = false;
+          return false;
+        }
+      },
     },
-    handleEvent(event) {
-      if (event.keyCode === 83 && event.ctrlKey) {
-        console.log('拦截到 ctrl + s');//ctrl+s
-        this.saveTest();
-        event.preventDefault();
-        event.returnValue = false;
-        return false;
-      }
-    },
-  },
 
-  created() {
-    this.init();
-    //
-    document.addEventListener('keydown', this.handleEvent)
-  },
-  beforeDestroy() {
-    document.removeEventListener('keydown', this.handleEvent);
+    created() {
+      this.init();
+      //
+      document.addEventListener('keydown', this.handleEvent)
+    },
+    beforeDestroy() {
+      document.removeEventListener('keydown', this.handleEvent);
+    }
   }
-}
 </script>
 
 <style scoped>
-.test-container {
-  height: calc(100vh - 155px);
-  min-height: 600px;
-}
+  .test-container {
+    height: calc(100vh - 155px);
+    min-height: 600px;
+  }
 
-.test-name {
-  width: 600px;
-  margin-left: -20px;
-  margin-right: 20px;
-}
+  .test-name {
+    width: 600px;
+    margin-left: -20px;
+    margin-right: 20px;
+  }
 
-.test-project {
-  min-width: 150px;
-}
+  .test-project {
+    min-width: 150px;
+  }
 
-.test-container .more {
-  margin-left: 10px;
-}
+  .test-container .more {
+    margin-left: 10px;
+  }
 </style>
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index d024dbdca5..7e6c44c8d6 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -1043,11 +1043,8 @@ class JMXGenerator {
         this.addScenarioHeaders(threadGroup, scenario);
 
         this.addScenarioCookieManager(threadGroup, scenario);
-        // 放在计划或线程组中，不建议放具体某个请求中
-        this.addDNSCacheManager(threadGroup, scenario);
 
         this.addJDBCDataSources(threadGroup, scenario);
-
         scenario.requests.forEach(request => {
           if (request.enable) {
             if (!request.isValid()) return;
@@ -1065,6 +1062,8 @@ class JMXGenerator {
               sampler = new JDBCSampler(request.name || "", request);
             }
 
+            this.addDNSCacheManager(sampler, scenario.environment, request.useEnvironment);
+
             this.addRequestExtractor(sampler, request);
 
             this.addRequestAssertion(sampler, request);
@@ -1126,18 +1125,14 @@ class JMXGenerator {
     }
   }
 
-  addDNSCacheManager(threadGroup, scenario) {
-    if (scenario.requests.length < 1) {
-      return
-    }
-    let request = scenario.requests[0];
-    if (request.environment) {
-      let commonConfig = request.environment.config.commonConfig;
+  addDNSCacheManager(httpSamplerProxy, environment, useEnv) {
+    if (environment && useEnv === true) {
+      let commonConfig = environment.config.commonConfig;
       let hosts = commonConfig.hosts;
       if (commonConfig.enableHost && hosts.length > 0) {
-        let name = request.name + " DNSCacheManager";
+        let name = " DNSCacheManager";
         // 强化判断，如果未匹配到合适的host则不开启DNSCache
-        let domain = request.environment.config.httpConfig.domain;
+        let domain = environment.config.httpConfig.domain;
         let validHosts = [];
         hosts.forEach(item => {
           if (item.domain != undefined && domain != undefined) {
@@ -1149,7 +1144,7 @@ class JMXGenerator {
           }
         });
         if (validHosts.length > 0) {
-          threadGroup.put(new DNSCacheManager(name, validHosts));
+          httpSamplerProxy.put(new DNSCacheManager(name, validHosts));
         }
       }
     }