From e847f0c6029462f4c8be9ecd5388eb9d60a2fbaf Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 12 Apr 2022 14:33:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0license=E6=95=B0=E9=87=8F=E8=B6=85=E9=A2=9D?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1007021 --user=李玉号 增加license友好提示
https://www.tapd.cn/55049933/s/1133154
---
 .../controller/SystemParameterController.java |  5 +++++
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 .../common/components/MsContainer.vue         | 20 ++++++++++++++-----
 .../business/components/settings/Setting.vue  | 17 +++++++++++++++-
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/business/permission.js           |  2 +-
 frontend/src/i18n/en-US.js                    |  1 +
 frontend/src/i18n/zh-CN.js                    |  1 +
 frontend/src/i18n/zh-TW.js                    |  1 +
 frontend/src/store/index.js                   |  1 +
 frontend/src/store/mutations.js               |  1 +
 11 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/SystemParameterController.java b/backend/src/main/java/io/metersphere/controller/SystemParameterController.java
index 58b090c826..5224a05eab 100644
--- a/backend/src/main/java/io/metersphere/controller/SystemParameterController.java
+++ b/backend/src/main/java/io/metersphere/controller/SystemParameterController.java
@@ -124,6 +124,11 @@ public class SystemParameterController {
         return systemStatisticData;
     }
 
+    @GetMapping("/user/size")
+    public long getSystemUserCount() {
+        return userService.getUserSize();
+    }
+
     @GetMapping("/get/info/{key}")
     public SystemParameter getInfo(@PathVariable String key) {
         return systemParameterService.getInfo(key);
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 71672216ee..e2984c40b8 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 71672216eed47c925023791d964c18b0d48fe402
+Subproject commit e2984c40b818db7b3a7da75c9d130c85da7598e9
diff --git a/frontend/src/business/components/common/components/MsContainer.vue b/frontend/src/business/components/common/components/MsContainer.vue
index 70dcdc64fa..8119c39c20 100644
--- a/frontend/src/business/components/common/components/MsContainer.vue
+++ b/frontend/src/business/components/common/components/MsContainer.vue
@@ -1,14 +1,24 @@
 <template>
-
-  <el-container class="ms-container">
-    <slot></slot>
-  </el-container>
+  <div>
+    <el-alert
+      v-if="isShowWarning"
+      :title="$t('license.count_warning')"
+      type="warning"
+      center
+      :closable="false"
+      show-icon>
+    </el-alert>
+    <el-container class="ms-container">
+      <slot></slot>
+    </el-container>
+  </div>
 
 </template>
 
 <script>
     export default {
-      name: "MsContainer"
+      name: "MsContainer",
+      props: ['isShowWarning']
     }
 </script>
 
diff --git a/frontend/src/business/components/settings/Setting.vue b/frontend/src/business/components/settings/Setting.vue
index 25e112f452..42f6a6233f 100644
--- a/frontend/src/business/components/settings/Setting.vue
+++ b/frontend/src/business/components/settings/Setting.vue
@@ -1,5 +1,5 @@
 <template>
-  <ms-container>
+  <ms-container :is-show-warning="isShowWarning && isSystemGroup">
 
     <ms-aside-container>
       <ms-current-user/>
@@ -22,10 +22,25 @@ import MsSettingMenu from "./SettingMenu";
 import MsAsideContainer from "../common/components/MsAsideContainer";
 import MsContainer from "../common/components/MsContainer";
 import MsMainContainer from "../common/components/MsMainContainer";
+import {getCurrentUser} from "@/common/js/utils";
+import {GROUP_SYSTEM} from "@/common/js/constants";
 
 export default {
   name: "MsSetting",
   components: {MsMainContainer, MsContainer, MsAsideContainer, MsSettingMenu, MsCurrentUser},
+  computed: {
+    isShowWarning() {
+      return this.$store.state.showLicenseCountWarning;
+    },
+    isSystemGroup() {
+      let user = getCurrentUser();
+      if (user && user.groups) {
+        let group = user.groups.filter(gp => gp && gp.type === GROUP_SYSTEM);
+        return group.length > 0;
+      }
+      return false;
+    }
+  }
 };
 </script>
 
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 2f477539fa..25095c2a98 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 2f477539fa0226a88cb117a4e2ba104dda7697fc
+Subproject commit 25095c2a984fe8c9120dbfb9bda16449f71c971d
diff --git a/frontend/src/business/permission.js b/frontend/src/business/permission.js
index 734516ae91..1bb68043ce 100644
--- a/frontend/src/business/permission.js
+++ b/frontend/src/business/permission.js
@@ -108,7 +108,7 @@ router.afterEach(() => {
 export function getLicense(callback) {
   return baseGet("/license/valid", data => {
     validateAndSetLicense(data);
-    if (callback) callback();
+    if (callback) callback(data);
   });
 }
 
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index f9d6c275cc..a277bb6935 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -462,6 +462,7 @@ export default {
     status: 'Valid State',
     valid: 'Valid',
     invalid: 'invalid',
+    count_warning: 'The number of system users has exceeded the license limit. Please contact the staff as soon as possible.',
     expired: 'expired',
   },
   workstation: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index aa53d53f2d..ae89363e6b 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -464,6 +464,7 @@ export default {
     status: '授权状态',
     valid: '有效',
     invalid: '无效',
+    count_warning: '系统用户数已超过license限制数量，请尽快联系工作人员。',
     expired: '已过期',
   },
   workstation: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index a17a34aba0..25eb0f9f13 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -464,6 +464,7 @@ export default {
     status: '授權狀態',
     valid: '有效',
     invalid: '無效',
+    count_warning: '系統用戶數已超過license限制數量，請盡快聯繫工作人員。',
     expired: '已過期',
   },
   workstation: {
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 6f66033422..71221b660b 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -45,6 +45,7 @@ const state = {
   librarySelectElement: {},
   uiElementLibraryModuleIds: null,
   refreshUiScenario: false,
+  showLicenseCountWarning: false
 }
 
 const store = new Vuex.Store({
diff --git a/frontend/src/store/mutations.js b/frontend/src/store/mutations.js
index ce67fc5ebd..16e6189e7f 100644
--- a/frontend/src/store/mutations.js
+++ b/frontend/src/store/mutations.js
@@ -28,6 +28,7 @@ const mutations = {
   setUiElementLibraryModuleIds: (state, value) => state.uiElementLibraryModuleIds = value,
   setRefreshUiScenario: (state, value) => state.refreshUiScenario = value,
   setSelectUiGroup: (state, value) => state.selectUiGroup = value,
+  setShowLicenseCountWarning: (state, value) => state.showLicenseCountWarning = value,
 }
 
 export default mutations;