From f65956ed886ec60bfb0a3a127b43af13284fddd7 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Tue, 8 Dec 2020 17:42:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E7=BB=84=E4=BB=B6CD?=
 =?UTF-8?q?N=E8=B7=A8=E5=9F=9F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/default/public/footer.html      | 2 +-
 application/admin/view/default/public/header.html      | 1 +
 application/admin/view/default/site/cache/index.html   | 2 +-
 application/index/view/default/public/footer.html      | 2 +-
 application/index/view/default/public/header.html      | 1 +
 public/static/common/lib/ueditor/dialogs/map/map.html  | 1 -
 public/static/common/lib/ueditor/dialogs/map/show.html | 2 +-
 7 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/admin/view/default/public/footer.html b/application/admin/view/default/public/footer.html
index 821725cf2..a45cfe7b4 100755
--- a/application/admin/view/default/public/footer.html
+++ b/application/admin/view/default/public/footer.html
@@ -22,7 +22,7 @@
 <script type='text/javascript' src="{{$public_host}}static/common/lib/echarts/macarons.js?v={{:MyC('home_static_cache_version')}}"></script>
 
 <!-- ueditor 编辑器 -->
-<script type='text/javascript' src="{{$public_host}}static/common/lib/ueditor/ueditor.config.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$my_public_url}}static/common/lib/ueditor/ueditor.config.js?v={{:MyC('home_static_cache_version')}}"></script>
 <script type='text/javascript' src="{{$public_host}}static/common/lib/ueditor/ueditor.all.js?v={{:MyC('home_static_cache_version')}}"></script>
 <script type='text/javascript' src="{{$public_host}}static/common/lib/ueditor/lang/zh-cn/zh-cn.js?v={{:MyC('home_static_cache_version')}}"></script>
 
diff --git a/application/admin/view/default/public/header.html b/application/admin/view/default/public/header.html
index 47978f8ce..79969e2dc 100755
--- a/application/admin/view/default/public/header.html
+++ b/application/admin/view/default/public/header.html
@@ -54,6 +54,7 @@
 <script type="text/javascript">
     var __root__ = '{{$public_host}}';
     var __my_url__ = '{{$my_url}}';
+    var __my_public_url__ = '{{$my_public_url}}';
     var __public__ = '{{$public_host}}';
 	var __attachment_host__ = '{{$attachment_host}}';
     var __currency_symbol__ = '{{$currency_symbol}}';
diff --git a/application/admin/view/default/site/cache/index.html b/application/admin/view/default/site/cache/index.html
index 0bce37e71..98c40fa72 100644
--- a/application/admin/view/default/site/cache/index.html
+++ b/application/admin/view/default/site/cache/index.html
@@ -13,7 +13,7 @@
                 <button type="button" class="am-close">&times;</button>
                 <p>1. 默认使用的文件缓存、使用Redis缓存PHP需要先安装Redis扩展</p>
                 <p>2. 请确保Redis服务稳定性（Session使用缓存后、服务不稳定可能导致后台也无法登录）</p>
-                <p>3. 如遇到Redis服务异常无法登录管理后台、可进入数据库[ <strong class="am-text-danger">{{:config('database.prefix')}}config</strong> ]表修改配置、然后删除[ <strong class="am-text-danger">config</strong> ]目录下[ <strong class="am-text-danger">session.php,cache.php</strong> ]文件</p>
+                <p>3. 如遇到Redis服务异常无法登录管理后台、修改配置文件[ <strong class="am-text-danger">config</strong> ]目录下[ <strong class="am-text-danger">session.php,cache.php</strong> ]文件</p>
             </div>
 
             <!-- Session缓存配置 -->
diff --git a/application/index/view/default/public/footer.html b/application/index/view/default/public/footer.html
index 37b8e5caf..5ee134243 100755
--- a/application/index/view/default/public/footer.html
+++ b/application/index/view/default/public/footer.html
@@ -50,7 +50,7 @@
 <script type='text/javascript' src="{{$public_host}}static/common/lib/dragsort/jquery.dragsort-0.5.2.min.js?v={{:MyC('home_static_cache_version')}}"></script>
 
 <!-- ueditor 编辑器 -->
-<script type='text/javascript' src="{{$public_host}}static/common/lib/ueditor/ueditor.config.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$my_public_url}}static/common/lib/ueditor/ueditor.config.js?v={{:MyC('home_static_cache_version')}}"></script>
 <script type='text/javascript' src="{{$public_host}}static/common/lib/ueditor/ueditor.all.js?v={{:MyC('home_static_cache_version')}}"></script>
 <script type='text/javascript' src="{{$public_host}}static/common/lib/ueditor/lang/zh-cn/zh-cn.js?v={{:MyC('home_static_cache_version')}}"></script>
 
diff --git a/application/index/view/default/public/header.html b/application/index/view/default/public/header.html
index a7654ad80..118f4de1a 100755
--- a/application/index/view/default/public/header.html
+++ b/application/index/view/default/public/header.html
@@ -58,6 +58,7 @@
 	<script type="text/javascript">
 		var __root__ = '{{$public_host}}';
 		var __my_url__ = '{{$my_url}}';
+        var __my_public_url__ = '{{$my_public_url}}';
 		var __public__ = '{{$public_host}}';
 		var __default_theme__ = '{{$default_theme}}';
 		var __modal_login_url__ = '{{:Url("index/user/modallogininfo")}}';
diff --git a/public/static/common/lib/ueditor/dialogs/map/map.html b/public/static/common/lib/ueditor/dialogs/map/map.html
index 27e264dc9..8a6259b1c 100755
--- a/public/static/common/lib/ueditor/dialogs/map/map.html
+++ b/public/static/common/lib/ueditor/dialogs/map/map.html
@@ -140,7 +140,6 @@
     dialog.onok = function (){
         var center = map.getCenter();
         var zoom = map.getZoom();
-        console.log(zoom)
         var size = map.getSize();
         var mapWidth = size.width;
         var mapHeight = size.height;
diff --git a/public/static/common/lib/ueditor/dialogs/map/show.html b/public/static/common/lib/ueditor/dialogs/map/show.html
index 1d5873e79..356804e0c 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?v=2.0&ak={{common_baidu_map_ak}}"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=XSdiGjfg3wOHiKjpYEMG6CYA"></script>
 <meta http-equiv='Content-Security-Policy' content='upgrade-insecure-requests'/></head>
 
 <body onload="initMap();">