From 8e4476b4db191cf6cb86fc32549a2c9df77f14b0 Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Sun, 16 Feb 2020 21:50:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E5=BA=A6=E5=9C=B0=E5=9B=BE=E5=AF=86?=
 =?UTF-8?q?=E9=92=A5=E5=90=8C=E6=AD=A5=E7=BC=96=E8=BE=91=E5=99=A8=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/ConfigService.php         | 32 +++++++++++++++++++
 .../common/lib/ueditor/dialogs/map/map.html   |  9 +++---
 .../common/lib/ueditor/dialogs/map/show.html  |  4 +--
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/application/service/ConfigService.php b/application/service/ConfigService.php
index 528279819..9fb5a3ffd 100755
--- a/application/service/ConfigService.php
+++ b/application/service/ConfigService.php
@@ -104,6 +104,12 @@ class ConfigService
             $params[$k] = $v;
         }
 
+        // 处理百度地图 ak, 空则默认变量
+        if(array_key_exists('common_baidu_map_ak', $params))
+        {
+            $map_ak_old = MyC('common_baidu_map_ak', '{{common_baidu_map_ak}}', true);
+        }
+
         // 循环保存数据
         $success = 0;
 
@@ -136,6 +142,32 @@ class ConfigService
                 return $ret;
             }
 
+            // 处理百度地图 ak
+            if(array_key_exists('common_baidu_map_ak', $params) && isset($map_ak_old))
+            {
+                $file_all = [
+                    ROOT.'public/static/common/lib/ueditor/dialogs/map/map.html',
+                    ROOT.'public/static/common/lib/ueditor/dialogs/map/show.html',
+                ];
+                foreach($file_all as $f)
+                {
+                    // 是否有权限
+                    if(!is_writable($f))
+                    {
+                        return DataReturn('编辑器文件没有权限['.$f.']', -1);
+                    }
+
+                    // 替换
+                    $search = ['ak={{common_baidu_map_ak}}', 'ak='.$map_ak_old];
+                    $replace = 'ak='.MyC('common_baidu_map_ak', '{{common_baidu_map_ak}}', true);
+                    $status = file_put_contents($f, str_replace($search, $replace, file_get_contents($f)));
+                    if($status === false)
+                    {
+                        return DataReturn('百度地图密钥配置失败', -5);
+                    }
+                }
+            }
+
             return DataReturn('编辑成功'.'['.$success.']');
         }
         return DataReturn('编辑失败', -100);
diff --git a/public/static/common/lib/ueditor/dialogs/map/map.html b/public/static/common/lib/ueditor/dialogs/map/map.html
index f67ef3a94..54dca5544 100755
--- a/public/static/common/lib/ueditor/dialogs/map/map.html
+++ b/public/static/common/lib/ueditor/dialogs/map/map.html
@@ -4,7 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
     <script type="text/javascript" src="../internal.js"></script>
-    <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.1&services=true"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak={{common_baidu_map_ak}}"></script>
     <style type="text/css">
         .content{width:530px; height: 350px;margin: 10px auto;}
         .content table{width: 100%}
@@ -87,7 +87,7 @@
                         map.centerAndZoom(points[0], 13);
                     }
                     point = map.getCenter();
-                    marker.setPoint(point);
+                    marker.setPosition(point);
                 } else {
                     alert(lang.errorMsg);
                 }
@@ -139,11 +139,12 @@
     };
     dialog.onok = function (){
         var center = map.getCenter();
-        var zoom = map.zoomLevel;
+        var zoom = map.getZoom();
+        console.log(zoom)
         var size = map.getSize();
         var mapWidth = size.width;
         var mapHeight = size.height;
-        var point = marker.getPoint();
+        var point = marker.getPosition();
 
         if($G('is_dynamic').checked) {
             var URL = editor.options.UEDITOR_HOME_URL,
diff --git a/public/static/common/lib/ueditor/dialogs/map/show.html b/public/static/common/lib/ueditor/dialogs/map/show.html
index 929fdd8ff..d50ba848d 100755
--- a/public/static/common/lib/ueditor/dialogs/map/show.html
+++ b/public/static/common/lib/ueditor/dialogs/map/show.html
@@ -14,7 +14,7 @@
             overflow: hidden;
         }
     </style>
-    <script type="text/javascript" src="https://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak={{common_baidu_map_ak}}"></script>
 <meta http-equiv='Content-Security-Policy' content='upgrade-insecure-requests'/></head>
 
 <body onload="initMap();">
@@ -106,7 +106,7 @@
         function mapListenerHandler() {
             var zoom = map.getZoom(),
                 center = map.getCenter(),
-                marker = window.marker.getPoint();
+                marker = window.marker.getPosition();
             containerIframe.src = containerIframe.src.
                 replace(new RegExp('([?#&])center=([^?#&]+)', 'i'), '$1center=' + center.lng + ',' + center.lat).
                 replace(new RegExp('([?#&])markers=([^?#&]+)', 'i'), '$1markers=' + marker.lng + ',' + marker.lat).