From c9530ac8b5bf7c78a95e0394b219bfc09d2d69d1 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Sun, 14 Dec 2025 03:19:08 +0800 Subject: [PATCH] :truck: Rename GeoIP service --- DysonNetwork.Pass/Account/AccountController.cs | 4 ++-- DysonNetwork.Pass/Account/ActionLogService.cs | 4 ++-- DysonNetwork.Pass/Auth/AuthController.cs | 4 ++-- DysonNetwork.Pass/Auth/AuthService.cs | 4 ++-- .../Migrations/20250907065433_RefactorGeoIpPoint.cs | 2 +- .../20251003061315_AddSubscriptionGift.Designer.cs | 2 +- .../Migrations/20251003061315_AddSubscriptionGift.cs | 1 - .../20251003123103_RefactorSubscriptionRelation.Designer.cs | 2 +- .../Migrations/20251003152102_AddWalletFund.Designer.cs | 2 +- .../Migrations/20251008050851_AddUsernameColor.Designer.cs | 2 +- .../20251021153439_AddRealmFromSphere.Designer.cs | 2 +- .../Migrations/20251022164134_RemoveChatRoom.Designer.cs | 2 +- .../Migrations/20251023173204_AddLotteries.Designer.cs | 2 +- .../20251024154539_AddDetailLotteriesStatus.Designer.cs | 2 +- .../20251101092348_AddPresenceActivity.Designer.cs | 2 +- .../20251101142549_EnrichPresenceActivity.Designer.cs | 2 +- .../20251101175500_AddSocialCreditRecordStatus.Designer.cs | 2 +- .../Migrations/20251116153151_OpenableFunds.Designer.cs | 2 +- .../20251116163407_OpenFundsTotalSplits.Designer.cs | 2 +- ...251129095046_DecoupleAuthSessionAndChallenge.Designer.cs | 2 +- .../20251201145617_AddAffiliationSpell.Designer.cs | 2 +- .../20251202134035_SimplifiedPermissionNode.Designer.cs | 2 +- .../20251202160759_SimplifiedAuthSession.Designer.cs | 2 +- .../20251203163459_AddLocationToSession.Designer.cs | 2 +- .../Migrations/20251203163459_AddLocationToSession.cs | 2 +- DysonNetwork.Pass/Migrations/AppDatabaseModelSnapshot.cs | 2 +- DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs | 6 +++--- DysonNetwork.Shared/{GeoIp => Geometry}/GeoPoint.cs | 2 +- .../{GeoIp/GeoIpService.cs => Geometry/GeoService.cs} | 6 +++--- DysonNetwork.Shared/Models/ActionLog.cs | 2 +- DysonNetwork.Shared/Models/AuthSession.cs | 2 +- DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs | 6 +++--- DysonNetwork.Zone/Startup/ServiceCollectionExtensions.cs | 6 +++--- 33 files changed, 44 insertions(+), 45 deletions(-) rename DysonNetwork.Shared/{GeoIp => Geometry}/GeoPoint.cs (85%) rename DysonNetwork.Shared/{GeoIp/GeoIpService.cs => Geometry/GeoService.cs} (91%) diff --git a/DysonNetwork.Pass/Account/AccountController.cs b/DysonNetwork.Pass/Account/AccountController.cs index def2d917..624d736b 100644 --- a/DysonNetwork.Pass/Account/AccountController.cs +++ b/DysonNetwork.Pass/Account/AccountController.cs @@ -5,7 +5,7 @@ using DysonNetwork.Pass.Credit; using DysonNetwork.Pass.Permission; using DysonNetwork.Pass.Wallet; using DysonNetwork.Shared.Auth; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Http; using DysonNetwork.Shared.Models; using Microsoft.AspNetCore.Authorization; @@ -25,7 +25,7 @@ public class AccountController( AccountEventService events, SocialCreditService socialCreditService, AffiliationSpellService ars, - GeoIpService geo + GeoService geo ) : ControllerBase { [HttpGet("{name}")] diff --git a/DysonNetwork.Pass/Account/ActionLogService.cs b/DysonNetwork.Pass/Account/ActionLogService.cs index 9801b3dd..4ed1eb8b 100644 --- a/DysonNetwork.Pass/Account/ActionLogService.cs +++ b/DysonNetwork.Pass/Account/ActionLogService.cs @@ -1,10 +1,10 @@ using DysonNetwork.Shared.Cache; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; namespace DysonNetwork.Pass.Account; -public class ActionLogService(GeoIpService geo, FlushBufferService fbs) +public class ActionLogService(GeoService geo, FlushBufferService fbs) { public void CreateActionLog(Guid accountId, string action, Dictionary meta) { diff --git a/DysonNetwork.Pass/Auth/AuthController.cs b/DysonNetwork.Pass/Auth/AuthController.cs index 2edafec8..a0cb2b72 100644 --- a/DysonNetwork.Pass/Auth/AuthController.cs +++ b/DysonNetwork.Pass/Auth/AuthController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc; using NodaTime; using Microsoft.EntityFrameworkCore; using DysonNetwork.Pass.Localization; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Proto; using Microsoft.Extensions.Localization; using AccountService = DysonNetwork.Pass.Account.AccountService; @@ -18,7 +18,7 @@ public class AuthController( AppDatabase db, AccountService accounts, AuthService auth, - GeoIpService geo, + GeoService geo, ActionLogService als, RingService.RingServiceClient pusher, IConfiguration configuration, diff --git a/DysonNetwork.Pass/Auth/AuthService.cs b/DysonNetwork.Pass/Auth/AuthService.cs index a5fafb5b..75791906 100644 --- a/DysonNetwork.Pass/Auth/AuthService.cs +++ b/DysonNetwork.Pass/Auth/AuthService.cs @@ -3,7 +3,7 @@ using System.Text.Json; using System.Text.Json.Serialization; using DysonNetwork.Shared.Cache; using DysonNetwork.Shared.Data; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using NodaTime; @@ -16,7 +16,7 @@ public class AuthService( IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ICacheService cache, - GeoIpService geo + GeoService geo ) { private HttpContext HttpContext => httpContextAccessor.HttpContext!; diff --git a/DysonNetwork.Pass/Migrations/20250907065433_RefactorGeoIpPoint.cs b/DysonNetwork.Pass/Migrations/20250907065433_RefactorGeoIpPoint.cs index f3658472..894f089d 100644 --- a/DysonNetwork.Pass/Migrations/20250907065433_RefactorGeoIpPoint.cs +++ b/DysonNetwork.Pass/Migrations/20250907065433_RefactorGeoIpPoint.cs @@ -1,4 +1,4 @@ -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using Microsoft.EntityFrameworkCore.Migrations; using NetTopologySuite.Geometries; diff --git a/DysonNetwork.Pass/Migrations/20251003061315_AddSubscriptionGift.Designer.cs b/DysonNetwork.Pass/Migrations/20251003061315_AddSubscriptionGift.Designer.cs index f8a4ae19..d3afdd9e 100644 --- a/DysonNetwork.Pass/Migrations/20251003061315_AddSubscriptionGift.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251003061315_AddSubscriptionGift.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251003061315_AddSubscriptionGift.cs b/DysonNetwork.Pass/Migrations/20251003061315_AddSubscriptionGift.cs index 6e857bd5..2e002af4 100644 --- a/DysonNetwork.Pass/Migrations/20251003061315_AddSubscriptionGift.cs +++ b/DysonNetwork.Pass/Migrations/20251003061315_AddSubscriptionGift.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Text.Json; -using DysonNetwork.Shared.GeoIp; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore.Migrations; using NodaTime; diff --git a/DysonNetwork.Pass/Migrations/20251003123103_RefactorSubscriptionRelation.Designer.cs b/DysonNetwork.Pass/Migrations/20251003123103_RefactorSubscriptionRelation.Designer.cs index 53824fd9..26c96a42 100644 --- a/DysonNetwork.Pass/Migrations/20251003123103_RefactorSubscriptionRelation.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251003123103_RefactorSubscriptionRelation.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251003152102_AddWalletFund.Designer.cs b/DysonNetwork.Pass/Migrations/20251003152102_AddWalletFund.Designer.cs index d6defee8..d23f6fa1 100644 --- a/DysonNetwork.Pass/Migrations/20251003152102_AddWalletFund.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251003152102_AddWalletFund.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251008050851_AddUsernameColor.Designer.cs b/DysonNetwork.Pass/Migrations/20251008050851_AddUsernameColor.Designer.cs index 92fc365e..946d1917 100644 --- a/DysonNetwork.Pass/Migrations/20251008050851_AddUsernameColor.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251008050851_AddUsernameColor.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251021153439_AddRealmFromSphere.Designer.cs b/DysonNetwork.Pass/Migrations/20251021153439_AddRealmFromSphere.Designer.cs index e435aea8..f83b2e2a 100644 --- a/DysonNetwork.Pass/Migrations/20251021153439_AddRealmFromSphere.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251021153439_AddRealmFromSphere.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251022164134_RemoveChatRoom.Designer.cs b/DysonNetwork.Pass/Migrations/20251022164134_RemoveChatRoom.Designer.cs index 4babc357..276e081f 100644 --- a/DysonNetwork.Pass/Migrations/20251022164134_RemoveChatRoom.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251022164134_RemoveChatRoom.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251023173204_AddLotteries.Designer.cs b/DysonNetwork.Pass/Migrations/20251023173204_AddLotteries.Designer.cs index c7e4f3ba..5fde9c96 100644 --- a/DysonNetwork.Pass/Migrations/20251023173204_AddLotteries.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251023173204_AddLotteries.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251024154539_AddDetailLotteriesStatus.Designer.cs b/DysonNetwork.Pass/Migrations/20251024154539_AddDetailLotteriesStatus.Designer.cs index 5bdd5ceb..d95d0bcb 100644 --- a/DysonNetwork.Pass/Migrations/20251024154539_AddDetailLotteriesStatus.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251024154539_AddDetailLotteriesStatus.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251101092348_AddPresenceActivity.Designer.cs b/DysonNetwork.Pass/Migrations/20251101092348_AddPresenceActivity.Designer.cs index 4fdb63e0..364eac8b 100644 --- a/DysonNetwork.Pass/Migrations/20251101092348_AddPresenceActivity.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251101092348_AddPresenceActivity.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251101142549_EnrichPresenceActivity.Designer.cs b/DysonNetwork.Pass/Migrations/20251101142549_EnrichPresenceActivity.Designer.cs index 581cbdb9..35d5d1d4 100644 --- a/DysonNetwork.Pass/Migrations/20251101142549_EnrichPresenceActivity.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251101142549_EnrichPresenceActivity.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251101175500_AddSocialCreditRecordStatus.Designer.cs b/DysonNetwork.Pass/Migrations/20251101175500_AddSocialCreditRecordStatus.Designer.cs index 0b0c6533..b578f76b 100644 --- a/DysonNetwork.Pass/Migrations/20251101175500_AddSocialCreditRecordStatus.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251101175500_AddSocialCreditRecordStatus.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251116153151_OpenableFunds.Designer.cs b/DysonNetwork.Pass/Migrations/20251116153151_OpenableFunds.Designer.cs index ff63da67..18dcefa5 100644 --- a/DysonNetwork.Pass/Migrations/20251116153151_OpenableFunds.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251116153151_OpenableFunds.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251116163407_OpenFundsTotalSplits.Designer.cs b/DysonNetwork.Pass/Migrations/20251116163407_OpenFundsTotalSplits.Designer.cs index aa4876cb..ca5df1c7 100644 --- a/DysonNetwork.Pass/Migrations/20251116163407_OpenFundsTotalSplits.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251116163407_OpenFundsTotalSplits.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251129095046_DecoupleAuthSessionAndChallenge.Designer.cs b/DysonNetwork.Pass/Migrations/20251129095046_DecoupleAuthSessionAndChallenge.Designer.cs index dac79795..afcee60e 100644 --- a/DysonNetwork.Pass/Migrations/20251129095046_DecoupleAuthSessionAndChallenge.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251129095046_DecoupleAuthSessionAndChallenge.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251201145617_AddAffiliationSpell.Designer.cs b/DysonNetwork.Pass/Migrations/20251201145617_AddAffiliationSpell.Designer.cs index 959e4f1d..fff27e10 100644 --- a/DysonNetwork.Pass/Migrations/20251201145617_AddAffiliationSpell.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251201145617_AddAffiliationSpell.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251202134035_SimplifiedPermissionNode.Designer.cs b/DysonNetwork.Pass/Migrations/20251202134035_SimplifiedPermissionNode.Designer.cs index 52598be9..a58eb52c 100644 --- a/DysonNetwork.Pass/Migrations/20251202134035_SimplifiedPermissionNode.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251202134035_SimplifiedPermissionNode.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251202160759_SimplifiedAuthSession.Designer.cs b/DysonNetwork.Pass/Migrations/20251202160759_SimplifiedAuthSession.Designer.cs index fa5cc679..0c1217c7 100644 --- a/DysonNetwork.Pass/Migrations/20251202160759_SimplifiedAuthSession.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251202160759_SimplifiedAuthSession.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251203163459_AddLocationToSession.Designer.cs b/DysonNetwork.Pass/Migrations/20251203163459_AddLocationToSession.Designer.cs index a71ee3b9..459b946b 100644 --- a/DysonNetwork.Pass/Migrations/20251203163459_AddLocationToSession.Designer.cs +++ b/DysonNetwork.Pass/Migrations/20251203163459_AddLocationToSession.Designer.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Migrations/20251203163459_AddLocationToSession.cs b/DysonNetwork.Pass/Migrations/20251203163459_AddLocationToSession.cs index 2afe6eb6..ff64456e 100644 --- a/DysonNetwork.Pass/Migrations/20251203163459_AddLocationToSession.cs +++ b/DysonNetwork.Pass/Migrations/20251203163459_AddLocationToSession.cs @@ -1,4 +1,4 @@ -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using Microsoft.EntityFrameworkCore.Migrations; #nullable disable diff --git a/DysonNetwork.Pass/Migrations/AppDatabaseModelSnapshot.cs b/DysonNetwork.Pass/Migrations/AppDatabaseModelSnapshot.cs index a2f3dd7c..9c5cba0c 100644 --- a/DysonNetwork.Pass/Migrations/AppDatabaseModelSnapshot.cs +++ b/DysonNetwork.Pass/Migrations/AppDatabaseModelSnapshot.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text.Json; using DysonNetwork.Pass; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs b/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs index cdeb9086..d7f73dca 100644 --- a/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs +++ b/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs @@ -23,7 +23,7 @@ using DysonNetwork.Pass.Realm; using DysonNetwork.Pass.Safety; using DysonNetwork.Pass.Wallet.PaymentHandlers; using DysonNetwork.Shared.Cache; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Registry; namespace DysonNetwork.Pass.Startup; @@ -135,8 +135,8 @@ public static class ServiceCollectionExtensions IConfiguration configuration) { services.AddScoped(); - services.Configure(configuration.GetSection("GeoIP")); - services.AddScoped(); + services.Configure(configuration.GetSection("GeoIP")); + services.AddScoped(); services.AddScoped(); services.AddScoped(); services.AddScoped(); diff --git a/DysonNetwork.Shared/GeoIp/GeoPoint.cs b/DysonNetwork.Shared/Geometry/GeoPoint.cs similarity index 85% rename from DysonNetwork.Shared/GeoIp/GeoPoint.cs rename to DysonNetwork.Shared/Geometry/GeoPoint.cs index 8c8b04e4..adc43826 100644 --- a/DysonNetwork.Shared/GeoIp/GeoPoint.cs +++ b/DysonNetwork.Shared/Geometry/GeoPoint.cs @@ -1,4 +1,4 @@ -namespace DysonNetwork.Shared.GeoIp; +namespace DysonNetwork.Shared.Geometry; public class GeoPoint { diff --git a/DysonNetwork.Shared/GeoIp/GeoIpService.cs b/DysonNetwork.Shared/Geometry/GeoService.cs similarity index 91% rename from DysonNetwork.Shared/GeoIp/GeoIpService.cs rename to DysonNetwork.Shared/Geometry/GeoService.cs index a3bdd778..c3ede120 100644 --- a/DysonNetwork.Shared/GeoIp/GeoIpService.cs +++ b/DysonNetwork.Shared/Geometry/GeoService.cs @@ -1,14 +1,14 @@ using MaxMind.GeoIP2; using Microsoft.Extensions.Options; -namespace DysonNetwork.Shared.GeoIp; +namespace DysonNetwork.Shared.Geometry; -public class GeoIpOptions +public class GeoOptions { public string DatabasePath { get; set; } = null!; } -public class GeoIpService(IOptions options) +public class GeoService(IOptions options) { private readonly string _databasePath = options.Value.DatabasePath; diff --git a/DysonNetwork.Shared/Models/ActionLog.cs b/DysonNetwork.Shared/Models/ActionLog.cs index 0571ff8f..1ec5f76f 100644 --- a/DysonNetwork.Shared/Models/ActionLog.cs +++ b/DysonNetwork.Shared/Models/ActionLog.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Proto; using NodaTime.Serialization.Protobuf; diff --git a/DysonNetwork.Shared/Models/AuthSession.cs b/DysonNetwork.Shared/Models/AuthSession.cs index d40926a7..c5fcdb39 100644 --- a/DysonNetwork.Shared/Models/AuthSession.cs +++ b/DysonNetwork.Shared/Models/AuthSession.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Proto; using NodaTime; using NodaTime.Serialization.Protobuf; diff --git a/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs b/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs index 7e008709..dd404666 100644 --- a/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs +++ b/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Text.Json; using System.Text.Json.Serialization; using DysonNetwork.Shared.Cache; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Sphere.Autocompletion; using DysonNetwork.Sphere.Chat; using DysonNetwork.Sphere.Chat.Realtime; @@ -87,8 +87,8 @@ public static class ServiceCollectionExtensions IConfiguration configuration ) { - services.Configure(configuration.GetSection("GeoIP")); - services.AddScoped(); + services.Configure(configuration.GetSection("GeoIP")); + services.AddScoped(); services.AddScoped(); services.AddScoped(); services.AddScoped(); diff --git a/DysonNetwork.Zone/Startup/ServiceCollectionExtensions.cs b/DysonNetwork.Zone/Startup/ServiceCollectionExtensions.cs index 437730f2..e07bd394 100644 --- a/DysonNetwork.Zone/Startup/ServiceCollectionExtensions.cs +++ b/DysonNetwork.Zone/Startup/ServiceCollectionExtensions.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Text.Json; using System.Text.Json.Serialization; using DysonNetwork.Shared.Cache; -using DysonNetwork.Shared.GeoIp; +using DysonNetwork.Shared.Geometry; using DysonNetwork.Zone.Publication; using NodaTime; using NodaTime.Serialization.SystemTextJson; @@ -73,8 +73,8 @@ public static class ServiceCollectionExtensions IConfiguration configuration ) { - services.Configure(configuration.GetSection("GeoIP")); - services.AddScoped(); + services.Configure(configuration.GetSection("GeoIP")); + services.AddScoped(); services.AddScoped(); services.AddScoped();