From 98f5f38694fb616b490fa15dd385f159c37fecf4 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Wed, 14 Oct 2020 14:35:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?perf(licenseTip):=20=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E6=9C=89license=E8=BF=87=E6=9C=9F=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B6=E5=AE=83=E7=94=A8=E6=88=B7=E6=97=A0license?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Page/LicenseExpireTip.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Page/LicenseExpireTip.vue b/src/layout/components/Page/LicenseExpireTip.vue
index b6508f57c..a2783164b 100644
--- a/src/layout/components/Page/LicenseExpireTip.vue
+++ b/src/layout/components/Page/LicenseExpireTip.vue
@@ -20,9 +20,13 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'publicSettings'
+      'publicSettings',
+      'currentUser'
     ]),
     isExpire() {
+      if (this.currentUser.role !== 'Admin') {
+        return false
+      }
       const intervalDays = this.getIntervalDays(this.licenseData.date_expired)
       if (intervalDays < 0) {
         return this.$t('setting.LicenseExpired')
@@ -34,7 +38,7 @@ export default {
     }
   },
   mounted() {
-    if (this.publicSettings.XPACK_ENABLED) {
+    if (this.publicSettings.XPACK_ENABLED && this.currentUser.role === 'Admin') {
       this.$axios.get('/api/v1/xpack/license/detail').then(res => {
         this.licenseData = res
       }).finally(() => {

From 1d76e037a4b4ee458edadc3b231f216193271027 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 14 Oct 2020 15:27:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=82=80=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/User/components/InviteUsersDialog.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/users/User/components/InviteUsersDialog.vue b/src/views/users/User/components/InviteUsersDialog.vue
index 40f34f689..06a603b6d 100644
--- a/src/views/users/User/components/InviteUsersDialog.vue
+++ b/src/views/users/User/components/InviteUsersDialog.vue
@@ -125,13 +125,12 @@ export default {
       for (const rule of this.rulesList) {
         for (const user of this.InviteValue) {
           data.push({
-            org: this.currentOrg.id,
             user: user,
             role: rule
           })
         }
       }
-      this.$axios.post(`/api/v1/orgs/org-memeber-relation/?org_id=${this.currentOrg.id}&ignore_already_exist=1`, data).then(() => {
+      this.$axios.post(`/api/v1/users/users/invite/`, data).then(() => {
         this.$message.success(this.$t('common.AddSuccessMsg'))
       }).finally(() => {
         this.InviteLoading = false