From 846aebaf6d1ac6c4f3116816411cf25c5581f853 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 17 Jan 2024 19:03:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A4=BE=E5=8C=BA=E7=89=88=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=90=8C=E6=AD=A5=E5=88=B0=E4=BC=81=E4=B8=9A=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/api/about.ts           |  4 ++
 core/core-frontend/src/views/about/index.vue  | 56 ++++++++++++++++++-
 de-xpack                                      |  2 +-
 .../api/rmonitor/ResourceMonitorApi.java      | 16 ++++++
 .../auth/api/InteractiveAuthApi.java          |  2 +
 5 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/rmonitor/ResourceMonitorApi.java

diff --git a/core/core-frontend/src/api/about.ts b/core/core-frontend/src/api/about.ts
index 1a20032bb7..2b563723ec 100644
--- a/core/core-frontend/src/api/about.ts
+++ b/core/core-frontend/src/api/about.ts
@@ -3,3 +3,7 @@ import request from '@/config/axios'
 export const validateApi = data => request.post({ url: '/license/validate', data })
 export const buildVersionApi = () => request.get({ url: '/license/version' })
 export const updateInfoApi = data => request.post({ url: '/license/update', data })
+
+export const checkFreeApi = () => request.get({ url: '/rmonitor/existFree' })
+export const syncFreeApi = () => request.post({ url: '/rmonitor/sync' })
+export const delFreeApi = () => request.post({ url: '/rmonitor/delete' })
diff --git a/core/core-frontend/src/views/about/index.vue b/core/core-frontend/src/views/about/index.vue
index 9efc818a31..8c2f319fe6 100644
--- a/core/core-frontend/src/views/about/index.vue
+++ b/core/core-frontend/src/views/about/index.vue
@@ -1,10 +1,17 @@
 <script lang="ts" setup>
 import aboutBg from '@/assets/img/about-bg.png'
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, h } from 'vue'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { F2CLicense } from './index'
-import { validateApi, buildVersionApi, updateInfoApi } from '@/api/about'
-import { ElMessage } from 'element-plus-secondary'
+import {
+  validateApi,
+  buildVersionApi,
+  updateInfoApi,
+  checkFreeApi,
+  syncFreeApi,
+  delFreeApi
+} from '@/api/about'
+import { ElMessage, ElMessageBox } from 'element-plus-secondary'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useEmitt } from '@/hooks/web/useEmitt'
 const dialogVisible = ref(false)
@@ -113,11 +120,54 @@ const update = (licKey: string) => {
       ElMessage.success(t('about.update_success'))
       const info = getLicense(response.data)
       setLicense(info)
+      checkFree()
     } else {
       ElMessage.warning(response.data.message)
     }
   })
 }
+
+const checkFree = () => {
+  checkFreeApi().then(res => {
+    if (res.data) {
+      // do something
+      const title = '存在未同步的资源数据，请谨慎操作！'
+      const childrenDomList = [h('strong', null, title)]
+      ElMessageBox.confirm('', {
+        confirmButtonType: 'primary',
+        type: 'warning',
+        autofocus: false,
+        dangerouslyUseHTMLString: true,
+        message: h('div', { class: 'free-sync-tip-box' }, childrenDomList),
+        showClose: false,
+        cancelButtonText: '删除',
+        confirmButtonText: '同步'
+      })
+        .then(() => {
+          syncFree()
+        })
+        .catch(() => {
+          delFree()
+        })
+    }
+  })
+}
+
+const delFree = () => {
+  delFreeApi().then(res => {
+    if (!res.code && !res.msg) {
+      ElMessage.success(t('common.delete_success'))
+    }
+  })
+}
+
+const syncFree = () => {
+  syncFreeApi().then(res => {
+    if (!res.code && !res.msg) {
+      ElMessage.success('同步成功')
+    }
+  })
+}
 </script>
 
 <template>
diff --git a/de-xpack b/de-xpack
index c941619c1c..e71e615287 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit c941619c1cb929453b6a8bf4517e3f0036232128
+Subproject commit e71e6152874ed49933d3befeee6ea2c9310a94f4
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/rmonitor/ResourceMonitorApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/rmonitor/ResourceMonitorApi.java
new file mode 100644
index 0000000000..0a318de9a5
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/rmonitor/ResourceMonitorApi.java
@@ -0,0 +1,16 @@
+package io.dataease.api.rmonitor;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+public interface ResourceMonitorApi {
+
+    @GetMapping("/existFree")
+    boolean existFree();
+
+    @PostMapping("/delete")
+    void delete();
+
+    @PostMapping("/sync")
+    void sync();
+}
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java
index 396be3149e..f8014a71fe 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java
@@ -75,4 +75,6 @@ public interface InteractiveAuthApi {
     @GetMapping("/query2Root/{id}/{flag}")
     List<ResourceNodeVO> query2Root(@PathVariable("id") Long id, @PathVariable("flag") Integer flag);
 
+    @GetMapping("/checkEmpty")
+    boolean checkEmpty();
 }