feat: 增加地理位置定位功能

src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/BootstrapAdmin.DataAccess.PetaPoco.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="6.2.7" />
+    <PackageReference Include="BootstrapBlazor" Version="6.2.8" />
     <PackageReference Include="Longbow.Security.Cryptography" Version="5.2.0" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.1" />
     <PackageReference Include="PetaPoco.Extensions" Version="5.2.0" />

src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DictService.cs

@@ -483,4 +483,25 @@ class DictService : IDict
 
         return true;
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public string? GetIpLocatorName()
+    {
+        var dicts = GetAll();
+        return dicts.FirstOrDefault(s => s.Category == "网站设置" && s.Name == "IP地理位置接口" && s.Define == EnumDictDefine.System)?.Code;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public string? GetIpLocatorUrl(string? name)
+    {
+        var dicts = GetAll();
+        return string.IsNullOrWhiteSpace(name) ? null : dicts.FirstOrDefault(s => s.Category == "地理位置" && s.Name == name && s.Define == EnumDictDefine.System)?.Code;
+    }
 }

src/blazor/admin/BootstrapAdmin.Web.Core/IDict.cs

@@ -13,6 +13,19 @@ public interface IDict
     /// <returns></returns>
     List<Dict> GetAll();
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    string? GetIpLocatorName();
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    string? GetIpLocatorUrl(string? name);
+
     /// <summary>
     /// 获得 配置所有的 App 集合
     /// </summary>

src/blazor/admin/BootstrapAdmin.Web/Components/AdminLogin.razor.cs

@@ -56,6 +56,13 @@ public partial class AdminLogin : IDisposable
     [NotNull]
     private WebClientService? WebClientService { get; set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    [Inject]
+    [NotNull]
+    private IIPLocatorProvider? IPLocatorProvider { get; set; }
+
     private string? ClassString => CssBuilder.Default("login-wrap")
         .AddClass("is-mobile", UseMobileLogin)
         .Build();
@@ -129,7 +136,12 @@ public partial class AdminLogin : IDisposable
     public async Task Log(string userName, bool result)
     {
         var clientInfo = await WebClientService.GetClientInfo();
-        LoginService.Log(userName, clientInfo.Ip, clientInfo.OS, clientInfo.Browser, clientInfo.City, clientInfo.UserAgent, result);
+        var city = "XX XX";
+        if (!string.IsNullOrEmpty(clientInfo.Ip))
+        {
+            city = await IPLocatorProvider.Locate(clientInfo.Ip);
+        }
+        LoginService.Log(userName, clientInfo.Ip, clientInfo.OS, clientInfo.Browser, city, clientInfo.UserAgent, result);
     }
 
     private void Dispose(bool disposing)

src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor.cs

@@ -62,6 +62,10 @@ namespace BootstrapAdmin.Web.Shared
         [NotNull]
         private BootstrapAppContext? AppContext { get; set; }
 
+        [Inject]
+        [NotNull]
+        private IIPLocatorProvider? IPLocatorProvider { get; set; }
+
         private string? Title { get; set; }
 
         private string? Footer { get; set; }
@@ -93,10 +97,15 @@ namespace BootstrapAdmin.Web.Shared
             {
                 // TODO: 可考虑加入队列中，通过任务管理定时插入提高效率
                 var clientInfo = await WebClientService.GetClientInfo();
+                var city = "XX XX";
+                if (!string.IsNullOrEmpty(clientInfo.Ip))
+                {
+                    city = await IPLocatorProvider.Locate(clientInfo.Ip);
+                }
                 TraceService.Log(new Trace
                 {
                     Browser = clientInfo.Browser,
-                    City = clientInfo.City,
+                    City = city,
                     Ip = clientInfo.Ip,
                     LogTime = DateTime.Now,
                     OS = clientInfo.OS,

src/blazor/admin/BootstrapAdmin.Web/Utils/LocatorHelper.cs

@@ -0,0 +1,22 @@
+using BootstrapAdmin.Web.Core;
+
+namespace BootstrapAdmin.Web.Utils;
+
+static class LocatorHelper
+{
+    public static IIPLocator CreateLocator(IServiceProvider provider)
+    {
+        var dictService = provider.GetRequiredService<IDict>();
+        var providerName = dictService.GetIpLocatorName();
+        var providerUrl = dictService.GetIpLocatorUrl(providerName ?? string.Empty);
+
+        // TODO: 稍后完善 其余地理位置定位服务
+        return providerName switch
+        {
+            "BaiDuIPSvr" => new BaiDuIPLocator(),
+            "JuheIPSvr" => new BaiDuIPLocator(),
+            "BaiDuIP138Svr" => new BaiDuIPLocator() { Url = providerUrl },
+            _ => new DefaultIPLocator()
+        };
+    }
+}