From e29b93ef9d872e69deb56d48d3709c22e0f39c24 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 23 Oct 2023 16:22:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AC=A6=E5=8F=B7=E5=9C=B0=E5=9B=BEkey?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/service/impl/ShiroServiceImpl.java   |  1 +
 .../sys/SystemParameterController.java        |  5 ++
 .../system/SystemParameterService.java        |  8 +++
 .../src/views/antv/symbolmap/index.vue        | 72 ++++++++++++++-----
 4 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/core/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
index c8f29c9af8..e0d3031d17 100644
--- a/core/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
+++ b/core/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
@@ -132,6 +132,7 @@ public class ShiroServiceImpl implements ShiroService {
         filterChainDefinitionMap.put("/dataset/field/linkMultFieldValues", "link");
         filterChainDefinitionMap.put("/dataset/field/linkMappingFieldValues", "link");
         filterChainDefinitionMap.put("/systemInfo/proxyUserLoginInfo", ANON);
+        filterChainDefinitionMap.put("/system/onlineMapKey", ANON);
 
         filterChainDefinitionMap.put("/**", "authc");
 
diff --git a/core/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java b/core/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java
index 29d0a29450..9ae508e3d6 100644
--- a/core/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java
+++ b/core/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java
@@ -165,4 +165,9 @@ public class SystemParameterController {
         return systemParameterService.defaultLoginType();
     }
 
+    @GetMapping("/onlineMapKey")
+    public String onlineMapKey() {
+        return systemParameterService.onlineMapKey();
+    }
+
 }
diff --git a/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java
index b0f5402b69..f6d9377ad8 100644
--- a/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java
+++ b/core/backend/src/main/java/io/dataease/service/system/SystemParameterService.java
@@ -22,6 +22,7 @@ import io.dataease.service.datasource.DatasourceService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -56,6 +57,9 @@ public class SystemParameterService {
         return extSystemParameterMapper.email();
     }
 
+    @Value("${dataease.mapkey:}")
+    private String mapKey;
+
     public BasicInfo basicInfo() {
         List<SystemParameter> paramList = this.getParamList("basic");
         List<SystemParameter> homePageList = this.getParamList("ui.openHomePage");
@@ -409,4 +413,8 @@ public class SystemParameterService {
     public void clearMultiLoginCache() {
     }
 
+    public String onlineMapKey() {
+        return mapKey;
+    }
+
 }
diff --git a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/index.vue b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/index.vue
index a8a7cb31dc..42dc0b8eb3 100644
--- a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/index.vue
+++ b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/src/views/antv/symbolmap/index.vue
@@ -29,13 +29,13 @@
 </template>
 
 <script>
-  import { Scene, PointLayer, Popup } from '@antv/l7'
-  import { uuid, hexColorToRGBA} from '@/utils/symbolmap'
-  import ViewTrackBar from '@/components/views/ViewTrackBar'
-  import { getDefaultTemplate, reverseColor } from '@/utils/map'
-  import {getRemark} from "../../../components/views/utils";
+import {PointLayer, Popup, Scene} from '@antv/l7'
+import {hexColorToRGBA, uuid} from '@/utils/symbolmap'
+import ViewTrackBar from '@/components/views/ViewTrackBar'
+import {getDefaultTemplate} from '@/utils/map'
+import {getRemark} from "../../../components/views/utils";
 
-  export default {
+export default {
     name: 'ChartComponentG2',
     components: { ViewTrackBar },
     props: {
@@ -239,19 +239,59 @@
         window.addEventListener('resize', this.calcHeightDelay)
 
       },
-      initMap() {
+      executeAxios(url, type, data, callBack) {
+        const param = {
+          url: url,
+          type: type,
+          data: data,
+          callBack: callBack
+        }
+        this.$emit('execute-axios', param)
+        if (process.env.NODE_ENV === 'development') {
+          execute(param).then(res => {
+            if (param.callBack) {
+              param.callBack(res)
+            }
+          }).catch(e => {
+            if (param.error) {
+              param.error(e)
+            }
+          })
+        }
+      },
+      getMapKey() {
+        const key = 'online-map-key'
+        return new Promise((resolve, reject) => {
+          if (localStorage.getItem(key)) {
+            resolve(localStorage.getItem(key))
+          } else {
+            const url = "/system/onlineMapKey"
+            this.executeAxios(url, 'get', {}, res => {
+              const val = res.data
+              localStorage.setItem(key, val)
+              resolve(val)
+            })
+          }
+        })
+      },
+      async initMap() {
         if (!this.myChart) {
           let theme = this.getMapTheme(this.chart)
           const lang = this.$i18n.locale.includes('zh') ? 'zh' : 'en'
+          const mapConfig = {
+            lang: lang,
+            pitch: 0,
+            style: theme,
+            center: [121.434765, 31.256735],
+            zoom: 6
+          }
+          const key = await this.getMapKey()
+          if (key) {
+            mapConfig.token = key
+          }
           this.myChart = new Scene({
             id: this.chartId,
-            map: new this.$gaodeMap({
-              lang: lang,
-              pitch: 0,
-              style: theme,
-              center: [ 121.434765, 31.256735 ],
-              zoom: 6
-            }),
+            map: new this.$gaodeMap(mapConfig),
             logoVisible: false
           })
           const chart = JSON.parse(JSON.stringify(this.chart))
@@ -260,7 +300,7 @@
           this.antVRenderStatus = true
           if (!chart.data || !chart.data.data) {
             chart.data = {
-                data: []
+              data: []
             }
           }
           this.myChart.on('loaded', () => {
@@ -268,7 +308,7 @@
 
             this.drawView()
             this.myChart.on('click', ev => {
-                this.$emit('trigger-edit-click', ev.originEvent)
+              this.$emit('trigger-edit-click', ev.originEvent)
             })
           })
         } else {