From 625a87062961f4eac87f89e51d5d1be609b35cdc Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Tue, 22 Sep 2020 10:49:03 +0800
Subject: [PATCH 01/19] refactor(XPack): update submodule

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 frontend/src/business/components/xpack     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index de612c8ef4..15425f3e00 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit de612c8ef47f93c8720ac918d22aaa172977b6f7
+Subproject commit 15425f3e0076c47ff2089b34e2c90ef18cf258dd
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 6ae17a7ced..fff34ae133 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 6ae17a7ced8f8175531f959ed0a0a6a707ba27dc
+Subproject commit fff34ae13389a21bb89e3276f52c519e6eade247

From 3b2059de146bf8c2a5c3079e5ac31126a1dfffb5 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Tue, 22 Sep 2020 14:39:08 +0800
Subject: [PATCH 02/19] refactor(XPack): update submodule

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 frontend/src/business/components/xpack     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 15425f3e00..ca1b956888 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 15425f3e0076c47ff2089b34e2c90ef18cf258dd
+Subproject commit ca1b956888a85d9cb7c8b7b8b8692e658e4a63f8
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index fff34ae133..6dfc8fe7d5 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit fff34ae13389a21bb89e3276f52c519e6eade247
+Subproject commit 6dfc8fe7d5d43dbc80b45942bdcc90999f5c0e99

From 3674320e9b3696c7f764bb68e08f0acd8504b361 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 22 Sep 2020 17:48:30 +0800
Subject: [PATCH 03/19] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/request/database/DatabaseFrom.vue     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/request/database/DatabaseFrom.vue b/frontend/src/business/components/api/test/components/request/database/DatabaseFrom.vue
index 4fab4c7e19..89919ab28b 100644
--- a/frontend/src/business/components/api/test/components/request/database/DatabaseFrom.vue
+++ b/frontend/src/business/components/api/test/components/request/database/DatabaseFrom.vue
@@ -88,18 +88,24 @@
               {max: 300, message: this.$t('commons.input_limit', [0, 300]), trigger: 'blur'}
             ],
             driver: [
-              {required: true, message: this.$t('commons.input_name'), trigger: 'blur'},
+              {required: true, message: this.$t('commons.cannot_be_null'), trigger: 'blur'},
             ],
             password: [
               {max: 200, message: this.$t('commons.input_limit', [0, 200]), trigger: 'blur'}
             ],
             dbUrl: [
-              {required: true, message: this.$t('commons.input_name'), trigger: 'blur'},
+              {required: true, message: this.$t('commons.cannot_be_null'), trigger: 'blur'},
               {max: 500, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'}
             ],
             username: [
-              {required: true, message: this.$t('commons.input_name'), trigger: 'blur'},
+              {required: true, message: this.$t('commons.cannot_be_null'), trigger: 'blur'},
               {max: 200, message: this.$t('commons.input_limit', [0, 200]), trigger: 'blur'}
+            ],
+            poolMax: [
+              {required: true, message: this.$t('commons.cannot_be_null'), trigger: 'blur'},
+            ],
+            timeout: [
+              {required: true, message: this.$t('commons.cannot_be_null'), trigger: 'blur'},
             ]
           }
         }

From 7713b24506bfcb662fa7de62ba47e2165155f567 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 22 Sep 2020 18:58:37 +0800
Subject: [PATCH 04/19] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1)?=
 =?UTF-8?q?:=20=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/review/view/components/TestReviewTestCaseEdit.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
index 60943f93c0..80d8603082 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
@@ -20,7 +20,7 @@
 
                   <el-row type="flex" class="head-bar">
 
-                    <el-col :span="12">
+                    <el-col :span="8">
                       <el-button plain size="mini"
                                  icon="el-icon-back"
                                  @click="cancel">{{ $t('test_track.return') }}

From 8f807044ad4b7bc3ec7a8b0ba2e5d50e27453691 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 22 Sep 2020 19:48:44 +0800
Subject: [PATCH 05/19] =?UTF-8?q?fix(XPack):=20license=20=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/APITestController.java     |  6 ---
 .../api/service/APITestService.java           |  9 ----
 .../controller/LoginController.java           |  6 +++
 .../io/metersphere/service/UserService.java   | 10 +++++
 frontend/src/business/App.vue                 | 45 +++++++++----------
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index 6ac534febb..28cbd6e764 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -127,10 +127,4 @@ public class APITestController {
     public List<ScheduleDao> listSchedule(@RequestBody QueryScheduleRequest request) {
         return apiTestService.listSchedule(request);
     }
-
-    @GetMapping("/license/valid")
-    public LicenseDTO valid() {
-        return apiTestService.validateLicense();
-    }
-
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index 83b33c5b37..bedba60a9d 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -437,13 +437,4 @@ public class APITestService {
             quotaService.checkAPITestQuota();
         }
     }
-
-    public LicenseDTO validateLicense() {
-        LicenseService licenseService = CommonBeanFactory.getBean(LicenseService.class);
-        if (licenseService != null) {
-            return licenseService.valid();
-        }
-        return null;
-    }
-
 }
diff --git a/backend/src/main/java/io/metersphere/controller/LoginController.java b/backend/src/main/java/io/metersphere/controller/LoginController.java
index 8452a51810..e0a2e015b1 100644
--- a/backend/src/main/java/io/metersphere/controller/LoginController.java
+++ b/backend/src/main/java/io/metersphere/controller/LoginController.java
@@ -5,6 +5,7 @@ import io.metersphere.commons.constants.UserSource;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.LoginRequest;
+import io.metersphere.dto.LicenseDTO;
 import io.metersphere.service.UserService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -67,4 +68,9 @@ public class LoginController {
         return userService.getDefaultLanguage();
     }
 
+    @GetMapping("/api/license/valid")
+    public LicenseDTO valid() {
+        return userService.validateLicense();
+    }
+
 }
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index ef8e264e57..e72a0b56d0 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -10,6 +10,7 @@ import io.metersphere.commons.constants.UserStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.CodingUtil;
+import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.ResultHolder;
 import io.metersphere.controller.request.LoginRequest;
@@ -19,6 +20,7 @@ import io.metersphere.controller.request.member.QueryMemberRequest;
 import io.metersphere.controller.request.member.UserRequest;
 import io.metersphere.controller.request.organization.AddOrgMemberRequest;
 import io.metersphere.controller.request.organization.QueryOrgMemberRequest;
+import io.metersphere.dto.LicenseDTO;
 import io.metersphere.dto.UserDTO;
 import io.metersphere.dto.UserRoleDTO;
 import io.metersphere.i18n.Translator;
@@ -589,4 +591,12 @@ public class UserService {
     public List<User> searchUser(String condition) {
         return extUserMapper.searchUser(condition);
     }
+
+    public LicenseDTO validateLicense() {
+        LicenseService licenseService = CommonBeanFactory.getBean(LicenseService.class);
+        if (licenseService != null) {
+            return licenseService.valid();
+        }
+        return null;
+    }
 }
diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue
index 266b73605e..595f1ff258 100644
--- a/frontend/src/business/App.vue
+++ b/frontend/src/business/App.vue
@@ -1,15 +1,11 @@
 <template>
   <el-col v-if="auth">
-    <el-row id="header-top1" type="flex" justify="space-between" align="middle">
+    <el-row v-if="licenseHeader != null">
       <el-col>
-        <div class="license-head" v-if="validData.status == 'expired'">License has expired since
-          {{(validData!= undefined && validData.license!= undefined) ? validData.license.expired:''}},please
-          update license.
-        </div>
+        <component :is="licenseHeader"></component>
       </el-col>
     </el-row>
     <el-row id="header-top" type="flex" justify="space-between" align="middle">
-
       <el-col :span="12">
         <a class="logo"/>
         <ms-top-menus/>
@@ -34,15 +30,18 @@
   import MsHeaderOrgWs from "./components/common/head/HeaderOrgWs";
   import MsLanguageSwitch from "./components/common/head/LanguageSwitch";
   import {saveLocalStorage} from "../common/js/utils";
-  import {saveLicense} from "../common/js/utils";
-  import Setting from "@/business/components/settings/router";
+
+  const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+  const header = requireComponent("./license/LicenseMessage.vue");
 
   export default {
     name: 'app',
+    props: {},
     data() {
       return {
-        validData: {},
-        auth: false
+        licenseHeader: null,
+        auth: false,
+        header: {},
       }
     },
     beforeCreate() {
@@ -51,6 +50,10 @@
           this.$setLang(response.data.data.language);
           saveLocalStorage(response.data);
           this.auth = true;
+          // 是否显示校验信息
+          if (header.default !== undefined) {
+            this.licenseHeader = "MsLicenseHeader";
+          }
         } else {
           window.location.href = "/login"
         }
@@ -58,21 +61,18 @@
         window.location.href = "/login"
       });
     },
-    beforeMount() {
-      // 验证license
-      this.result = this.$get("/api/license/valid", response => {
-        let data = response.data;
-        if (data != undefined && data != null) {
-          this.validData = response.data;
-          saveLicense(response.data);
-        }
-      });
-    },
-    components: {MsLanguageSwitch, MsUser, MsView, MsTopMenus, MsHeaderOrgWs},
-    methods: {}
+    components: {
+      MsLanguageSwitch,
+      MsUser,
+      MsView,
+      MsTopMenus,
+      MsHeaderOrgWs,
+      "MsLicenseHeader": header.default
+    }
   }
 </script>
 
+
 <style scoped>
   #header-top {
     width: 100%;
@@ -128,4 +128,3 @@
     color: white;
   }
 </style>
-

From 37f4384321e5e6d7c0985442086d28855c7e9319 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 22 Sep 2020 19:50:47 +0800
Subject: [PATCH 06/19] =?UTF-8?q?fix(XPack):=20license=20=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/App.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue
index 595f1ff258..19a4248b6b 100644
--- a/frontend/src/business/App.vue
+++ b/frontend/src/business/App.vue
@@ -52,7 +52,7 @@
           this.auth = true;
           // 是否显示校验信息
           if (header.default !== undefined) {
-            this.licenseHeader = "MsLicenseHeader";
+            this.licenseHeader = "LicenseMessage";
           }
         } else {
           window.location.href = "/login"
@@ -67,7 +67,7 @@
       MsView,
       MsTopMenus,
       MsHeaderOrgWs,
-      "MsLicenseHeader": header.default
+      "LicenseMessage": header.default
     }
   }
 </script>

From 1dfbd1614488abbdf6243841e1d5295c623ee5ee Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 22 Sep 2020 20:12:38 +0800
Subject: [PATCH 07/19] =?UTF-8?q?fix(XPack):=20=E7=AC=AC=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E8=AE=A4=E8=AF=81=E5=A4=B1=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settings/SettingMenu.vue       | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/frontend/src/business/components/settings/SettingMenu.vue b/frontend/src/business/components/settings/SettingMenu.vue
index b3d8246a96..198591e72a 100644
--- a/frontend/src/business/components/settings/SettingMenu.vue
+++ b/frontend/src/business/components/settings/SettingMenu.vue
@@ -47,7 +47,6 @@
 <script>
   import {checkoutCurrentOrganization, checkoutCurrentWorkspace} from "@/common/js/utils";
   import Setting from "@/business/components/settings/router";
-  import {LicenseKey} from '@/common/js/constants';
 
   export default {
     name: "MsSettingMenu",
@@ -74,51 +73,14 @@
         organizations: getMenus('organization'),
         workspaces: getMenus('workspace'),
         persons: getMenus('person'),
-        isValid: valid,
         isCurrentOrganizationAdmin: false,
         isCurrentWorkspaceUser: false,
       }
     },
     mounted() {
-      if (this.isValid === true) {
-        this.valid();
-      }
       this.isCurrentOrganizationAdmin = checkoutCurrentOrganization();
       this.isCurrentWorkspaceUser = checkoutCurrentWorkspace();
     },
-    methods: {
-      valid() {
-        let data = localStorage.getItem(LicenseKey);
-        if (data != undefined && data != null) {
-          data = JSON.parse(data);
-        }
-        if (data === undefined || data === null || data.status != "valid") {
-          this.systems.forEach(item => {
-            if (item.valid != undefined && item.valid === true) {
-              this.systems.splice(this.systems.indexOf(item), 1);
-            }
-          })
-
-          this.organizations.forEach(item => {
-            if (item.valid != undefined && item.valid === true) {
-              this.organizations.splice(this.organizations.indexOf(item), 1);
-            }
-          })
-
-          this.workspaces.forEach(item => {
-            if (item.valid != undefined && item.valid === true) {
-              this.workspaces.splice(this.workspaces.indexOf(item), 1);
-            }
-          })
-
-          this.persons.forEach(item => {
-            if (item.valid != undefined && item.valid === true) {
-              this.persons.splice(this.persons.indexOf(item), 1);
-            }
-          })
-        }
-      }
-    }
   }
 </script>
 

From 9a10123bc4e8bc8b5b78ec3318b85b5a100d127e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 22 Sep 2020 21:14:02 +0800
Subject: [PATCH 08/19] =?UTF-8?q?refactor(=E7=94=A8=E4=BE=8B=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1):=20=E6=B7=BB=E5=8A=A0loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/review/components/TestCaseReviewEdit.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
index 9c411e16e0..af42109d43 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
@@ -210,7 +210,7 @@ export default {
       });
     },
     editTestReview(param) {
-      this.$post('/test/case/review/' + this.operationType, param, () => {
+      this.result = this.$post('/test/case/review/' + this.operationType, param, () => {
         this.$success(this.$t('commons.save_success'));
         this.dialogFormVisible = false;
         this.$emit("refresh");

From 569b01f5896b21d0fb0f1474926449aa671a3d8f Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Tue, 22 Sep 2020 21:29:53 +0800
Subject: [PATCH 09/19] =?UTF-8?q?refactor(XPack):=20License=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=83=BD=E6=94=BE=E5=88=B0XPack=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/controller/LoginController.java     |  6 ------
 .../java/io/metersphere/service/LicenseService.java    | 10 ----------
 .../main/java/io/metersphere/service/UserService.java  |  9 +--------
 backend/src/main/java/io/metersphere/xpack             |  2 +-
 frontend/src/business/components/xpack                 |  2 +-
 5 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 backend/src/main/java/io/metersphere/service/LicenseService.java

diff --git a/backend/src/main/java/io/metersphere/controller/LoginController.java b/backend/src/main/java/io/metersphere/controller/LoginController.java
index e0a2e015b1..015c0fa641 100644
--- a/backend/src/main/java/io/metersphere/controller/LoginController.java
+++ b/backend/src/main/java/io/metersphere/controller/LoginController.java
@@ -67,10 +67,4 @@ public class LoginController {
     public String getDefaultLanguage() {
         return userService.getDefaultLanguage();
     }
-
-    @GetMapping("/api/license/valid")
-    public LicenseDTO valid() {
-        return userService.validateLicense();
-    }
-
 }
diff --git a/backend/src/main/java/io/metersphere/service/LicenseService.java b/backend/src/main/java/io/metersphere/service/LicenseService.java
deleted file mode 100644
index 25e46b3d18..0000000000
--- a/backend/src/main/java/io/metersphere/service/LicenseService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.metersphere.service;
-
-import io.metersphere.dto.LicenseDTO;
-
-public interface LicenseService {
-
-    public LicenseDTO valid();
-
-    public LicenseDTO addValidLicense(String reqLicenseCode);
-}
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index e72a0b56d0..d88864f060 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -36,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -591,12 +592,4 @@ public class UserService {
     public List<User> searchUser(String condition) {
         return extUserMapper.searchUser(condition);
     }
-
-    public LicenseDTO validateLicense() {
-        LicenseService licenseService = CommonBeanFactory.getBean(LicenseService.class);
-        if (licenseService != null) {
-            return licenseService.valid();
-        }
-        return null;
-    }
 }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index ca1b956888..e51e5704f9 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit ca1b956888a85d9cb7c8b7b8b8692e658e4a63f8
+Subproject commit e51e5704f9d7fbfb030a8a7d67d0094a9f36c23d
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 6dfc8fe7d5..2c5f7e1585 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 6dfc8fe7d5d43dbc80b45942bdcc90999f5c0e99
+Subproject commit 2c5f7e15858f51e836cffa911f8ab7511b3cc0d5

From b0faae20b530009a78cc98ee29bf244bd55e2095 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 22 Sep 2020 21:48:11 +0800
Subject: [PATCH 10/19] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?):=20=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/report/ApiReportExport.vue | 136 ++++++++++++++++++
 .../api/report/ApiReportReqestHeaderItem.vue  |  31 ++++
 .../components/api/report/ApiReportView.vue   |  60 ++++++--
 .../report/PerformanceReportView.vue          |  13 +-
 4 files changed, 216 insertions(+), 24 deletions(-)
 create mode 100644 frontend/src/business/components/api/report/ApiReportExport.vue
 create mode 100644 frontend/src/business/components/api/report/ApiReportReqestHeaderItem.vue

diff --git a/frontend/src/business/components/api/report/ApiReportExport.vue b/frontend/src/business/components/api/report/ApiReportExport.vue
new file mode 100644
index 0000000000..5e1ace1bcd
--- /dev/null
+++ b/frontend/src/business/components/api/report/ApiReportExport.vue
@@ -0,0 +1,136 @@
+<template>
+  <el-card>
+    <div class="report-title title">接口测试报告</div>
+    <ms-metric-chart :content="content" :totalTime="totalTime"/>
+    <div class="scenario-result" v-for="(scenario, index) in content.scenarios" :key="index" :scenario="scenario">
+        <div>
+          <el-card >
+            <template v-slot:header>
+              {{$t('api_report.scenario_name')}}：{{scenario.name}}
+            </template>
+            <div class="ms-border" v-for="(request, index) in scenario.requestResults" :key="index" :request="request">
+
+              <div class="request-left">
+                <api-report-reqest-header-item :title="request.name">
+                  <span class="url"> {{request.url}}</span>
+                </api-report-reqest-header-item>
+              </div>
+
+
+              <div class="request-right">
+
+                <api-report-reqest-header-item :title="$t('api_test.request.method')">
+                  <span class="method"> {{request.method}}</span>
+                </api-report-reqest-header-item>
+
+                <api-report-reqest-header-item :title="$t('api_report.response_time')">
+                  {{request.responseResult.responseTime}}
+                </api-report-reqest-header-item>
+
+                <api-report-reqest-header-item :title="$t('api_report.latency')">
+                  {{request.responseResult.latency}} ms
+                </api-report-reqest-header-item>
+
+                <api-report-reqest-header-item :title="$t('api_report.request_size')">
+                  {{request.requestSize}} bytes
+                </api-report-reqest-header-item>
+
+                <api-report-reqest-header-item :title="$t('api_report.response_size')">
+                  {{request.responseResult.latency}} ms
+                </api-report-reqest-header-item>
+
+                <api-report-reqest-header-item :title="$t('api_report.error')">
+                  {{request.responseResult.responseSize}} bytes
+                </api-report-reqest-header-item>
+
+                <api-report-reqest-header-item :title="$t('api_report.assertions')">
+                  {{request.passAssertions + " / " + request.totalAssertions}}
+                </api-report-reqest-header-item>
+
+                <api-report-reqest-header-item :title="$t('api_report.response_code')">
+                  {{request.responseResult.responseCode}}
+                </api-report-reqest-header-item>
+
+                <api-report-reqest-header-item :title="$t('api_report.result')">
+                  <el-tag size="mini" type="success" v-if="request.success">
+                    {{$t('api_report.success')}}
+                  </el-tag>
+                  <el-tag size="mini" type="danger" v-else>
+                    {{$t('api_report.fail')}}
+                  </el-tag>
+                </api-report-reqest-header-item>
+              </div>
+            </div>
+          </el-card>
+        </div>
+      </div>
+    </el-card>
+</template>
+
+<script>
+    import MsScenarioResult from "./components/ScenarioResult";
+    import MsRequestResultTail from "./components/RequestResultTail";
+    import ApiReportReqestHeaderItem from "./ApiReportReqestHeaderItem";
+    import MsMetricChart from "./components/MetricChart";
+    export default {
+      name: "MsApiReportExport",
+      components: {MsMetricChart, ApiReportReqestHeaderItem, MsRequestResultTail, MsScenarioResult},
+      props: {
+        content: Object,
+        totalTime: Number
+      },
+      data() {
+        return {
+        }
+      },
+    }
+</script>
+
+<style scoped>
+
+  .scenario-result {
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
+
+  .method {
+    color: #1E90FF;
+    font-size: 14px;
+    font-weight: 500;
+  }
+
+  .request-right {
+    float: right;
+  }
+
+  .request-left {
+    float: left;
+    margin-left: 20px;
+  }
+
+  .ms-border {
+    height: 60px;
+  }
+
+  .report-title {
+    font-size: 30px;
+    font-weight: bold;
+    height: 50px;
+    text-align: center;
+    margin-bottom: 20px;
+  }
+
+  .url {
+    color: #409EFF;
+    font-size: 14px;
+    font-weight: bold;
+    font-style: italic;
+  }
+
+  .el-card {
+    padding: 10px;
+    padding: 30px;
+    border-style: none;
+  }
+
+</style>
diff --git a/frontend/src/business/components/api/report/ApiReportReqestHeaderItem.vue b/frontend/src/business/components/api/report/ApiReportReqestHeaderItem.vue
new file mode 100644
index 0000000000..a9d096095d
--- /dev/null
+++ b/frontend/src/business/components/api/report/ApiReportReqestHeaderItem.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="item">
+    <div class="item-title">
+      {{title}}
+    </div>
+    <div>
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+    export default {
+      name: "ApiReportReqestHeaderItem",
+      props: {title: String}
+    }
+</script>
+
+<style scoped>
+
+  .item {
+    width: 120px;
+    height: 50px;
+    display: inline-block;
+  }
+
+  .item-title {
+    margin-bottom: 20px;
+  }
+
+</style>
diff --git a/frontend/src/business/components/api/report/ApiReportView.vue b/frontend/src/business/components/api/report/ApiReportView.vue
index 9827f371b9..bf1b5fe461 100644
--- a/frontend/src/business/components/api/report/ApiReportView.vue
+++ b/frontend/src/business/components/api/report/ApiReportView.vue
@@ -9,10 +9,10 @@
                 <span>{{ report.projectName }} / </span>
                 <router-link :to="path">{{ report.testName }}</router-link>
                 <span class="time">{{ report.createTime | timestampFormatDate }}</span>
-                <!--<el-button plain type="primary" size="mini" @click="handleExport(report.name)"
+                <el-button class="export-button" plain type="primary" size="mini" @click="handleExport(report.name)"
                            style="margin-left: 1200px">
                   {{$t('test_track.plan_view.export_report')}}
-                </el-button>-->
+                </el-button>
               </el-col>
             </el-row>
           </header>
@@ -36,6 +36,7 @@
                 <ms-request-result-tail v-if="isRequestResult" :request="request" :scenario-name="scenarioName"/>
               </el-col>
             </el-row>
+            <ms-api-report-export v-if="reportExportVisible" id="apiTestReport" :content="content" :total-time="totalTime"/>
           </main>
         </section>
       </el-card>
@@ -52,10 +53,14 @@ import MsMetricChart from "./components/MetricChart";
 import MsScenarioResults from "./components/ScenarioResults";
 import MsContainer from "@/business/components/common/components/MsContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
+import MsApiReportExport from "./ApiReportExport";
+import {exportPdf} from "../../../../common/js/utils";
+import html2canvas from "html2canvas";
 
 export default {
   name: "MsApiReportView",
   components: {
+    MsApiReportExport,
     MsMainContainer,
     MsContainer, MsScenarioResults, MsRequestResultTail, MsMetricChart, MsScenarioResult, MsRequestResult
   },
@@ -70,6 +75,7 @@ export default {
       isRequestResult: false,
       request: {},
       scenarioName: null,
+      reportExportVisible: false
     }
   },
   activated() {
@@ -139,6 +145,26 @@ export default {
         this.request = requestResult.request;
         this.scenarioName = requestResult.scenarioName;
       });
+    },
+    handleExport(name) {
+      this.loading = true;
+      this.reportExportVisible = true;
+      let reset = this.exportReportReset;
+
+      this.$nextTick(function () {
+        setTimeout(() => {
+          html2canvas(document.getElementById('apiTestReport'), {
+            scale: 2
+          }).then(function(canvas) {
+            exportPdf(name, [canvas]);
+            reset();
+          });
+        }, 1000);
+      });
+    },
+    exportReportReset() {
+      this.reportExportVisible = false;
+      this.loading = false;
     }
   },
 
@@ -170,30 +196,36 @@ export default {
 </style>
 
 <style scoped>
-.report-container {
+
+  .report-container {
   height: calc(100vh - 155px);
   min-height: 600px;
   overflow-y: auto;
-}
+  }
 
-.report-header {
+  .report-header {
   font-size: 15px;
-}
+  }
 
-.report-header a {
+  .report-header a {
   text-decoration: none;
-}
+  }
 
-.report-header .time {
+  .report-header .time {
   color: #909399;
   margin-left: 10px;
-}
+  }
 
-.report-container .fail {
+  .report-container .fail {
   color: #F56C6C;
-}
+  }
 
-.report-container .is-active .fail {
+  .report-container .is-active .fail {
   color: inherit;
-}
+  }
+
+  .export-button {
+    float: right;
+  }
+
 </style>
diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index 4069038da9..0bbfaf8df5 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -66,28 +66,21 @@
         </div>
 
         <div class="report-export" v-show="reportExportVisible">
-        <!--<div class="report-export">-->
           <el-card id="testOverview">
             <template v-slot:header >
-              <slot name="header">
-                <span class="title">{{$t('report.test_overview')}}</span>
-              </slot>
+              <span class="title">{{$t('report.test_overview')}}</span>
             </template>
             <ms-report-test-overview :report="report" ref="testOverview"/>
           </el-card>
           <el-card id="requestStatistics" title="'requestStatistics'">
             <template v-slot:header >
-              <slot name="header">
-                <span class="title">{{$t('report.test_request_statistics')}}</span>
-              </slot>
+              <span class="title">{{$t('report.test_request_statistics')}}</span>
             </template>
             <ms-report-request-statistics :report="report" ref="requestStatistics"/>
           </el-card>
           <el-card id="errorLog" title="'errorLog'">
             <template v-slot:header >
-              <slot name="header">
-                <span class="title">{{$t('report.test_error_log')}}</span>
-              </slot>
+              <span class="title">{{$t('report.test_error_log')}}</span>
             </template>
             <ms-report-error-log :report="report" ref="errorLog"/>
           </el-card>

From 06f7531969e278f3f56bbc67df02f2e8d64f2d50 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 22 Sep 2020 21:54:23 +0800
Subject: [PATCH 11/19] =?UTF-8?q?fix:=20=E6=8A=A5=E5=91=8A=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=90=8E=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/js/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 5c100179fd..07f9de5c01 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -255,7 +255,7 @@ export function exportPdf(name, canvasList) {
     }
   }
 
-  pdf.save(name);
+  pdf.save(name + '.pdf');
 
 }
 

From f3e3e7065856165c575840c2643a8d7850067a4e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 23 Sep 2020 09:37:56 +0800
Subject: [PATCH 12/19] =?UTF-8?q?fix(XPack):=20=E4=BF=AE=E5=A4=8D=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E7=BC=93=E5=AD=98=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/js/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 5c100179fd..735995ed85 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -94,7 +94,7 @@ export function saveLocalStorage(response) {
 
 export function saveLicense(data) {
   // 保存License
-  localStorage.setItem(LicenseKey, JSON.stringify(data));
+  localStorage.setItem(LicenseKey, data);
 }
 
 

From f28e0c72296c6698f8742b45b953dd4b510e138c Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 23 Sep 2020 09:41:09 +0800
Subject: [PATCH 13/19] =?UTF-8?q?fix(XPack):=20=E6=81=A2=E5=A4=8D=E8=A2=AB?=
 =?UTF-8?q?=E8=AF=AF=E5=88=A0=E7=9A=84=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/service/LicenseService.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 backend/src/main/java/io/metersphere/service/LicenseService.java

diff --git a/backend/src/main/java/io/metersphere/service/LicenseService.java b/backend/src/main/java/io/metersphere/service/LicenseService.java
new file mode 100644
index 0000000000..25e46b3d18
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/service/LicenseService.java
@@ -0,0 +1,10 @@
+package io.metersphere.service;
+
+import io.metersphere.dto.LicenseDTO;
+
+public interface LicenseService {
+
+    public LicenseDTO valid();
+
+    public LicenseDTO addValidLicense(String reqLicenseCode);
+}

From 5ad828ec057712a5e25fc8ed1b254ef3c90246c6 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 23 Sep 2020 09:59:33 +0800
Subject: [PATCH 14/19] =?UTF-8?q?fix(XPack):=20=E4=BF=AE=E5=A4=8D=E8=A2=AB?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=B8=A2=E5=A4=B1=E7=9A=84=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=BC=95=E5=8F=91=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/APITestController.java     |  1 -
 .../api/service/APITestService.java           |  1 -
 .../controller/LoginController.java           |  1 -
 .../java/io/metersphere/dto/LicenseDTO.java   | 14 -------------
 .../io/metersphere/dto/LicenseInfoDTO.java    | 21 -------------------
 .../metersphere/service/LicenseService.java   | 10 ---------
 .../io/metersphere/service/UserService.java   |  2 --
 7 files changed, 50 deletions(-)
 delete mode 100644 backend/src/main/java/io/metersphere/dto/LicenseDTO.java
 delete mode 100644 backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java
 delete mode 100644 backend/src/main/java/io/metersphere/service/LicenseService.java

diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index 28cbd6e764..ad3940ac7a 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -12,7 +12,6 @@ import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.QueryScheduleRequest;
-import io.metersphere.dto.LicenseDTO;
 import io.metersphere.dto.ScheduleDao;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index bedba60a9d..44dd35677b 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -20,7 +20,6 @@ import io.metersphere.commons.constants.ScheduleType;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
 import io.metersphere.controller.request.QueryScheduleRequest;
-import io.metersphere.dto.LicenseDTO;
 import io.metersphere.dto.ScheduleDao;
 import io.metersphere.i18n.Translator;
 import io.metersphere.job.sechedule.ApiTestJob;
diff --git a/backend/src/main/java/io/metersphere/controller/LoginController.java b/backend/src/main/java/io/metersphere/controller/LoginController.java
index 015c0fa641..f1473d15fc 100644
--- a/backend/src/main/java/io/metersphere/controller/LoginController.java
+++ b/backend/src/main/java/io/metersphere/controller/LoginController.java
@@ -5,7 +5,6 @@ import io.metersphere.commons.constants.UserSource;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.LoginRequest;
-import io.metersphere.dto.LicenseDTO;
 import io.metersphere.service.UserService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
diff --git a/backend/src/main/java/io/metersphere/dto/LicenseDTO.java b/backend/src/main/java/io/metersphere/dto/LicenseDTO.java
deleted file mode 100644
index 245f875979..0000000000
--- a/backend/src/main/java/io/metersphere/dto/LicenseDTO.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.metersphere.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class LicenseDTO implements Serializable {
-
-    private String status;
-
-    private LicenseInfoDTO license;
-
-}
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java b/backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java
deleted file mode 100644
index 682ebe564e..0000000000
--- a/backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.metersphere.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class LicenseInfoDTO implements Serializable {
-    // 客户名称
-    private String corporation;
-    // 授权截止时间
-    private String expired;
-    //产品名称
-    private String product;
-    //产品版本
-    private String edition;
-    //icense版本
-    private String licenseVersion;
-    //授权数量
-    private int licenseCount;
-}
diff --git a/backend/src/main/java/io/metersphere/service/LicenseService.java b/backend/src/main/java/io/metersphere/service/LicenseService.java
deleted file mode 100644
index 25e46b3d18..0000000000
--- a/backend/src/main/java/io/metersphere/service/LicenseService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.metersphere.service;
-
-import io.metersphere.dto.LicenseDTO;
-
-public interface LicenseService {
-
-    public LicenseDTO valid();
-
-    public LicenseDTO addValidLicense(String reqLicenseCode);
-}
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index d88864f060..fe2b0b8dfc 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -10,7 +10,6 @@ import io.metersphere.commons.constants.UserStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.CodingUtil;
-import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.ResultHolder;
 import io.metersphere.controller.request.LoginRequest;
@@ -20,7 +19,6 @@ import io.metersphere.controller.request.member.QueryMemberRequest;
 import io.metersphere.controller.request.member.UserRequest;
 import io.metersphere.controller.request.organization.AddOrgMemberRequest;
 import io.metersphere.controller.request.organization.QueryOrgMemberRequest;
-import io.metersphere.dto.LicenseDTO;
 import io.metersphere.dto.UserDTO;
 import io.metersphere.dto.UserRoleDTO;
 import io.metersphere.i18n.Translator;

From 3dfab4b13ff298089e96eaff40b4d5fc3d9d5606 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 23 Sep 2020 10:11:06 +0800
Subject: [PATCH 15/19] =?UTF-8?q?fix(XPack):=20=E6=B7=BB=E5=8A=A0=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue
index 19a4248b6b..c226861e51 100644
--- a/frontend/src/business/App.vue
+++ b/frontend/src/business/App.vue
@@ -32,7 +32,7 @@
   import {saveLocalStorage} from "../common/js/utils";
 
   const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
-  const header = requireComponent("./license/LicenseMessage.vue");
+  const header = requireComponent.keys().length > 0 ? requireComponent("./license/LicenseMessage.vue") : {};
 
   export default {
     name: 'app',

From 4b1c6a4a8ae0dec0da8f32ea58ad3b005cfe5caf Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 23 Sep 2020 11:02:32 +0800
Subject: [PATCH 16/19] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8Dfirefox=E4=B8=8B=E8=BD=BD=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/js/ajax.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/common/js/ajax.js b/frontend/src/common/js/ajax.js
index 0e500b68e9..3b07a7d3b4 100644
--- a/frontend/src/common/js/ajax.js
+++ b/frontend/src/common/js/ajax.js
@@ -136,7 +136,8 @@ export default {
         .then(response => {
           let fileName = window.decodeURI(response.headers['content-disposition'].split('=')[1]);
           let link = document.createElement("a");
-          link.href = window.URL.createObjectURL(new Blob([response.data], {type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"}));
+          console.log(response.data);
+          link.href = window.URL.createObjectURL(new Blob([response.data]));
           link.download = fileName;
           link.click();
         });

From 5afdfac40c8635f3bce73bfb936cf572e32ec79d Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 23 Sep 2020 11:03:52 +0800
Subject: [PATCH 17/19] =?UTF-8?q?style(=E6=B5=8B=E8=AF=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA):=20=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/js/ajax.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/common/js/ajax.js b/frontend/src/common/js/ajax.js
index 3b07a7d3b4..3dd6792e3e 100644
--- a/frontend/src/common/js/ajax.js
+++ b/frontend/src/common/js/ajax.js
@@ -136,7 +136,6 @@ export default {
         .then(response => {
           let fileName = window.decodeURI(response.headers['content-disposition'].split('=')[1]);
           let link = document.createElement("a");
-          console.log(response.data);
           link.href = window.URL.createObjectURL(new Blob([response.data]));
           link.download = fileName;
           link.click();

From 7f6fd6d0138cdefc626df325dc78efafdd8d275c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 23 Sep 2020 11:15:11 +0800
Subject: [PATCH 18/19] =?UTF-8?q?refactor(=E7=94=A8=E4=BE=8B=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1):=20i18n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack                    | 2 +-
 .../track/review/view/components/TestReviewTestCaseEdit.vue   | 4 ++--
 frontend/src/business/components/xpack                        | 2 +-
 frontend/src/i18n/en-US.js                                    | 2 +-
 frontend/src/i18n/zh-CN.js                                    | 2 +-
 frontend/src/i18n/zh-TW.js                                    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index e51e5704f9..141ee64787 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit e51e5704f9d7fbfb030a8a7d67d0094a9f36c23d
+Subproject commit 141ee64787b4a28ef108c5fa4dde90446de01887
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
index 80d8603082..8c49aa1e55 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
@@ -166,7 +166,7 @@
                               type="textarea"
                               :autosize="{ minRows: 2, maxRows: 4}"
                               :rows="2"
-                              :disabled="isReadOnly"
+                              :disabled="true"
                               v-model="scope.row.actualResult"
                               :placeholder="$t('commons.input_content')"
                               clearable/>
@@ -175,7 +175,7 @@
                         <el-table-column :label="$t('test_track.plan_view.step_result')" min-width="12%">
                           <template v-slot:default="scope">
                             <el-select
-                              :disabled="isReadOnly"
+                              :disabled="true"
                               v-model="scope.row.executeResult"
                               @change="stepResultChange()"
                               size="mini">
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 2c5f7e1585..06d935cd1d 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 2c5f7e15858f51e836cffa911f8ab7511b3cc0d5
+Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 0e02ea2494..68b37d332f 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -279,7 +279,7 @@ export default {
     email_format_is_incorrect: 'Email format is incorrect',
     delete_confirm: 'Are you sure you want to delete this User?',
     apikey_delete_confirm: 'Are you sure you want to delete this API Key?',
-    input_id_placeholder: 'Please enter ID (only supports numbers and English letters)',
+    input_id_placeholder: 'Please enter ID (Chinese characters are not supported)',
     source: 'Source'
   },
   role: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 3be64e28d4..1bb4ec48a3 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -279,7 +279,7 @@ export default {
     email_format_is_incorrect: '邮箱格式不正确',
     delete_confirm: '这个用户确定要删除吗?',
     apikey_delete_confirm: '这个 API Key 确定要删除吗?',
-    input_id_placeholder: '请输入ID (只支持数字、英文字母)',
+    input_id_placeholder: '请输入ID (不支持中文)',
     source: '用户来源'
   },
   role: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index e25234a7d3..c7f104ebed 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -279,7 +279,7 @@ export default {
     email_format_is_incorrect: '郵箱格式不正確',
     delete_confirm: '這個用戶確定要刪除嗎?',
     apikey_delete_confirm: '這個 API Key 確定要刪除嗎?',
-    input_id_placeholder: '請輸入ID (只支持數字、英文字母)',
+    input_id_placeholder: '請輸入ID (不支持中文字符)',
     source: '用戶來源'
   },
   role: {

From 5b5a8a7acd5e434af90eb1fb89a808a5a27047d8 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Wed, 23 Sep 2020 11:40:21 +0800
Subject: [PATCH 19/19] refactor(XPack): update submodule

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 frontend/src/business/components/xpack     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index e51e5704f9..cf6b065263 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit e51e5704f9d7fbfb030a8a7d67d0094a9f36c23d
+Subproject commit cf6b06526324326a563d933e07118fac014a63b4
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 2c5f7e1585..06d935cd1d 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 2c5f7e15858f51e836cffa911f8ab7511b3cc0d5
+Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1