diff --git a/Directory.Packages.props b/Directory.Packages.props index dde3e0f0..a6dbd307 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -19,6 +19,7 @@ + diff --git a/XinjingdailyBot.Command/XinjingdailyBot.Command.csproj b/XinjingdailyBot.Command/XinjingdailyBot.Command.csproj index 4f2c2f7e..8be100a0 100644 --- a/XinjingdailyBot.Command/XinjingdailyBot.Command.csproj +++ b/XinjingdailyBot.Command/XinjingdailyBot.Command.csproj @@ -9,6 +9,7 @@ + diff --git a/XinjingdailyBot.Infrastructure/Model/GitHubReleaseResponse.cs b/XinjingdailyBot.Data/WebResponses/GitHubReleaseResponse.cs similarity index 97% rename from XinjingdailyBot.Infrastructure/Model/GitHubReleaseResponse.cs rename to XinjingdailyBot.Data/WebResponses/GitHubReleaseResponse.cs index f3d34bfe..a8b83e19 100644 --- a/XinjingdailyBot.Infrastructure/Model/GitHubReleaseResponse.cs +++ b/XinjingdailyBot.Data/WebResponses/GitHubReleaseResponse.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace XinjingdailyBot.Infrastructure.Model; +namespace XinjingdailyBot.Data.WebResponses; /// /// GitHubRelease响应实体 diff --git a/XinjingdailyBot.Infrastructure/Model/IpInfoResponse.cs b/XinjingdailyBot.Data/WebResponses/IpInfoResponse.cs similarity index 96% rename from XinjingdailyBot.Infrastructure/Model/IpInfoResponse.cs rename to XinjingdailyBot.Data/WebResponses/IpInfoResponse.cs index 2d265e9f..c5c230ea 100644 --- a/XinjingdailyBot.Infrastructure/Model/IpInfoResponse.cs +++ b/XinjingdailyBot.Data/WebResponses/IpInfoResponse.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace XinjingdailyBot.Infrastructure.Model; +namespace XinjingdailyBot.Data.WebResponses; /// /// IpInfo响应实体 diff --git a/XinjingdailyBot.Data/XinjingdailyBot.Data.csproj b/XinjingdailyBot.Data/XinjingdailyBot.Data.csproj new file mode 100644 index 00000000..1e503a03 --- /dev/null +++ b/XinjingdailyBot.Data/XinjingdailyBot.Data.csproj @@ -0,0 +1,24 @@ + + + + Library + + + + + + + + + + + + + + + + + + + + diff --git a/XinjingdailyBot.Interface/Helper/IHttpHelperService.cs b/XinjingdailyBot.Interface/Helper/IHttpHelperService.cs index 5b7a6e18..27b736a7 100644 --- a/XinjingdailyBot.Interface/Helper/IHttpHelperService.cs +++ b/XinjingdailyBot.Interface/Helper/IHttpHelperService.cs @@ -1,4 +1,5 @@ using System.Net; +using XinjingdailyBot.Data.WebResponses; using XinjingdailyBot.Infrastructure.Model; namespace XinjingdailyBot.Interface.Helper; diff --git a/XinjingdailyBot.Interface/XinjingdailyBot.Interface.csproj b/XinjingdailyBot.Interface/XinjingdailyBot.Interface.csproj index 2558623d..6ce5542f 100644 --- a/XinjingdailyBot.Interface/XinjingdailyBot.Interface.csproj +++ b/XinjingdailyBot.Interface/XinjingdailyBot.Interface.csproj @@ -9,6 +9,7 @@ + diff --git a/XinjingdailyBot.Service/Helper/HttpHelperService.cs b/XinjingdailyBot.Service/Helper/HttpHelperService.cs index 1e94170a..bc078e4e 100644 --- a/XinjingdailyBot.Service/Helper/HttpHelperService.cs +++ b/XinjingdailyBot.Service/Helper/HttpHelperService.cs @@ -2,11 +2,9 @@ using Microsoft.Extensions.Options; using System.Net; using System.Text.Json; -using Telegram.Bot.Requests.Abstractions; -using Telegram.Bot.Types; +using XinjingdailyBot.Data.WebResponses; using XinjingdailyBot.Infrastructure; using XinjingdailyBot.Infrastructure.Attribute; -using XinjingdailyBot.Infrastructure.Model; using XinjingdailyBot.Interface.Helper; namespace XinjingdailyBot.Service.Helper; diff --git a/XinjingdailyBot.Service/XinjingdailyBot.Service.csproj b/XinjingdailyBot.Service/XinjingdailyBot.Service.csproj index b033bc03..f99378c6 100644 --- a/XinjingdailyBot.Service/XinjingdailyBot.Service.csproj +++ b/XinjingdailyBot.Service/XinjingdailyBot.Service.csproj @@ -8,7 +8,7 @@ - + @@ -19,6 +19,7 @@ + diff --git a/XinjingdailyBot.sln b/XinjingdailyBot.sln index d49fbf2e..e8028de6 100644 --- a/XinjingdailyBot.sln +++ b/XinjingdailyBot.sln @@ -66,6 +66,8 @@ Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XinjingdailyBot.Generator", "XinjingdailyBot.Generator\XinjingdailyBot.Generator.csproj", "{0B03FD4E-0FDB-430D-A2CD-E20D67AA16B8}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XinjingdailyBot.Data", "XinjingdailyBot.Data\XinjingdailyBot.Data.csproj", "{140D17EC-EFD9-45B4-B9C0-980E63D7BB6B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -112,6 +114,10 @@ Global {0B03FD4E-0FDB-430D-A2CD-E20D67AA16B8}.Debug|Any CPU.Build.0 = Debug|Any CPU {0B03FD4E-0FDB-430D-A2CD-E20D67AA16B8}.Release|Any CPU.ActiveCfg = Release|Any CPU {0B03FD4E-0FDB-430D-A2CD-E20D67AA16B8}.Release|Any CPU.Build.0 = Release|Any CPU + {140D17EC-EFD9-45B4-B9C0-980E63D7BB6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {140D17EC-EFD9-45B4-B9C0-980E63D7BB6B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {140D17EC-EFD9-45B4-B9C0-980E63D7BB6B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {140D17EC-EFD9-45B4-B9C0-980E63D7BB6B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -126,6 +132,7 @@ Global {617EC3CE-8307-41BC-A4A5-D437CCA261AB} = {CB9524EF-39C6-4752-9620-46FCC300F6E4} {6880F608-F263-473C-9B04-7C9F9972C1ED} = {CB9524EF-39C6-4752-9620-46FCC300F6E4} {0B03FD4E-0FDB-430D-A2CD-E20D67AA16B8} = {828C8D7A-3419-455B-93DD-24BB458E5E43} + {140D17EC-EFD9-45B4-B9C0-980E63D7BB6B} = {8089C280-A2AC-419C-B7F7-DB4E2D5362C9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E88F67A6-85E8-4E55-A7BB-925F8B9CE69F}