From eefed96ad555a5f271a1d05048dea5cc5ecc2c9c Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Fri, 14 Feb 2020 18:05:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E7=AB=99=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=B0=E7=90=86=E4=BD=8D=E7=BD=AE=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bootstrap.Admin/Models/SettingsModel.cs   | 14 +++++++++++
 .../Views/Admin/Settings.cshtml               | 23 +++++++++++++++++++
 .../Bootstrap.Admin/wwwroot/js/settings.js    |  7 ++++++
 src/admin/Bootstrap.DataAccess/Dict.cs        |  6 +++++
 .../Bootstrap.DataAccess/Helper/DictHelper.cs |  6 +++++
 5 files changed, 56 insertions(+)

diff --git a/src/admin/Bootstrap.Admin/Models/SettingsModel.cs b/src/admin/Bootstrap.Admin/Models/SettingsModel.cs
index 0d0a5375..3e5d9327 100644
--- a/src/admin/Bootstrap.Admin/Models/SettingsModel.cs
+++ b/src/admin/Bootstrap.Admin/Models/SettingsModel.cs
@@ -19,6 +19,8 @@ namespace Bootstrap.Admin.Models
             Themes = DictHelper.RetrieveThemes();
             AutoLockScreen = EnableAutoLockScreen;
             DefaultApp = DictHelper.RetrieveDefaultApp();
+            IPLocators = DictHelper.RetireveLocators();
+            IPLocatorSvr = DictHelper.RetrieveLocaleIPSvr();
         }
 
         /// <summary>
@@ -26,6 +28,18 @@ namespace Bootstrap.Admin.Models
         /// </summary>
         public IEnumerable<BootstrapDict> Themes { get; }
 
+        /// <summary>
+        /// 获得 地理位置信息集合
+        /// </summary>
+        /// <value></value>
+        public IEnumerable<BootstrapDict> IPLocators { get; }
+
+        /// <summary>
+        /// 获得 数据库中配置的地理位置信息接口
+        /// </summary>
+        /// <value></value>
+        public string IPLocatorSvr { get; }
+
         /// <summary>
         /// 获得 是否开启自动锁屏
         /// </summary>
diff --git a/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml
index dca14ca3..680990f9 100644
--- a/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml
+++ b/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml
@@ -179,6 +179,29 @@
         </div>
     </div>
 </div>
+<div class="card" asp-auth="iplocate">
+    <div class="card-header">地址位置信息</div>
+    <div class="card-body">
+        <div class="alert alert-danger" role="alert" asp-condition="@Model.IsDemo">
+            <span>演示系统禁止更改地理信息配置</span>
+        </div>
+        <div class="form-group">
+            <div class="btn-group" role="group">
+                <button id="iplocator" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown" data-default-val="None" value="@Model.IPLocatorSvr">@Model.IPLocatorSvr</button>
+                <div class="dropdown-menu">
+                    <a href="#" data-val="None">None</a>
+                    @foreach (var ip in Model.IPLocators)
+                    {
+                        <a href="#" data-val="@ip.Name">@ip.Name</a>
+                    }
+                </div>
+            </div>
+        </div>
+        <div class="modal-footer text-right" asp-condition="@(!Model.IsDemo)">
+            <button data-method="saveIpLocator" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
+        </div>
+    </div>
+</div>
 <div class="card">
     <div class="card-header">
         <div class="d-flex align-items-center">
diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/settings.js b/src/admin/Bootstrap.Admin/wwwroot/js/settings.js
index ff253a2f..0bf4f310 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/js/settings.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/settings.js
@@ -92,6 +92,12 @@ $(function () {
                     }
                 });
                 break;
+            case 'saveIpLocator':
+                var iplocator = $iplocator.val();
+                $.bc({
+                    url: Settings.url, data: [{ name: 'IP地理位置接口', code: iplocator, category: '网站设置' }], title: '保存地理位置服务设置', method: "post"
+                });
+                break;
         }
     });
 
@@ -158,4 +164,5 @@ $(function () {
     });
 
     var $css = $('#dictCssDefine').dropdown('val');
+    var $iplocator = $('#iplocator').dropdown('val');
 });
\ No newline at end of file
diff --git a/src/admin/Bootstrap.DataAccess/Dict.cs b/src/admin/Bootstrap.DataAccess/Dict.cs
index 1ff3eece..f8255dbd 100644
--- a/src/admin/Bootstrap.DataAccess/Dict.cs
+++ b/src/admin/Bootstrap.DataAccess/Dict.cs
@@ -296,5 +296,11 @@ namespace Bootstrap.DataAccess
         /// </summary>
         /// <returns></returns>
         public bool RetrieveFixedTableHeader() => (DictHelper.RetrieveDicts().FirstOrDefault(d => d.Category == "网站设置" && d.Name == "固定表头" && d.Define == 0)?.Code ?? "1") == "1";
+
+        /// <summary>
+        /// 获得字典表地理位置配置信息集合
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<BootstrapDict> RetireveLocators() => DictHelper.RetrieveDicts().Where(d => d.Category == "地理位置");
     }
 }
diff --git a/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs
index b6216c13..7e736799 100644
--- a/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs
+++ b/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs
@@ -281,5 +281,11 @@ namespace Bootstrap.DataAccess
         /// </summary>
         /// <returns></returns>
         public static bool RetrieveFixedTableHeader() => DbContextManager.Create<Dict>()?.RetrieveFixedTableHeader() ?? false;
+
+        /// <summary>
+        /// 获得字典表地理位置配置信息集合
+        /// </summary>
+        /// <returns></returns>
+        public static IEnumerable<BootstrapDict> RetireveLocators() => DbContextManager.Create<Dict>()?.RetireveLocators() ?? new BootstrapDict[0];
     }
 }