From 2e8705b8b0f66ba49f8b21efc0aa149100556794 Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Fri, 14 Feb 2020 19:07:47 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E5=9C=B0?=
 =?UTF-8?q?=E7=90=86=E4=BD=8D=E7=BD=AE=E6=B1=89=E5=AD=97=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/SQLite/InitData.sql                        |   7 +++++++
 src/admin/Bootstrap.Admin/BootstrapAdmin.db   | Bin 102400 -> 102400 bytes
 .../Views/Admin/Settings.cshtml               |   4 ++--
 src/admin/Bootstrap.DataAccess/Dict.cs        |   2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/db/SQLite/InitData.sql b/db/SQLite/InitData.sql
index 0ff7caa0..330d6f20 100644
--- a/db/SQLite/InitData.sql
+++ b/db/SQLite/InitData.sql
@@ -55,6 +55,13 @@ INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('网站设置
 INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('网站设置', 'Cookie保留时长', '7', 0);
 
 INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('网站设置', 'IP地理位置接口', 'None', 0);
+INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('地理位置服务', '百度地图开放平台', 'BaiDuIPSvr', 0);
+INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('地理位置服务', '聚合地理位置', 'JuheIPSvr', 0);
+INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('地理位置服务', '百度138地理位置', 'BaiDuIP138Svr', 0);
+INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('地理位置', 'BaiDuIPSvr', 'http://api.map.baidu.com/location/ip?ak=6lvVPMDlm2gjLpU0aiqPsHXi2OiwGQRj&ip=', 0);
+INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('地理位置', 'JuheIPSvr', 'http://apis.juhe.cn/ip/ipNew?key=f57102d1b9fadd3f4a1c29072d0c0206&ip=', 0);
+INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('地理位置', 'BaiDuIP138Svr', 'https://sp0.baidu.com/8aQDcjqpAAV3otqbppnN2DJv/api.php?resource_id=6006&query=', 0);
+
 INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('地理位置', 'BaiDuIPSvr', 'http://api.map.baidu.com/location/ip?ak=6lvVPMDlm2gjLpU0aiqPsHXi2OiwGQRj&ip=', 0);
 INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('地理位置', 'JuheIPSvr', 'http://apis.juhe.cn/ip/ipNew?key=f57102d1b9fadd3f4a1c29072d0c0206&ip=', 0);
 INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('地理位置', 'BaiDuIP138Svr', 'https://sp0.baidu.com/8aQDcjqpAAV3otqbppnN2DJv/api.php?resource_id=6006&query=', 0);
diff --git a/src/admin/Bootstrap.Admin/BootstrapAdmin.db b/src/admin/Bootstrap.Admin/BootstrapAdmin.db
index 2ad6771db339017da9c777015643f14cb3922e87..e8c0623b05135d2e8578635defce2ff10972e422 100644
GIT binary patch
delta 219
zcmZozz}B#UZGtqT^F$eEM(2$QOU^S}u%4OBej%HU&6bUW^~`2Lfe_Yut4uZqLvwYG
zr*k$upV0PXZ}0QH>z>W&ecH9~`OJM!cP%qCwm_D0O3ZXA^$Y-t2A35XX8`pY%45;{
zqH)&K2_489y-G7uJp+K6tkQv+Y!#uJ^e}A%>UuhR-_tz}&!+5qx^wf>{tZw|ftoj0
IUTfb80A2ubkpKVy

delta 37
tcmZozz}B#UZGtqT!$cWpMu&|FOU^T!vQ<uIzmUCIP=K9nbLF-6odEIQ4V?f0

diff --git a/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml
index 680990f9..40f261b5 100644
--- a/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml
+++ b/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml
@@ -189,10 +189,10 @@
             <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>
+                    <a href="#" data-val="None">未设置</a>
                     @foreach (var ip in Model.IPLocators)
                     {
-                        <a href="#" data-val="@ip.Name">@ip.Name</a>
+                        <a href="#" data-val="@ip.Code">@ip.Name</a>
                     }
                 </div>
             </div>
diff --git a/src/admin/Bootstrap.DataAccess/Dict.cs b/src/admin/Bootstrap.DataAccess/Dict.cs
index f8255dbd..1b734e1f 100644
--- a/src/admin/Bootstrap.DataAccess/Dict.cs
+++ b/src/admin/Bootstrap.DataAccess/Dict.cs
@@ -301,6 +301,6 @@ namespace Bootstrap.DataAccess
         /// 获得字典表地理位置配置信息集合
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<BootstrapDict> RetireveLocators() => DictHelper.RetrieveDicts().Where(d => d.Category == "地理位置");
+        public IEnumerable<BootstrapDict> RetireveLocators() => DictHelper.RetrieveDicts().Where(d => d.Category == "地理位置服务");
     }
 }