From 56db0e077bb1e3f15e94f197cc6afb3af1b41a73 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 18 Sep 2020 11:14:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(XPack):=20license=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=B9=B6=E5=AF=B9=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=9B=E8=A1=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmind/XmindToTestCaseParser.java          |  2 +-
 frontend/src/business/App.vue                 | 36 +++++++++++++
 .../components/settings/SettingMenu.vue       | 53 ++++++++++---------
 frontend/src/common/js/constants.js           |  1 +
 frontend/src/common/js/utils.js               | 16 ++++--
 5 files changed, 77 insertions(+), 31 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xmind/XmindToTestCaseParser.java b/backend/src/main/java/io/metersphere/xmind/XmindToTestCaseParser.java
index 135fe835f0..699948c904 100644
--- a/backend/src/main/java/io/metersphere/xmind/XmindToTestCaseParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/XmindToTestCaseParser.java
@@ -55,7 +55,7 @@ public class XmindToTestCaseParser {
     // 递归处理案例数据
     private void makeXmind(StringBuffer processBuffer, Attached parent, int level, String nodePath, List<Attached> attacheds) {
         for (Attached item : attacheds) {
-            if (isBlack(item.getTitle(), "(?:tc|tc)")) { // 用例
+            if (isBlack(item.getTitle(), "(?:tc：|tc:|tc)")) { // 用例
                 item.setParent(parent);
                 this.newTestCase(item.getTitle(), parent.getPath(), item.getChildren() != null ? item.getChildren().getAttached() : null);
             } else {
diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue
index 6f75a42fa0..1fb604f01a 100644
--- a/frontend/src/business/App.vue
+++ b/frontend/src/business/App.vue
@@ -1,5 +1,13 @@
 <template>
   <el-col v-if="auth">
+    <el-row id="header-top1" type="flex" justify="space-between" align="middle">
+      <el-col>
+        <div class="license-head" v-if="valid === true && validData.status == 'expired'">License has expired since
+          {{(validData!= undefined && validData.license!= undefined) ? validData.license.expired:''}},please
+          update license.
+        </div>
+      </el-col>
+    </el-row>
     <el-row id="header-top" type="flex" justify="space-between" align="middle">
 
       <el-col :span="12">
@@ -26,11 +34,22 @@
   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";
 
   export default {
     name: 'app',
     data() {
+      let xpack = false;
+      Setting.children.forEach(child => {
+        if (child.path === "license") {
+          xpack = true;
+          return;
+        }
+      })
       return {
+        valid: xpack,
+        validData: {},
         auth: false
       }
     },
@@ -47,6 +66,15 @@
         window.location.href = "/login"
       });
     },
+    beforeMount() {
+      if (this.valid === true) {
+        // 验证license
+        this.result = this.$get("/license/valid", response => {
+          this.validData = response.data;
+          saveLicense(response.data);
+        });
+      }
+    },
     components: {MsLanguageSwitch, MsUser, MsView, MsTopMenus, MsHeaderOrgWs},
     methods: {}
   }
@@ -98,5 +126,13 @@
   .align-right {
     float: right;
   }
+
+  .license-head {
+    height: 30px;
+    background: #BA331B;
+    text-align: center;
+    line-height: 30px;
+    color: white;
+  }
 </style>
 
diff --git a/frontend/src/business/components/settings/SettingMenu.vue b/frontend/src/business/components/settings/SettingMenu.vue
index 89ba6525f3..b3d8246a96 100644
--- a/frontend/src/business/components/settings/SettingMenu.vue
+++ b/frontend/src/business/components/settings/SettingMenu.vue
@@ -47,6 +47,7 @@
 <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",
@@ -87,35 +88,35 @@
     },
     methods: {
       valid() {
-        let _this = this;
-        this.result = this.$get("/license/valid", response => {
-          let data = response.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);
-              }
-            })
+        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.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.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);
-              }
-            })
-          }
-        })
+          this.persons.forEach(item => {
+            if (item.valid != undefined && item.valid === true) {
+              this.persons.splice(this.persons.indexOf(item), 1);
+            }
+          })
+        }
       }
     }
   }
diff --git a/frontend/src/common/js/constants.js b/frontend/src/common/js/constants.js
index fb0ee6caa2..72882106ac 100644
--- a/frontend/src/common/js/constants.js
+++ b/frontend/src/common/js/constants.js
@@ -1,4 +1,5 @@
 export const TokenKey = 'Admin-Token';
+export const LicenseKey = 'License';
 export const DEFAULT_LANGUAGE = 'default_language';
 
 export const ROLE_ADMIN = 'admin';
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 871a5c56f6..10a28eb25b 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -5,7 +5,8 @@ import {
   ROLE_TEST_MANAGER,
   ROLE_TEST_USER,
   ROLE_TEST_VIEWER,
-  TokenKey
+  TokenKey,
+  LicenseKey
 } from "./constants";
 import axios from "axios";
 
@@ -90,6 +91,12 @@ export function saveLocalStorage(response) {
   localStorage.setItem("roles", roles);
 }
 
+export function saveLicense(data) {
+  // 保存License
+  localStorage.setItem(LicenseKey, JSON.stringify(data));
+}
+
+
 export function refreshSessionAndCookies(sign, sourceId) {
   axios.post(REFRESH_SESSION_USER_URL + "/" + sign + "/" + sourceId).then(r => {
     saveLocalStorage(r.data);
@@ -175,7 +182,7 @@ export function downloadFile(name, content) {
   }
 }
 
-export function listenGoBack( callback) {
+export function listenGoBack(callback) {
   //监听浏览器返回操作，关闭该对话框
   if (window.history && window.history.pushState) {
     history.pushState(null, null, document.URL);
@@ -189,9 +196,10 @@ export function removeGoBackListener(callback) {
 
 export function getUUID() {
   function S4() {
-    return (((1+Math.random())*0x10000)|0).toString(16).substring(1);
+    return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
   }
-  return (S4()+S4()+"-"+S4()+"-"+S4()+"-"+S4()+"-"+S4()+S4()+S4());
+
+  return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
 }