From 33e0207d84131044ff126d0878bdf9fadb34f383 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Tue, 30 Mar 2021 11:44:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=8E=A8=E8=8D=90=E6=96=AD=E8=A8=80?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=8F=AF=E4=BB=A5=E7=82=B9=E5=87=BB=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD=E5=85=B3=E9=97=AD):=20=E6=8E=A8=E8=8D=90=E6=96=AD?=
 =?UTF-8?q?=E8=A8=80=E5=BC=B9=E6=A1=86=E5=8F=AF=E4=BB=A5=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assertion/ApiJsonPathSuggestButton.vue    |  2 +-
 .../assertion/ApiJsonpathSuggest.vue          | 30 ++++++++++++++++++-
 .../definition/components/list/ApiList.vue    | 16 ++++++----
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/assertion/ApiJsonPathSuggestButton.vue b/frontend/src/business/components/api/definition/components/assertion/ApiJsonPathSuggestButton.vue
index f708459ab3..5bb93b7bef 100644
--- a/frontend/src/business/components/api/definition/components/assertion/ApiJsonPathSuggestButton.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/ApiJsonPathSuggestButton.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row :gutter="10" class="json-path-suggest-button">
-    <el-button size="small" type="primary" @click="$emit('open')">
+    <el-button size="small" type="primary" @click="$emit('open')" @click.stop>
       {{openTip}}
     </el-button>
     <el-button size="small" type="danger" @click="$emit('clear')">
diff --git a/frontend/src/business/components/api/definition/components/assertion/ApiJsonpathSuggest.vue b/frontend/src/business/components/api/definition/components/assertion/ApiJsonpathSuggest.vue
index 05064cf710..cd25a48dac 100644
--- a/frontend/src/business/components/api/definition/components/assertion/ApiJsonpathSuggest.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/ApiJsonpathSuggest.vue
@@ -1,5 +1,5 @@
 <template>
-  <ms-drawer class="json-path-picker" :visible="visible" :size="30" @close="close" direction="right">
+  <ms-drawer class="json-path-picker" :visible="visible" :size="30" @close="close" direction="right" v-clickoutside="close">
     <template v-slot:header>
       <ms-instructions-icon :content="tip"/>
       {{tip}}
@@ -13,9 +13,37 @@ import MsDrawer from "../../../../common/components/MsDrawer";
 import MsInstructionsIcon from "../../../../common/components/MsInstructionsIcon";
 
 let dotReplace = "#DOT_MASK#";
+
+const clickoutside = {
+  // 初始化指令
+  bind (el, binding, vnode) {
+    function documentHandler (e) {
+      // 这里判断点击的元素是否是本身，是本身，则返回
+      if (el.contains(e.target)) {
+        return false
+      }
+      // 判断指令中是否绑定了函数
+      if (binding.expression) {
+        // 如果绑定了函数 则调用那个函数，此处binding.value就是handleClose方法
+        binding.value(e)
+      }
+    }
+    // 给当前元素绑定个私有变量，方便在unbind中可以解除事件监听
+    el.__vueClickOutside__ = documentHandler
+    document.addEventListener('click', documentHandler)
+  },
+  update () { },
+  unbind (el, binding) {
+    // 解除事件监听
+    document.removeEventListener('click', el.__vueClickOutside__)
+    delete el.__vueClickOutside__
+  }
+}
+
 export default {
   name: "MsApiJsonpathSuggest",
   components: {MsInstructionsIcon, MsDrawer},
+  directives: { clickoutside },
   data() {
     return {
       visible: false,
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index cd9169b499..ebd4f5c579 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -454,14 +454,18 @@
                 item.tags = JSON.parse(item.tags);
               }
             })
-            if (this.$refs.apiDefinitionTable) {
-              setTimeout(() => {
-                this.$refs.apiDefinitionTable.doLayout();
-                this.result.loading = false;
-              }, 500)
-            }
+            // if (this.$refs.apiDefinitionTable) {
+            //   setTimeout(() => {
+            //     this.$refs.apiDefinitionTable.doLayout();
+            //     this.result.loading = false;
+            //   }, 500)
+            // }
             // nexttick:表格加载完成之后触发。判断是否需要勾选行
             this.$nextTick(function(){
+              if (this.$refs.apiDefinitionTable) {
+                this.$refs.apiDefinitionTable.doLayout();
+                this.result.loading = false;
+              }
               this.checkTableRowIsSelect();
             })
           });

From 60136a3e029612a188eba8a1bd4dc0e43cb6c0aa Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Tue, 30 Mar 2021 16:33:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20ESB=E5=AF=BC=E5=85=A5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0xpack=E5=88=A4=E6=96=AD=EF=BC=8CESB=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8E=BB=E6=8E=89"=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB"=E5=88=97=EF=BC=8CESB=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8E=BB=E6=8E=89"=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB"=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ESB导入增加xpack判断，ESB导入模板去掉"是否必填"列，ESB请求参数去掉"是否必填"列
---
 .../controller/ApiDefinitionController.java   |   2 +-
 .../api/dto/definition/parse/ESBParser.java   | 411 +++++++++---------
 .../scenario/component/ApiComponent.vue       |   2 +-
 .../components/case/ApiCaseItem.vue           |   2 +-
 .../complete/EditCompleteTCPApi.vue           |   2 +-
 .../components/document/ApiDocumentAnchor.vue |  11 +-
 .../components/import/ApiImport.vue           |   7 +-
 7 files changed, 215 insertions(+), 222 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
index 31fed91906..508300ef5c 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
@@ -171,7 +171,7 @@ public class ApiDefinitionController {
     @PostMapping(value = "/import", consumes = {"multipart/form-data"})
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
     public ApiDefinitionImport testCaseImport(@RequestPart(value = "file", required = false) MultipartFile file, @RequestPart("request") ApiTestImportRequest request) {
-        return apiDefinitionService.apiTestImport(file, request);
+        return apiDefinitionService.apiTestImport(file, request);//95821329-9eaa-4d2a-aa24-e6f912994716"
     }
 
     @PostMapping(value = "/export/{type}")
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/ESBParser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/ESBParser.java
index 0c6c51fdd0..be67fbadb6 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/parse/ESBParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/parse/ESBParser.java
@@ -80,9 +80,9 @@ public class ESBParser extends EsbAbstractParser {
         font.setFontHeightInPoints((short) 9);
         Map<String, XSSFCellStyle> cellStyleMap = createCellStle(workbook);
         XSSFSheet headSheet = workbook.createSheet("公共报文头");
-        generateSheet(headSheet,true, font,cellStyleMap);
+        generateSheet(headSheet, font, cellStyleMap);
         XSSFSheet bodySheet = workbook.createSheet("接口报文信息");
-        generateSheet(bodySheet, false,font,cellStyleMap);
+        generateSheet(bodySheet, font, cellStyleMap);
         return workbook;
     }
 
@@ -99,24 +99,24 @@ public class ESBParser extends EsbAbstractParser {
             style.setBorderTop(BorderStyle.THIN);
 
             String name = "";
-            if(colorIndex == IndexedColors.LIGHT_GREEN.getIndex()){
+            if (colorIndex == IndexedColors.LIGHT_GREEN.getIndex()) {
                 style.setFillForegroundColor(new XSSFColor(new java.awt.Color(204, 255, 204)));
                 name = "green";
-            }else if(colorIndex == IndexedColors.ORCHID.getIndex()){
+            } else if (colorIndex == IndexedColors.ORCHID.getIndex()) {
                 style.setFillForegroundColor(new XSSFColor(new java.awt.Color(151, 50, 101)));
                 name = "pop";
-            }else if(colorIndex == IndexedColors.YELLOW.getIndex()){
+            } else if (colorIndex == IndexedColors.YELLOW.getIndex()) {
                 style.setFillForegroundColor(new XSSFColor(new java.awt.Color(255, 255, 153)));
                 name = "yellow";
-            }else{
+            } else {
                 name = "default";
             }
-            cellStype.put(name,style);
+            cellStype.put(name, style);
         }
         return cellStype;
     }
 
-    private static void generateSheet(XSSFSheet sheet,boolean isHead, XSSFFont font,Map<String, XSSFCellStyle> cellStyleMap) {
+    private static void generateSheet(XSSFSheet sheet, XSSFFont font, Map<String, XSSFCellStyle> cellStyleMap) {
         if (sheet == null) {
             return;
         }
@@ -125,22 +125,12 @@ public class ESBParser extends EsbAbstractParser {
         sheet.setColumnWidth(1, 4000);
         sheet.setColumnWidth(2, 4000);
         sheet.setColumnWidth(3, 4000);
-        if(isHead){
-            sheet.setColumnWidth(4, 880);
-            sheet.setColumnWidth(5, 4000);
-            sheet.setColumnWidth(6, 4000);
-            sheet.setColumnWidth(7, 4000);
-            sheet.setColumnWidth(8, 4000);
-            sheet.setColumnWidth(9, 4000);
-        }else {
-            sheet.setColumnWidth(4, 4000);
-            sheet.setColumnWidth(5, 880);
-            sheet.setColumnWidth(6, 4000);
-            sheet.setColumnWidth(7, 4000);
-            sheet.setColumnWidth(8, 4000);
-            sheet.setColumnWidth(9, 4000);
-            sheet.setColumnWidth(10, 4000);
-        }
+        sheet.setColumnWidth(4, 880);
+        sheet.setColumnWidth(5, 4000);
+        sheet.setColumnWidth(6, 4000);
+        sheet.setColumnWidth(7, 4000);
+        sheet.setColumnWidth(8, 4000);
+        sheet.setColumnWidth(9, 4000);
 
         /**
          * 模版生成:
@@ -156,210 +146,210 @@ public class ESBParser extends EsbAbstractParser {
          * row9: 3：请输入STRING(具体长度) 或 ARRAY;    8:同3
          */
         XSSFRow row1 = sheet.createRow(0);
-        setCellValue("交易码", row1.createCell(0), font,cellStyleMap.get("default"));
-        setCellValue("交易名称", row1.createCell(1), font,cellStyleMap.get("default"));
-        setCellValue("", row1.createCell(2), font,cellStyleMap.get("default"));
-        setCellValue("", row1.createCell(3), font,cellStyleMap.get("default"));
-        if(isHead){
-            setCellValue("", row1.createCell(4), font,cellStyleMap.get("default"));
-            setCellValue("服务名称", row1.createCell(5), font,cellStyleMap.get("default"));
-            setCellValue("服务场景", row1.createCell(6), font,cellStyleMap.get("default"));
-            setCellValue("", row1.createCell(7), font,cellStyleMap.get("default"));
-            setCellValue("", row1.createCell(8), font,cellStyleMap.get("default"));
-            setCellValue("", row1.createCell(9), font,cellStyleMap.get("default"));
+        setCellValue("交易码", row1.createCell(0), font, cellStyleMap.get("default"));
+        setCellValue("交易名称", row1.createCell(1), font, cellStyleMap.get("default"));
+        setCellValue("", row1.createCell(2), font, cellStyleMap.get("default"));
+        setCellValue("", row1.createCell(3), font, cellStyleMap.get("default"));
+//        if (isHead) {
+        setCellValue("", row1.createCell(4), font, cellStyleMap.get("default"));
+        setCellValue("服务名称", row1.createCell(5), font, cellStyleMap.get("default"));
+        setCellValue("服务场景", row1.createCell(6), font, cellStyleMap.get("default"));
+        setCellValue("", row1.createCell(7), font, cellStyleMap.get("default"));
+        setCellValue("", row1.createCell(8), font, cellStyleMap.get("default"));
+        setCellValue("", row1.createCell(9), font, cellStyleMap.get("default"));
 
-        }else{
-            setCellValue("", row1.createCell(4), font,cellStyleMap.get("default"));
-            setCellValue("", row1.createCell(5), font,cellStyleMap.get("pop"));
-            setCellValue("服务名称", row1.createCell(6), font,cellStyleMap.get("default"));
-            setCellValue("服务场景", row1.createCell(7), font,cellStyleMap.get("default"));
-            setCellValue("", row1.createCell(8), font,cellStyleMap.get("default"));
-            setCellValue("", row1.createCell(9), font,cellStyleMap.get("default"));
-            setCellValue("", row1.createCell(10), font,cellStyleMap.get("default"));
-        }
+//        } else {
+//            setCellValue("", row1.createCell(4), font, cellStyleMap.get("default"));
+//            setCellValue("", row1.createCell(5), font, cellStyleMap.get("pop"));
+//            setCellValue("服务名称", row1.createCell(6), font, cellStyleMap.get("default"));
+//            setCellValue("服务场景", row1.createCell(7), font, cellStyleMap.get("default"));
+//            setCellValue("", row1.createCell(8), font, cellStyleMap.get("default"));
+//            setCellValue("", row1.createCell(9), font, cellStyleMap.get("default"));
+//            setCellValue("", row1.createCell(10), font, cellStyleMap.get("default"));
+//        }
 
 
         XSSFRow row2 = sheet.createRow(1);
-        setCellValue("请输入交易码(必填)", row2.createCell(0), font,cellStyleMap.get("default"));
-        setCellValue("请输入交易名称(必填)", row2.createCell(1), font,cellStyleMap.get("default"));
-        setCellValue("", row2.createCell(2), font,cellStyleMap.get("default"));
-        setCellValue("", row2.createCell(3), font,cellStyleMap.get("default"));
-        if(isHead){
-            setCellValue("", row2.createCell(4), font,cellStyleMap.get("pop"));
-            setCellValue("请输入服务名称(如果不填，则以交易名称为主)", row2.createCell(5), font,null);
-            setCellValue("请输入服务场景(选填)", row2.createCell(6), font,cellStyleMap.get("default"));
-            setCellValue("", row2.createCell(7), font,cellStyleMap.get("default"));
-            setCellValue("", row2.createCell(8), font,cellStyleMap.get("default"));
-            setCellValue("", row2.createCell(9), font,cellStyleMap.get("default"));
-        }else{
-            setCellValue("", row2.createCell(4), font,cellStyleMap.get("default"));
-            setCellValue("", row2.createCell(5), font,cellStyleMap.get("pop"));
-            setCellValue("请输入服务名称(如果不填，则以交易名称为主)", row2.createCell(6), font,null);
-            setCellValue("请输入服务场景(选填)", row2.createCell(7), font,cellStyleMap.get("default"));
-            setCellValue("", row2.createCell(8), font,cellStyleMap.get("default"));
-            setCellValue("", row2.createCell(9), font,cellStyleMap.get("default"));
-            setCellValue("", row2.createCell(10), font,cellStyleMap.get("default"));
-        }
+        setCellValue("请输入交易码(必填)", row2.createCell(0), font, cellStyleMap.get("default"));
+        setCellValue("请输入交易名称(必填)", row2.createCell(1), font, cellStyleMap.get("default"));
+        setCellValue("", row2.createCell(2), font, cellStyleMap.get("default"));
+        setCellValue("", row2.createCell(3), font, cellStyleMap.get("default"));
+//        if (isHead) {
+        setCellValue("", row2.createCell(4), font, cellStyleMap.get("pop"));
+        setCellValue("请输入服务名称(如果不填，则以交易名称为主)", row2.createCell(5), font, null);
+        setCellValue("请输入服务场景(选填)", row2.createCell(6), font, cellStyleMap.get("default"));
+        setCellValue("", row2.createCell(7), font, cellStyleMap.get("default"));
+        setCellValue("", row2.createCell(8), font, cellStyleMap.get("default"));
+        setCellValue("", row2.createCell(9), font, cellStyleMap.get("default"));
+//        } else {
+//            setCellValue("", row2.createCell(4), font, cellStyleMap.get("default"));
+//            setCellValue("", row2.createCell(5), font, cellStyleMap.get("pop"));
+//            setCellValue("请输入服务名称(如果不填，则以交易名称为主)", row2.createCell(6), font, null);
+//            setCellValue("请输入服务场景(选填)", row2.createCell(7), font, cellStyleMap.get("default"));
+//            setCellValue("", row2.createCell(8), font, cellStyleMap.get("default"));
+//            setCellValue("", row2.createCell(9), font, cellStyleMap.get("default"));
+//            setCellValue("", row2.createCell(10), font, cellStyleMap.get("default"));
+//        }
 
         XSSFRow row3 = sheet.createRow(2);
-        setCellValue("", row3.createCell(0), font,cellStyleMap.get("yellow"));
-        setCellValue("", row3.createCell(1), font,cellStyleMap.get("yellow"));
-        setCellValue("", row3.createCell(2), font,cellStyleMap.get("yellow"));
-        setCellValue("", row3.createCell(3), font,cellStyleMap.get("yellow"));
-        if(isHead){
-            setCellValue("", row3.createCell(4), font,cellStyleMap.get("yellow"));
-            setCellValue("请输入系统名称", row3.createCell(5), font,cellStyleMap.get("yellow"));
-            setCellValue("", row3.createCell(6), font,cellStyleMap.get("yellow"));
-            setCellValue("", row3.createCell(7), font,cellStyleMap.get("yellow"));
-            setCellValue("", row3.createCell(8), font,cellStyleMap.get("yellow"));
-            setCellValue("", row3.createCell(9), font,cellStyleMap.get("yellow"));
-            CellRangeAddress region1 = new CellRangeAddress(2, 2, 0, 3);
-            sheet.addMergedRegion(region1);
-            CellRangeAddress region2 = new CellRangeAddress(2, 2, 5, 9);
-            sheet.addMergedRegion(region2);
-        }else{
-            setCellValue("", row3.createCell(4), font,cellStyleMap.get("yellow"));
-            setCellValue("", row3.createCell(5), font,cellStyleMap.get("yellow"));
-            setCellValue("请输入系统名称", row3.createCell(6), font,cellStyleMap.get("yellow"));
-            setCellValue("", row3.createCell(7), font,cellStyleMap.get("yellow"));
-            setCellValue("", row3.createCell(8), font,cellStyleMap.get("yellow"));
-            setCellValue("", row3.createCell(9), font,cellStyleMap.get("yellow"));
-            setCellValue("", row3.createCell(10), font,cellStyleMap.get("yellow"));
-            CellRangeAddress region1 = new CellRangeAddress(2, 2, 0, 4);
-            sheet.addMergedRegion(region1);
-            CellRangeAddress region2 = new CellRangeAddress(2, 2, 6, 10);
-            sheet.addMergedRegion(region2);
-        }
+        setCellValue("", row3.createCell(0), font, cellStyleMap.get("yellow"));
+        setCellValue("", row3.createCell(1), font, cellStyleMap.get("yellow"));
+        setCellValue("", row3.createCell(2), font, cellStyleMap.get("yellow"));
+        setCellValue("", row3.createCell(3), font, cellStyleMap.get("yellow"));
+//        if (isHead) {
+        setCellValue("", row3.createCell(4), font, cellStyleMap.get("yellow"));
+        setCellValue("请输入系统名称", row3.createCell(5), font, cellStyleMap.get("yellow"));
+        setCellValue("", row3.createCell(6), font, cellStyleMap.get("yellow"));
+        setCellValue("", row3.createCell(7), font, cellStyleMap.get("yellow"));
+        setCellValue("", row3.createCell(8), font, cellStyleMap.get("yellow"));
+        setCellValue("", row3.createCell(9), font, cellStyleMap.get("yellow"));
+        CellRangeAddress region1 = new CellRangeAddress(2, 2, 0, 3);
+        sheet.addMergedRegion(region1);
+        CellRangeAddress region2 = new CellRangeAddress(2, 2, 5, 9);
+        sheet.addMergedRegion(region2);
+//        } else {
+//            setCellValue("", row3.createCell(4), font, cellStyleMap.get("yellow"));
+//            setCellValue("", row3.createCell(5), font, cellStyleMap.get("yellow"));
+//            setCellValue("请输入系统名称", row3.createCell(6), font, cellStyleMap.get("yellow"));
+//            setCellValue("", row3.createCell(7), font, cellStyleMap.get("yellow"));
+//            setCellValue("", row3.createCell(8), font, cellStyleMap.get("yellow"));
+//            setCellValue("", row3.createCell(9), font, cellStyleMap.get("yellow"));
+//            setCellValue("", row3.createCell(10), font, cellStyleMap.get("yellow"));
+//            CellRangeAddress region1 = new CellRangeAddress(2, 2, 0, 4);
+//            sheet.addMergedRegion(region1);
+//            CellRangeAddress region2 = new CellRangeAddress(2, 2, 6, 10);
+//            sheet.addMergedRegion(region2);
+//        }
 
         XSSFRow row4 = sheet.createRow(3);
-        setCellValue("英文名称", row4.createCell(0), font,cellStyleMap.get("yellow"));
-        setCellValue("中文名称", row4.createCell(1), font,cellStyleMap.get("yellow"));
-        setCellValue("数据类型/长度", row4.createCell(2), font,cellStyleMap.get("yellow"));
-        if(isHead){
-            setCellValue("备注", row4.createCell(3), font,cellStyleMap.get("yellow"));
-            setCellValue("", row4.createCell(4), font,cellStyleMap.get("pop"));
-            setCellValue("英文名称", row4.createCell(5), font,cellStyleMap.get("yellow"));
-            setCellValue("数据类型/长度", row4.createCell(6), font,cellStyleMap.get("yellow"));
-            setCellValue("中文名称", row4.createCell(7), font,cellStyleMap.get("yellow"));
-            setCellValue("备注", row4.createCell(8), font,cellStyleMap.get("yellow"));
-            setCellValue("所在报文位置", row4.createCell(9), font,cellStyleMap.get("yellow"));
-        }else {
-            setCellValue("是否必输", row4.createCell(3), font,cellStyleMap.get("yellow"));
-            setCellValue("备注", row4.createCell(4), font,cellStyleMap.get("yellow"));
-            setCellValue("", row4.createCell(5), font,cellStyleMap.get("pop"));
-            setCellValue("英文名称", row4.createCell(6), font,cellStyleMap.get("yellow"));
-            setCellValue("数据类型/长度", row4.createCell(7), font,cellStyleMap.get("yellow"));
-            setCellValue("中文名称", row4.createCell(8), font,cellStyleMap.get("yellow"));
-            setCellValue("备注", row4.createCell(9), font,cellStyleMap.get("yellow"));
-            setCellValue("所在报文位置", row4.createCell(10), font,cellStyleMap.get("yellow"));
-        }
+        setCellValue("英文名称", row4.createCell(0), font, cellStyleMap.get("yellow"));
+        setCellValue("中文名称", row4.createCell(1), font, cellStyleMap.get("yellow"));
+        setCellValue("数据类型/长度", row4.createCell(2), font, cellStyleMap.get("yellow"));
+//        if (isHead) {
+        setCellValue("备注", row4.createCell(3), font, cellStyleMap.get("yellow"));
+        setCellValue("", row4.createCell(4), font, cellStyleMap.get("pop"));
+        setCellValue("英文名称", row4.createCell(5), font, cellStyleMap.get("yellow"));
+        setCellValue("数据类型/长度", row4.createCell(6), font, cellStyleMap.get("yellow"));
+        setCellValue("中文名称", row4.createCell(7), font, cellStyleMap.get("yellow"));
+        setCellValue("备注", row4.createCell(8), font, cellStyleMap.get("yellow"));
+        setCellValue("所在报文位置", row4.createCell(9), font, cellStyleMap.get("yellow"));
+//        } else {
+//            setCellValue("是否必输", row4.createCell(3), font, cellStyleMap.get("yellow"));
+//            setCellValue("备注", row4.createCell(4), font, cellStyleMap.get("yellow"));
+//            setCellValue("", row4.createCell(5), font, cellStyleMap.get("pop"));
+//            setCellValue("英文名称", row4.createCell(6), font, cellStyleMap.get("yellow"));
+//            setCellValue("数据类型/长度", row4.createCell(7), font, cellStyleMap.get("yellow"));
+//            setCellValue("中文名称", row4.createCell(8), font, cellStyleMap.get("yellow"));
+//            setCellValue("备注", row4.createCell(9), font, cellStyleMap.get("yellow"));
+//            setCellValue("所在报文位置", row4.createCell(10), font, cellStyleMap.get("yellow"));
+//        }
 
         XSSFRow row5 = sheet.createRow(4);
-        setCellValue("输入", row5.createCell(0), font,cellStyleMap.get("green"));
-        setCellValue("", row5.createCell(1), font,cellStyleMap.get("green"));
-        setCellValue("", row5.createCell(2), font,cellStyleMap.get("green"));
-        setCellValue("", row5.createCell(3), font,cellStyleMap.get("green"));
-        setCellValue("", row5.createCell(4), font,cellStyleMap.get("green"));
-        setCellValue("", row5.createCell(5), font,cellStyleMap.get("green"));
-        setCellValue("", row5.createCell(6), font,cellStyleMap.get("green"));
-        setCellValue("", row5.createCell(7), font,cellStyleMap.get("green"));
-        setCellValue("", row5.createCell(8), font,cellStyleMap.get("green"));
-        setCellValue("", row5.createCell(9), font,cellStyleMap.get("green"));
-        if(!isHead){
-            setCellValue("", row5.createCell(10), font,cellStyleMap.get("green"));
-        }
+        setCellValue("输入", row5.createCell(0), font, cellStyleMap.get("green"));
+        setCellValue("", row5.createCell(1), font, cellStyleMap.get("green"));
+        setCellValue("", row5.createCell(2), font, cellStyleMap.get("green"));
+        setCellValue("", row5.createCell(3), font, cellStyleMap.get("green"));
+        setCellValue("", row5.createCell(4), font, cellStyleMap.get("green"));
+        setCellValue("", row5.createCell(5), font, cellStyleMap.get("green"));
+        setCellValue("", row5.createCell(6), font, cellStyleMap.get("green"));
+        setCellValue("", row5.createCell(7), font, cellStyleMap.get("green"));
+        setCellValue("", row5.createCell(8), font, cellStyleMap.get("green"));
+        setCellValue("", row5.createCell(9), font, cellStyleMap.get("green"));
+//        if (!isHead) {
+//            setCellValue("", row5.createCell(10), font, cellStyleMap.get("green"));
+//        }
 
         XSSFRow row6 = sheet.createRow(5);
-        setCellValue("", row6.createCell(0), font,cellStyleMap.get("default"));
-        setCellValue("", row6.createCell(1), font,cellStyleMap.get("default"));
-        setCellValue("请输入STRING(具体长度) 或 ARRAY", row6.createCell(2), font,cellStyleMap.get("default"));
-        setCellValue("", row6.createCell(3), font,cellStyleMap.get("default"));
-        if(isHead){
-            setCellValue("", row6.createCell(4), font,cellStyleMap.get("pop"));
-            setCellValue("", row6.createCell(5), font,cellStyleMap.get("default"));
-            setCellValue("请输入STRING(具体长度) 或 ARRAY", row6.createCell(6), font,cellStyleMap.get("default"));
-            setCellValue("", row6.createCell(7), font,cellStyleMap.get("default"));
-            setCellValue("", row6.createCell(8), font,cellStyleMap.get("default"));
-            setCellValue("", row6.createCell(9), font,cellStyleMap.get("default"));
-        }else {
-            setCellValue("", row6.createCell(4), font,cellStyleMap.get("default"));
-            setCellValue("", row6.createCell(5), font,cellStyleMap.get("pop"));
-            setCellValue("", row6.createCell(6), font,cellStyleMap.get("default"));
-            setCellValue("请输入STRING(具体长度) 或 ARRAY", row6.createCell(7), font,cellStyleMap.get("default"));
-            setCellValue("", row6.createCell(8), font,cellStyleMap.get("default"));
-            setCellValue("", row6.createCell(9), font,cellStyleMap.get("default"));
-            setCellValue("", row6.createCell(10), font,cellStyleMap.get("default"));
-        }
+        setCellValue("", row6.createCell(0), font, cellStyleMap.get("default"));
+        setCellValue("", row6.createCell(1), font, cellStyleMap.get("default"));
+        setCellValue("请输入STRING(具体长度) 或 ARRAY", row6.createCell(2), font, cellStyleMap.get("default"));
+        setCellValue("", row6.createCell(3), font, cellStyleMap.get("default"));
+//        if (isHead) {
+        setCellValue("", row6.createCell(4), font, cellStyleMap.get("pop"));
+        setCellValue("", row6.createCell(5), font, cellStyleMap.get("default"));
+        setCellValue("请输入STRING(具体长度) 或 ARRAY", row6.createCell(6), font, cellStyleMap.get("default"));
+        setCellValue("", row6.createCell(7), font, cellStyleMap.get("default"));
+        setCellValue("", row6.createCell(8), font, cellStyleMap.get("default"));
+        setCellValue("", row6.createCell(9), font, cellStyleMap.get("default"));
+//        } else {
+//            setCellValue("", row6.createCell(4), font, cellStyleMap.get("default"));
+//            setCellValue("", row6.createCell(5), font, cellStyleMap.get("pop"));
+//            setCellValue("", row6.createCell(6), font, cellStyleMap.get("default"));
+//            setCellValue("请输入STRING(具体长度) 或 ARRAY", row6.createCell(7), font, cellStyleMap.get("default"));
+//            setCellValue("", row6.createCell(8), font, cellStyleMap.get("default"));
+//            setCellValue("", row6.createCell(9), font, cellStyleMap.get("default"));
+//            setCellValue("", row6.createCell(10), font, cellStyleMap.get("default"));
+//        }
 
 
         XSSFRow row7 = sheet.createRow(6);
-        setCellValue("", row7.createCell(1), font,cellStyleMap.get("default"));
-        setCellValue("", row7.createCell(2), font,cellStyleMap.get("default"));
-        setCellValue("", row7.createCell(3), font,cellStyleMap.get("default"));
-        if(isHead){
-            setCellValue("", row7.createCell(4), font,cellStyleMap.get("pop"));
-            setCellValue("", row7.createCell(5), font,cellStyleMap.get("default"));
-            setCellValue("", row7.createCell(6), font,cellStyleMap.get("default"));
-            setCellValue("", row7.createCell(7), font,cellStyleMap.get("default"));
-            setCellValue("", row7.createCell(8), font,cellStyleMap.get("default"));
-            setCellValue("", row7.createCell(9), font,cellStyleMap.get("default"));
-        }else {
-            setCellValue("", row7.createCell(4), font,cellStyleMap.get("default"));
-            setCellValue("", row7.createCell(5), font,cellStyleMap.get("pop"));
-            setCellValue("", row7.createCell(6), font,cellStyleMap.get("default"));
-            setCellValue("", row7.createCell(7), font,cellStyleMap.get("default"));
-            setCellValue("", row7.createCell(8), font,cellStyleMap.get("default"));
-            setCellValue("", row7.createCell(9), font,cellStyleMap.get("default"));
-            setCellValue("", row7.createCell(10), font,cellStyleMap.get("default"));
-        }
+        setCellValue("", row7.createCell(1), font, cellStyleMap.get("default"));
+        setCellValue("", row7.createCell(2), font, cellStyleMap.get("default"));
+        setCellValue("", row7.createCell(3), font, cellStyleMap.get("default"));
+//        if (isHead) {
+        setCellValue("", row7.createCell(4), font, cellStyleMap.get("pop"));
+        setCellValue("", row7.createCell(5), font, cellStyleMap.get("default"));
+        setCellValue("", row7.createCell(6), font, cellStyleMap.get("default"));
+        setCellValue("", row7.createCell(7), font, cellStyleMap.get("default"));
+        setCellValue("", row7.createCell(8), font, cellStyleMap.get("default"));
+        setCellValue("", row7.createCell(9), font, cellStyleMap.get("default"));
+//        } else {
+//            setCellValue("", row7.createCell(4), font, cellStyleMap.get("default"));
+//            setCellValue("", row7.createCell(5), font, cellStyleMap.get("pop"));
+//            setCellValue("", row7.createCell(6), font, cellStyleMap.get("default"));
+//            setCellValue("", row7.createCell(7), font, cellStyleMap.get("default"));
+//            setCellValue("", row7.createCell(8), font, cellStyleMap.get("default"));
+//            setCellValue("", row7.createCell(9), font, cellStyleMap.get("default"));
+//            setCellValue("", row7.createCell(10), font, cellStyleMap.get("default"));
+//        }
 
 
         XSSFRow row8 = sheet.createRow(7);
-        setCellValue("输出", row8.createCell(0), font,cellStyleMap.get("green"));
-        setCellValue("", row8.createCell(1), font,cellStyleMap.get("green"));
-        setCellValue("", row8.createCell(2), font,cellStyleMap.get("green"));
-        setCellValue("", row8.createCell(3), font,cellStyleMap.get("green"));
-        setCellValue("", row8.createCell(4), font,cellStyleMap.get("green"));
-        setCellValue("", row8.createCell(5), font,cellStyleMap.get("green"));
-        setCellValue("", row8.createCell(6), font,cellStyleMap.get("green"));
-        setCellValue("", row8.createCell(7), font,cellStyleMap.get("green"));
-        setCellValue("", row8.createCell(8), font,cellStyleMap.get("green"));
-        setCellValue("", row8.createCell(9), font,cellStyleMap.get("green"));
-        if(!isHead){
-            setCellValue("", row8.createCell(10), font,cellStyleMap.get("green"));
-        }
+        setCellValue("输出", row8.createCell(0), font, cellStyleMap.get("green"));
+        setCellValue("", row8.createCell(1), font, cellStyleMap.get("green"));
+        setCellValue("", row8.createCell(2), font, cellStyleMap.get("green"));
+        setCellValue("", row8.createCell(3), font, cellStyleMap.get("green"));
+        setCellValue("", row8.createCell(4), font, cellStyleMap.get("green"));
+        setCellValue("", row8.createCell(5), font, cellStyleMap.get("green"));
+        setCellValue("", row8.createCell(6), font, cellStyleMap.get("green"));
+        setCellValue("", row8.createCell(7), font, cellStyleMap.get("green"));
+        setCellValue("", row8.createCell(8), font, cellStyleMap.get("green"));
+        setCellValue("", row8.createCell(9), font, cellStyleMap.get("green"));
+//        if (!isHead) {
+//            setCellValue("", row8.createCell(10), font, cellStyleMap.get("green"));
+//        }
 
 
         XSSFRow row9 = sheet.createRow(8);
-        setCellValue("", row9.createCell(0), font,cellStyleMap.get("default"));
-        setCellValue("", row9.createCell(1), font,cellStyleMap.get("default"));
-        setCellValue("请输入STRING(具体长度) 或 ARRAY", row9.createCell(2), font,cellStyleMap.get("default"));
-        setCellValue("", row9.createCell(3), font,cellStyleMap.get("default"));
-        if(isHead){
-            setCellValue("", row9.createCell(4), font,cellStyleMap.get("pop"));
-            setCellValue("", row9.createCell(5), font,cellStyleMap.get("default"));
-            setCellValue("请输入STRING(具体长度) 或 ARRAY", row9.createCell(6), font,cellStyleMap.get("default"));
-            setCellValue("", row9.createCell(7), font,cellStyleMap.get("default"));
-            setCellValue("", row9.createCell(8), font,cellStyleMap.get("default"));
-            setCellValue("", row9.createCell(9), font,cellStyleMap.get("default"));
-        }else {
-            setCellValue("", row9.createCell(4), font,cellStyleMap.get("default"));
-            setCellValue("", row9.createCell(5), font,cellStyleMap.get("pop"));
-            setCellValue("", row9.createCell(6), font,cellStyleMap.get("default"));
-            setCellValue("请输入STRING(具体长度) 或 ARRAY", row9.createCell(7), font,cellStyleMap.get("default"));
-            setCellValue("", row9.createCell(7), font,cellStyleMap.get("default"));
-            setCellValue("", row9.createCell(8), font,cellStyleMap.get("default"));
-            setCellValue("", row9.createCell(9), font,cellStyleMap.get("default"));
-            setCellValue("", row9.createCell(10), font,cellStyleMap.get("default"));
-        }
+        setCellValue("", row9.createCell(0), font, cellStyleMap.get("default"));
+        setCellValue("", row9.createCell(1), font, cellStyleMap.get("default"));
+        setCellValue("请输入STRING(具体长度) 或 ARRAY", row9.createCell(2), font, cellStyleMap.get("default"));
+        setCellValue("", row9.createCell(3), font, cellStyleMap.get("default"));
+//        if (isHead) {
+        setCellValue("", row9.createCell(4), font, cellStyleMap.get("pop"));
+        setCellValue("", row9.createCell(5), font, cellStyleMap.get("default"));
+        setCellValue("请输入STRING(具体长度) 或 ARRAY", row9.createCell(6), font, cellStyleMap.get("default"));
+        setCellValue("", row9.createCell(7), font, cellStyleMap.get("default"));
+        setCellValue("", row9.createCell(8), font, cellStyleMap.get("default"));
+        setCellValue("", row9.createCell(9), font, cellStyleMap.get("default"));
+//        } else {
+//            setCellValue("", row9.createCell(4), font, cellStyleMap.get("default"));
+//            setCellValue("", row9.createCell(5), font, cellStyleMap.get("pop"));
+//            setCellValue("", row9.createCell(6), font, cellStyleMap.get("default"));
+//            setCellValue("请输入STRING(具体长度) 或 ARRAY", row9.createCell(7), font, cellStyleMap.get("default"));
+//            setCellValue("", row9.createCell(7), font, cellStyleMap.get("default"));
+//            setCellValue("", row9.createCell(8), font, cellStyleMap.get("default"));
+//            setCellValue("", row9.createCell(9), font, cellStyleMap.get("default"));
+//            setCellValue("", row9.createCell(10), font, cellStyleMap.get("default"));
+//        }
 
     }
 
-    private static void setCellValue(String textValue, Cell cell, XSSFFont font,XSSFCellStyle cellStyle) {
+    private static void setCellValue(String textValue, Cell cell, XSSFFont font, XSSFCellStyle cellStyle) {
 //        HSSFRichTextString richString = new HSSFRichTextString(textValue);
         XSSFRichTextString richString = new XSSFRichTextString(textValue);
         richString.applyFont(font);
-        if(cellStyle!=null){
+        if (cellStyle != null) {
             cell.setCellStyle(cellStyle);
         }
         cell.setCellValue(richString);
@@ -368,12 +358,9 @@ public class ESBParser extends EsbAbstractParser {
 
     @Override
     public ApiDefinitionImport parse(InputStream source, ApiTestImportRequest request) throws Exception {
-        EsbSheetDataStruct esbImportDataStruct = new EsbSheetDataStruct();
         EsbExcelDataStruct excelDataStruct = this.esbImport(source);
-
         this.projectId = request.getProjectId();
         ApiDefinitionImport definitionImport = this.parseApiDefinitionImport(excelDataStruct, request);
-
         return definitionImport;
     }
 
@@ -411,21 +398,21 @@ public class ESBParser extends EsbAbstractParser {
         int descIndex = 9;
         int apiPositionIndex = 10;
         int cellCount = 11;
-        if(isHeadSheet){
+//        if (isHeadSheet) {
             apiNameIndex = 5;
             apiDescIndex = 6;
             chineNameIndex = 7;
             descIndex = 8;
             apiPositionIndex = 9;
             cellCount = 10;
-        }
+//        }
 
         int rowCount = headSheet.getLastRowNum();
         //根据模版样式，如果不是报文头，则要取接口信息
         if (!isHeadSheet) {
             Row interfaceInfoRow = headSheet.getRow(1);
             if (interfaceInfoRow != null) {
-                List<String> rowDataArr = this.getRowDataByStartIndexAndEndIndex(interfaceInfoRow, 0, cellCount-1);
+                List<String> rowDataArr = this.getRowDataByStartIndexAndEndIndex(interfaceInfoRow, 0, cellCount - 1);
                 if (rowDataArr.size() >= cellCount) {
                     String interfaceCode = rowDataArr.get(simpleCodeIndex);
                     String interfaceName = rowDataArr.get(apiNameIndex);
@@ -437,13 +424,13 @@ public class ESBParser extends EsbAbstractParser {
                 }
             }
         }
-        //超过5行为空白，直接退出。
+        //超过10行为空白，直接退出。
         //部分office/wpf生成的文件会出现几万多空行，容易造成内存溢出。这里进行判断，连续五行为空白时认为读取结束。
         int blankRowCount = 0;
         boolean isRequest = true;
         for (int startRow = REQUEST_MESSAGE_ROW; startRow < rowCount; startRow++) {
             Row row = headSheet.getRow(startRow);
-            List<String> rowDataArr = this.getRowDataByStartIndexAndEndIndex(row, 0, cellCount-1);
+            List<String> rowDataArr = this.getRowDataByStartIndexAndEndIndex(row, 0, cellCount - 1);
             boolean isBlankRow = this.checkBlankRow(rowDataArr, cellCount);
             if (!isBlankRow) {
                 String cellFlag = rowDataArr.get(0);
@@ -456,7 +443,7 @@ public class ESBParser extends EsbAbstractParser {
                     isRequest = false;
                 }
                 blankRowCount++;
-                if (blankRowCount > 5) {
+                if (blankRowCount > 10) {
                     break;
                 }
             } else {
@@ -512,7 +499,7 @@ public class ESBParser extends EsbAbstractParser {
             Cell cell = row.getCell(i);
             if (cell != null) {
                 returnArray.add(getCellValue(cell));
-            }else {
+            } else {
                 returnArray.add("");
             }
         }
@@ -618,6 +605,8 @@ public class ESBParser extends EsbAbstractParser {
             apiDefinition.setMethod("ESB");
             apiDefinition.setId(apiId);
             apiDefinition.setProjectId(this.projectId);
+            apiDefinition.setModuleId(importRequest.getModuleId());
+            apiDefinition.setModulePath(importRequest.getModulePath());
             apiDefinition.setRequest(genTCPSampler());
             if (StringUtils.equalsIgnoreCase("schedule", importRequest.getType())) {
                 apiDefinition.setUserId(importRequest.getUserId());
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 98897767fe..22f83ec111 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -64,7 +64,7 @@
           </el-tabs>
         </div>
         <div v-else-if="showXpackCompnent&&request.backEsbDataStruct != null">
-          <esb-definition-response :currentProtocol="request.protocol" :request="request" :is-api-component="false"
+          <esb-definition-response v-xpack v-if="showXpackCompnent"  :currentProtocol="request.protocol" :request="request" :is-api-component="false"
                                    :show-options-button="false" :show-header="true" :result="request.requestResult"/>
         </div>
         <div v-else>
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 1aa89b01ab..227102ac01 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -95,7 +95,7 @@
         <!-- HTTP 请求返回数据 -->
         <p class="tip">{{$t('api_test.definition.request.res_param')}}</p>
         <div v-if="showXpackCompnent&&api.method==='ESB'">
-          <esb-definition-response :currentProtocol="apiCase.request.protocol" :request="apiCase.request" :is-api-component="false" :show-options-button="false" :show-header="true" :api-item="apiCase"/>
+          <esb-definition-response v-xpack v-if="showXpackCompnent"  :currentProtocol="apiCase.request.protocol" :request="apiCase.request" :is-api-component="false" :show-options-button="false" :show-header="true" :api-item="apiCase"/>
         </div>
         <div v-else>
           <api-response-component :currentProtocol="apiCase.request.protocol" :api-item="apiCase"/>
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue
index 4d2b2d4e11..be074a4225 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteTCPApi.vue
@@ -28,7 +28,7 @@
       <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
       <esb-definition v-xpack v-if="showXpackCompnent" :show-script="false" :request="request" ref="esbDefinition"/>
       <p class="tip">{{$t('api_test.definition.request.res_param')}}</p>
-      <esb-definition-response :is-api-component="true" :show-options-button="true" :request="request" />
+      <esb-definition-response v-xpack v-if="showXpackCompnent" :is-api-component="true" :show-options-button="true" :request="request" />
 <!--      <api-response-component :currentProtocol="apiCase.request.protocol" :api-item="apiCase"/>-->
     </div>
 
diff --git a/frontend/src/business/components/api/definition/components/document/ApiDocumentAnchor.vue b/frontend/src/business/components/api/definition/components/document/ApiDocumentAnchor.vue
index 194a337c8a..73e447b198 100644
--- a/frontend/src/business/components/api/definition/components/document/ApiDocumentAnchor.vue
+++ b/frontend/src/business/components/api/definition/components/document/ApiDocumentAnchor.vue
@@ -428,11 +428,12 @@ export default {
       var returnData = data;
       if (data) {
 
-        if(dataType === 'XML'){
-          returnData = "<xmp>"+returnData+"</xmp>";
-        }else{
-          returnData = data.replace(/\n/g, '<br>');
-        }
+        // if(dataType === 'XML'){
+        //   returnData = "<xmp>"+returnData+"</xmp>";
+        // }else {
+        //
+        // }
+        returnData = "<xmp>"+returnData+"</xmp>";
       }
       return returnData;
     },
diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index 1e1f56ff7a..21f94da6a7 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -97,7 +97,7 @@
 
 <script>
   import MsDialogFooter from "../../../../common/components/MsDialogFooter";
-  import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
+  import {listenGoBack, removeGoBackListener,hasLicense} from "@/common/js/utils";
   import ScheduleImport from "@/business/components/api/definition/components/import/ImportScheduleEdit";
   import MsSelectTree from "../../../../common/select-tree/SelectTree";
 
@@ -122,6 +122,7 @@
         swaggerUrlEnable: false,
         swaggerSynchronization: false,
         showEnvironmentSelect: true,
+        showXpackCompnent:false,
         moduleObj: {
           id: 'id',
           label: 'name',
@@ -228,7 +229,9 @@
           this.platforms.splice(this.platforms.indexOf(this.esbPlanform), 1);
         }
         if (this.propotal === 'TCP') {
-          this.platforms.push(this.esbPlanform);
+          if(hasLicense()){
+            this.platforms.push(this.esbPlanform);
+          }
           return true;
         } else if (this.propotal === 'HTTP') {
           this.platforms.push(this.postmanPlanform);

From 9abc90150d2a140510aedb0f4f78f01aff2ac39a Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 30 Mar 2021 16:38:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=AE=9A=E5=90=91?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=86=85=E5=AE=B9=E9=87=8D=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/jmeter/APIBackendListenerClient.java   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
index fa14afa7fa..3ecf48632c 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
@@ -333,10 +333,6 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
         for (SampleResult subResult : result.getSubResults()) {
             requestResult.getSubRequestResults().add(getRequestResult(subResult));
         }
-        for (SampleResult subResult : result.getSubResults()) {
-            requestResult.getSubRequestResults().add(getRequestResult(subResult));
-        }
-
         ResponseResult responseResult = requestResult.getResponseResult();
         responseResult.setBody(result.getResponseDataAsString());
         responseResult.setHeaders(result.getResponseHeaders());