update

chr233 · Jun 11, 2024 · f31284d · f31284d
1 parent 56ab2f6
commit f31284d
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 6 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -19,6 +19,7 @@
     <PackageVersion Include="Quartz.AspNetCore" Version="3.8.1" />
     <PackageVersion Include="SkiaSharp" Version="2.88.8" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
     <PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="2.88.8" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="2.88.8" />
     <PackageVersion Include="SqlSugar.IOC" Version="2.0.0" />

diff --git a/XinjingdailyBot.Command/XinjingdailyBot.Command.csproj b/XinjingdailyBot.Command/XinjingdailyBot.Command.csproj
@@ -9,6 +9,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\XinjingdailyBot.Data\XinjingdailyBot.Data.csproj" />
 		<ProjectReference Include="..\XinjingdailyBot.Infrastructure\XinjingdailyBot.Infrastructure.csproj" />
 		<ProjectReference Include="..\XinjingdailyBot.Interface\XinjingdailyBot.Interface.csproj" />
 		<ProjectReference Include="..\XinjingdailyBot.Model\XinjingdailyBot.Model.csproj" />

diff --git a/...astructure/Model/GitHubReleaseResponse.cs → ...ata/WebResponses/GitHubReleaseResponse.cs b/...astructure/Model/GitHubReleaseResponse.cs → ...ata/WebResponses/GitHubReleaseResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace XinjingdailyBot.Infrastructure.Model;
+namespace XinjingdailyBot.Data.WebResponses;
 
 /// <summary>
 /// GitHubRelease响应实体

diff --git a/...ot.Infrastructure/Model/IpInfoResponse.cs → ...lyBot.Data/WebResponses/IpInfoResponse.cs b/...ot.Infrastructure/Model/IpInfoResponse.cs → ...lyBot.Data/WebResponses/IpInfoResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace XinjingdailyBot.Infrastructure.Model;
+namespace XinjingdailyBot.Data.WebResponses;
 
 /// <summary>
 /// IpInfo响应实体

diff --git a/XinjingdailyBot.Data/XinjingdailyBot.Data.csproj b/XinjingdailyBot.Data/XinjingdailyBot.Data.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Library</OutputType>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="SqlSugarCore" />
+		<PackageReference Include="ConfigureAwaitChecker.Analyzer" PrivateAssets="all" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="..\.editorconfig" Link=".editorconfig" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\XinjingdailyBot.Infrastructure\XinjingdailyBot.Infrastructure.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Folder Include="Bot\" />
+	</ItemGroup>
+
+</Project>
diff --git 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
@@ -9,6 +9,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\XinjingdailyBot.Data\XinjingdailyBot.Data.csproj" />
 		<ProjectReference Include="..\XinjingdailyBot.Infrastructure\XinjingdailyBot.Infrastructure.csproj" />
 		<ProjectReference Include="..\XinjingdailyBot.Model\XinjingdailyBot.Model.csproj" />
 		<ProjectReference Include="..\XinjingdailyBot.Repository\XinjingdailyBot.Repository.csproj" />

diff --git 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
@@ -8,7 +8,7 @@
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
 		<PackageReference Include="Microsoft.Extensions.Http" />
 		<PackageReference Include="SkiaSharp" />
-		<PackageReference Include="SkiaSharp.NativeAssets.Linux" />
+		<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" />
 		<PackageReference Include="SkiaSharp.NativeAssets.macOS" />
 		<PackageReference Include="SkiaSharp.NativeAssets.Win32" />
 		<PackageReference Include="ConfigureAwaitChecker.Analyzer" PrivateAssets="all" />
@@ -19,6 +19,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\XinjingdailyBot.Data\XinjingdailyBot.Data.csproj" />
 		<ProjectReference Include="..\XinjingdailyBot.Infrastructure\XinjingdailyBot.Infrastructure.csproj" />
 		<ProjectReference Include="..\XinjingdailyBot.Interface\XinjingdailyBot.Interface.csproj" />
 		<ProjectReference Include="..\XinjingdailyBot.Model\XinjingdailyBot.Model.csproj" />

diff --git 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}