diff --git a/src/ZonyLrcTools.Cli/Commands/SubCommand/DownloadCommand.cs b/src/ZonyLrcTools.Cli/Commands/SubCommand/DownloadCommand.cs index e8500a6..947dcc2 100644 --- a/src/ZonyLrcTools.Cli/Commands/SubCommand/DownloadCommand.cs +++ b/src/ZonyLrcTools.Cli/Commands/SubCommand/DownloadCommand.cs @@ -10,13 +10,13 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using ZonyLrcTools.Cli.Infrastructure; using ZonyLrcTools.Cli.Infrastructure.Album; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; using ZonyLrcTools.Cli.Infrastructure.Extensions; using ZonyLrcTools.Cli.Infrastructure.IO; using ZonyLrcTools.Cli.Infrastructure.Lyric; using ZonyLrcTools.Cli.Infrastructure.Tag; using ZonyLrcTools.Cli.Infrastructure.Threading; using ZonyLrcTools.Common.Configuration; +using ZonyLrcTools.Common.Infrastructure.Exceptions; using File = System.IO.File; namespace ZonyLrcTools.Cli.Commands.SubCommand diff --git a/src/ZonyLrcTools.Cli/Commands/SubCommand/UtilityCommand.cs b/src/ZonyLrcTools.Cli/Commands/SubCommand/UtilityCommand.cs index 5ec4879..8c048b0 100644 --- a/src/ZonyLrcTools.Cli/Commands/SubCommand/UtilityCommand.cs +++ b/src/ZonyLrcTools.Cli/Commands/SubCommand/UtilityCommand.cs @@ -6,10 +6,10 @@ using System.Threading.Tasks; using McMaster.Extensions.CommandLineUtils; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; using ZonyLrcTools.Cli.Infrastructure.IO; using ZonyLrcTools.Cli.Infrastructure.MusicDecryption; using ZonyLrcTools.Cli.Infrastructure.Threading; +using ZonyLrcTools.Common.Infrastructure.Exceptions; namespace ZonyLrcTools.Cli.Commands.SubCommand { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Album/NetEase/NetEaseAlbumDownloader.cs b/src/ZonyLrcTools.Cli/Infrastructure/Album/NetEase/NetEaseAlbumDownloader.cs index 0202118..6f96d36 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Album/NetEase/NetEaseAlbumDownloader.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Album/NetEase/NetEaseAlbumDownloader.cs @@ -3,10 +3,10 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; using Newtonsoft.Json.Linq; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; using ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase.JsonModel; -using ZonyLrcTools.Cli.Infrastructure.Network; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; +using ZonyLrcTools.Common.Infrastructure.Exceptions; +using ZonyLrcTools.Common.Infrastructure.Network; namespace ZonyLrcTools.Cli.Infrastructure.Album.NetEase { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Album/QQMusic/QQMusicAlbumDownloader.cs b/src/ZonyLrcTools.Cli/Infrastructure/Album/QQMusic/QQMusicAlbumDownloader.cs index 3236768..5cf3c0f 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Album/QQMusic/QQMusicAlbumDownloader.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Album/QQMusic/QQMusicAlbumDownloader.cs @@ -2,9 +2,9 @@ using System; using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; using ZonyLrcTools.Cli.Infrastructure.Lyric.QQMusic.JsonModel; -using ZonyLrcTools.Cli.Infrastructure.Network; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; +using ZonyLrcTools.Common.Infrastructure.Network; namespace ZonyLrcTools.Cli.Infrastructure.Album.QQMusic { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Extensions/LoggerExtensions.cs b/src/ZonyLrcTools.Cli/Infrastructure/Extensions/LoggerExtensions.cs index a4aa961..8f5bb6d 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Extensions/LoggerExtensions.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Extensions/LoggerExtensions.cs @@ -2,7 +2,7 @@ using System; using System.Text; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; +using ZonyLrcTools.Common.Infrastructure.Exceptions; namespace ZonyLrcTools.Cli.Infrastructure.Extensions { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/IO/FileScanner.cs b/src/ZonyLrcTools.Cli/Infrastructure/IO/FileScanner.cs index 7c84787..ef8a010 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/IO/FileScanner.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/IO/FileScanner.cs @@ -6,9 +6,9 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; using ZonyLrcTools.Cli.Infrastructure.Extensions; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; +using ZonyLrcTools.Common.Infrastructure.Exceptions; namespace ZonyLrcTools.Cli.Infrastructure.IO { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/KuGou/KuGourLyricDownloader.cs b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/KuGou/KuGourLyricDownloader.cs index df5bbc1..8a06221 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/KuGou/KuGourLyricDownloader.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/KuGou/KuGourLyricDownloader.cs @@ -3,10 +3,10 @@ using System.Text; using System.Threading.Tasks; using Microsoft.Extensions.Options; using Newtonsoft.Json.Linq; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; using ZonyLrcTools.Cli.Infrastructure.Lyric.KuGou.JsonModel; -using ZonyLrcTools.Cli.Infrastructure.Network; using ZonyLrcTools.Common.Configuration; +using ZonyLrcTools.Common.Infrastructure.Exceptions; +using ZonyLrcTools.Common.Infrastructure.Network; namespace ZonyLrcTools.Cli.Infrastructure.Lyric.KuGou { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricDownloader.cs b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricDownloader.cs index 32bf3fc..16ceac6 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricDownloader.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricDownloader.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; +using ZonyLrcTools.Common.Infrastructure.Exceptions; namespace ZonyLrcTools.Cli.Infrastructure.Lyric { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollection.cs b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollection.cs index f326f97..dbce48d 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollection.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollection.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using ZonyLrcTools.Cli.Infrastructure.Extensions; using ZonyLrcTools.Common.Configuration; +using ZonyLrcTools.Common.Infrastructure.Extensions; namespace ZonyLrcTools.Cli.Infrastructure.Lyric { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollectionFactory.cs b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollectionFactory.cs index af6cc30..ec79ea7 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollectionFactory.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollectionFactory.cs @@ -1,7 +1,7 @@ using System.Text.RegularExpressions; using Microsoft.Extensions.Options; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; using ZonyLrcTools.Common.Configuration; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; namespace ZonyLrcTools.Cli.Infrastructure.Lyric { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/NetEase/NetEaseLyricDownloader.cs b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/NetEase/NetEaseLyricDownloader.cs index e4140f2..bacfcc9 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/NetEase/NetEaseLyricDownloader.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/NetEase/NetEaseLyricDownloader.cs @@ -4,10 +4,10 @@ using System.Text; using System.Threading.Tasks; using Microsoft.Extensions.Options; using Newtonsoft.Json; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; using ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase.JsonModel; -using ZonyLrcTools.Cli.Infrastructure.Network; using ZonyLrcTools.Common.Configuration; +using ZonyLrcTools.Common.Infrastructure.Exceptions; +using ZonyLrcTools.Common.Infrastructure.Network; namespace ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/QQMusic/QQLyricDownloader.cs b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/QQMusic/QQLyricDownloader.cs index e22c17a..a8ffc24 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/QQMusic/QQLyricDownloader.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/QQMusic/QQLyricDownloader.cs @@ -4,9 +4,9 @@ using System.Text; using System.Threading.Tasks; using System.Web; using Newtonsoft.Json.Linq; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; using ZonyLrcTools.Cli.Infrastructure.Lyric.QQMusic.JsonModel; -using ZonyLrcTools.Cli.Infrastructure.Network; +using ZonyLrcTools.Common.Infrastructure.Exceptions; +using ZonyLrcTools.Common.Infrastructure.Network; namespace ZonyLrcTools.Cli.Infrastructure.Lyric.QQMusic { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/MusicDecryption/NcmMusicDecryptor.cs b/src/ZonyLrcTools.Cli/Infrastructure/MusicDecryption/NcmMusicDecryptor.cs index 8317eba..329d35d 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/MusicDecryption/NcmMusicDecryptor.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/MusicDecryption/NcmMusicDecryptor.cs @@ -5,7 +5,7 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; using Newtonsoft.Json.Linq; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; namespace ZonyLrcTools.Cli.Infrastructure.MusicDecryption { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Tag/BlockWordDictionary.cs b/src/ZonyLrcTools.Cli/Infrastructure/Tag/BlockWordDictionary.cs index c30e2bc..6be338b 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Tag/BlockWordDictionary.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Tag/BlockWordDictionary.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.IO; using Microsoft.Extensions.Options; using Newtonsoft.Json; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; using ZonyLrcTools.Common.Configuration; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; namespace ZonyLrcTools.Cli.Infrastructure.Tag { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Tag/DefaultTagLoader.cs b/src/ZonyLrcTools.Cli/Infrastructure/Tag/DefaultTagLoader.cs index dd88377..c88a030 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Tag/DefaultTagLoader.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Tag/DefaultTagLoader.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; using ZonyLrcTools.Common.Configuration; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; +using ZonyLrcTools.Common.Infrastructure.Exceptions; namespace ZonyLrcTools.Cli.Infrastructure.Tag { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Tag/FileNameTagInfoProvider.cs b/src/ZonyLrcTools.Cli/Infrastructure/Tag/FileNameTagInfoProvider.cs index 7856ccf..287146a 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Tag/FileNameTagInfoProvider.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Tag/FileNameTagInfoProvider.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; using Microsoft.Extensions.Options; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; using ZonyLrcTools.Common.Configuration; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; namespace ZonyLrcTools.Cli.Infrastructure.Tag { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Tag/TaglibTagInfoProvider.cs b/src/ZonyLrcTools.Cli/Infrastructure/Tag/TaglibTagInfoProvider.cs index c3d18a6..e20d58a 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Tag/TaglibTagInfoProvider.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Tag/TaglibTagInfoProvider.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; +using ZonyLrcTools.Common.Infrastructure.Exceptions; namespace ZonyLrcTools.Cli.Infrastructure.Tag { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Updater/DefaultUpdater.cs b/src/ZonyLrcTools.Cli/Infrastructure/Updater/DefaultUpdater.cs index dd90baf..4b38225 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Updater/DefaultUpdater.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Updater/DefaultUpdater.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; -using ZonyLrcTools.Cli.Infrastructure.Network; using ZonyLrcTools.Cli.Infrastructure.Updater.JsonModel; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; +using ZonyLrcTools.Common.Infrastructure.Network; namespace ZonyLrcTools.Cli.Infrastructure.Updater; diff --git a/src/ZonyLrcTools.Cli/Program.cs b/src/ZonyLrcTools.Cli/Program.cs index e3e73c7..1b88eff 100644 --- a/src/ZonyLrcTools.Cli/Program.cs +++ b/src/ZonyLrcTools.Cli/Program.cs @@ -11,9 +11,10 @@ using Serilog.Events; using Serilog.Sinks.SystemConsole.Themes; using ZonyLrcTools.Cli.Commands; using ZonyLrcTools.Cli.Commands.SubCommand; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; using ZonyLrcTools.Cli.Infrastructure.Logging; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; +using ZonyLrcTools.Common.Infrastructure.Exceptions; +using ZonyLrcTools.Common.Infrastructure.Network; namespace ZonyLrcTools.Cli { @@ -86,6 +87,7 @@ namespace ZonyLrcTools.Cli { services.AddSingleton(PhysicalConsole.Singleton); services.BeginAutoDependencyInject(); + services.BeginAutoDependencyInject(); services.ConfigureConfiguration(); services.ConfigureToolService(); }) diff --git a/src/ZonyLrcTools.Cli/ZonyLrcTools.Cli.csproj b/src/ZonyLrcTools.Cli/ZonyLrcTools.Cli.csproj index 9bf497b..9069f1f 100644 --- a/src/ZonyLrcTools.Cli/ZonyLrcTools.Cli.csproj +++ b/src/ZonyLrcTools.Cli/ZonyLrcTools.Cli.csproj @@ -47,8 +47,4 @@ - - - - diff --git a/src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/AutoDependencyInjectExtensions.cs b/src/ZonyLrcTools.Common/Infrastructure/DependencyInject/AutoDependencyInjectExtensions.cs similarity index 92% rename from src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/AutoDependencyInjectExtensions.cs rename to src/ZonyLrcTools.Common/Infrastructure/DependencyInject/AutoDependencyInjectExtensions.cs index c6a2000..78f6022 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/AutoDependencyInjectExtensions.cs +++ b/src/ZonyLrcTools.Common/Infrastructure/DependencyInject/AutoDependencyInjectExtensions.cs @@ -1,11 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; +using System.Reflection; using Microsoft.Extensions.DependencyInjection; -using ZonyLrcTools.Cli.Infrastructure.Extensions; +using ZonyLrcTools.Common.Infrastructure.Extensions; -namespace ZonyLrcTools.Cli.Infrastructure.DependencyInject +namespace ZonyLrcTools.Common.Infrastructure.DependencyInject { public static class AutoDependencyInjectExtensions { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/ISingletonDependency.cs b/src/ZonyLrcTools.Common/Infrastructure/DependencyInject/ISingletonDependency.cs similarity index 73% rename from src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/ISingletonDependency.cs rename to src/ZonyLrcTools.Common/Infrastructure/DependencyInject/ISingletonDependency.cs index b31eeb0..6486075 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/ISingletonDependency.cs +++ b/src/ZonyLrcTools.Common/Infrastructure/DependencyInject/ISingletonDependency.cs @@ -1,4 +1,4 @@ -namespace ZonyLrcTools.Cli.Infrastructure.DependencyInject +namespace ZonyLrcTools.Common.Infrastructure.DependencyInject { /// /// 继承了本接口的类都会以单例的形式注入到 IoC 容器当中。 diff --git a/src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/ITransientDependency.cs b/src/ZonyLrcTools.Common/Infrastructure/DependencyInject/ITransientDependency.cs similarity index 73% rename from src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/ITransientDependency.cs rename to src/ZonyLrcTools.Common/Infrastructure/DependencyInject/ITransientDependency.cs index f2920e2..8fb3984 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/ITransientDependency.cs +++ b/src/ZonyLrcTools.Common/Infrastructure/DependencyInject/ITransientDependency.cs @@ -1,4 +1,4 @@ -namespace ZonyLrcTools.Cli.Infrastructure.DependencyInject +namespace ZonyLrcTools.Common.Infrastructure.DependencyInject { /// /// 继承了本接口的类都会以瞬时的形式注入到 IoC 容器当中。 diff --git a/src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/ServiceCollectionExtensions.cs b/src/ZonyLrcTools.Common/Infrastructure/DependencyInject/ServiceCollectionExtensions.cs similarity index 92% rename from src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/ServiceCollectionExtensions.cs rename to src/ZonyLrcTools.Common/Infrastructure/DependencyInject/ServiceCollectionExtensions.cs index 732bb0b..4a48281 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/DependencyInject/ServiceCollectionExtensions.cs +++ b/src/ZonyLrcTools.Common/Infrastructure/DependencyInject/ServiceCollectionExtensions.cs @@ -1,13 +1,11 @@ -using System.IO; using System.Net; -using System.Net.Http; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using ZonyLrcTools.Cli.Infrastructure.Network; using ZonyLrcTools.Common.Configuration; +using ZonyLrcTools.Common.Infrastructure.Network; -namespace ZonyLrcTools.Cli.Infrastructure.DependencyInject +namespace ZonyLrcTools.Common.Infrastructure.DependencyInject { /// /// Service 注入的扩展方法。 diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Exceptions/ErrorCodeException.cs b/src/ZonyLrcTools.Common/Infrastructure/Exceptions/ErrorCodeException.cs similarity index 91% rename from src/ZonyLrcTools.Cli/Infrastructure/Exceptions/ErrorCodeException.cs rename to src/ZonyLrcTools.Common/Infrastructure/Exceptions/ErrorCodeException.cs index b446f00..2e99df8 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Exceptions/ErrorCodeException.cs +++ b/src/ZonyLrcTools.Common/Infrastructure/Exceptions/ErrorCodeException.cs @@ -1,6 +1,4 @@ -using System; - -namespace ZonyLrcTools.Cli.Infrastructure.Exceptions +namespace ZonyLrcTools.Common.Infrastructure.Exceptions { /// /// 带错误码的异常实现。 diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Exceptions/ErrorCodeHelper.cs b/src/ZonyLrcTools.Common/Infrastructure/Exceptions/ErrorCodeHelper.cs similarity index 91% rename from src/ZonyLrcTools.Cli/Infrastructure/Exceptions/ErrorCodeHelper.cs rename to src/ZonyLrcTools.Common/Infrastructure/Exceptions/ErrorCodeHelper.cs index 43dac58..2c877e0 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Exceptions/ErrorCodeHelper.cs +++ b/src/ZonyLrcTools.Common/Infrastructure/Exceptions/ErrorCodeHelper.cs @@ -1,10 +1,7 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace ZonyLrcTools.Cli.Infrastructure.Exceptions +namespace ZonyLrcTools.Common.Infrastructure.Exceptions { /// /// 错误码相关的帮助类。 diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Exceptions/ErrorCodes.cs b/src/ZonyLrcTools.Common/Infrastructure/Exceptions/ErrorCodes.cs similarity index 98% rename from src/ZonyLrcTools.Cli/Infrastructure/Exceptions/ErrorCodes.cs rename to src/ZonyLrcTools.Common/Infrastructure/Exceptions/ErrorCodes.cs index f1be523..46c3a95 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Exceptions/ErrorCodes.cs +++ b/src/ZonyLrcTools.Common/Infrastructure/Exceptions/ErrorCodes.cs @@ -1,4 +1,4 @@ -namespace ZonyLrcTools.Cli.Infrastructure.Exceptions +namespace ZonyLrcTools.Common.Infrastructure.Exceptions { /// /// 错误码。 diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Extensions/LinqHelper.cs b/src/ZonyLrcTools.Common/Infrastructure/Extensions/LinqHelper.cs similarity index 85% rename from src/ZonyLrcTools.Cli/Infrastructure/Extensions/LinqHelper.cs rename to src/ZonyLrcTools.Common/Infrastructure/Extensions/LinqHelper.cs index 941dd78..a8c790d 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Extensions/LinqHelper.cs +++ b/src/ZonyLrcTools.Common/Infrastructure/Extensions/LinqHelper.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; - -namespace ZonyLrcTools.Cli.Infrastructure.Extensions +namespace ZonyLrcTools.Common.Infrastructure.Extensions { /// /// Linq 相关的扩展方法。 diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Network/DefaultWarpHttpClient.cs b/src/ZonyLrcTools.Common/Infrastructure/Network/DefaultWarpHttpClient.cs similarity index 96% rename from src/ZonyLrcTools.Cli/Infrastructure/Network/DefaultWarpHttpClient.cs rename to src/ZonyLrcTools.Common/Infrastructure/Network/DefaultWarpHttpClient.cs index 1cf0768..fccf173 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Network/DefaultWarpHttpClient.cs +++ b/src/ZonyLrcTools.Common/Infrastructure/Network/DefaultWarpHttpClient.cs @@ -1,14 +1,11 @@ -using System; -using System.Net; -using System.Net.Http; +using System.Net; using System.Reflection; using System.Text; -using System.Threading.Tasks; using Newtonsoft.Json; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; +using ZonyLrcTools.Common.Infrastructure.Exceptions; -namespace ZonyLrcTools.Cli.Infrastructure.Network +namespace ZonyLrcTools.Common.Infrastructure.Network { public class DefaultWarpHttpClient : IWarpHttpClient, ITransientDependency { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Network/IWarpHttpClient.cs b/src/ZonyLrcTools.Common/Infrastructure/Network/IWarpHttpClient.cs similarity index 96% rename from src/ZonyLrcTools.Cli/Infrastructure/Network/IWarpHttpClient.cs rename to src/ZonyLrcTools.Common/Infrastructure/Network/IWarpHttpClient.cs index fac759f..0a63cc1 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Network/IWarpHttpClient.cs +++ b/src/ZonyLrcTools.Common/Infrastructure/Network/IWarpHttpClient.cs @@ -1,8 +1,4 @@ -using System; -using System.Net.Http; -using System.Threading.Tasks; - -namespace ZonyLrcTools.Cli.Infrastructure.Network +namespace ZonyLrcTools.Common.Infrastructure.Network { /// /// 基于 封装的 HTTP 请求客户端。 diff --git a/src/ZonyLrcTools.Common/ZonyLrcTools.Common.csproj b/src/ZonyLrcTools.Common/ZonyLrcTools.Common.csproj index eb2460e..c287067 100644 --- a/src/ZonyLrcTools.Common/ZonyLrcTools.Common.csproj +++ b/src/ZonyLrcTools.Common/ZonyLrcTools.Common.csproj @@ -6,4 +6,12 @@ enable + + + + + + + + diff --git a/tests/ZonyLrcTools.Tests/Infrastructure/Exceptions/ErrorCodeHelperTests.cs b/tests/ZonyLrcTools.Tests/Infrastructure/Exceptions/ErrorCodeHelperTests.cs index 1bbe225..fae1380 100644 --- a/tests/ZonyLrcTools.Tests/Infrastructure/Exceptions/ErrorCodeHelperTests.cs +++ b/tests/ZonyLrcTools.Tests/Infrastructure/Exceptions/ErrorCodeHelperTests.cs @@ -1,6 +1,6 @@ using Shouldly; using Xunit; -using ZonyLrcTools.Cli.Infrastructure.Exceptions; +using ZonyLrcTools.Common.Infrastructure.Exceptions; namespace ZonyLrcTools.Tests.Infrastructure.Exceptions { diff --git a/tests/ZonyLrcTools.Tests/Infrastructure/Network/WarpClientTests.cs b/tests/ZonyLrcTools.Tests/Infrastructure/Network/WarpClientTests.cs index fdc86c7..a1b5d7a 100644 --- a/tests/ZonyLrcTools.Tests/Infrastructure/Network/WarpClientTests.cs +++ b/tests/ZonyLrcTools.Tests/Infrastructure/Network/WarpClientTests.cs @@ -3,8 +3,8 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Shouldly; using Xunit; -using ZonyLrcTools.Cli.Infrastructure.Network; using ZonyLrcTools.Common.Configuration; +using ZonyLrcTools.Common.Infrastructure.Network; namespace ZonyLrcTools.Tests.Infrastructure.Network { diff --git a/tests/ZonyLrcTools.Tests/TestBase.cs b/tests/ZonyLrcTools.Tests/TestBase.cs index ae7de87..bc88ed6 100644 --- a/tests/ZonyLrcTools.Tests/TestBase.cs +++ b/tests/ZonyLrcTools.Tests/TestBase.cs @@ -2,7 +2,7 @@ using System; using Microsoft.Extensions.DependencyInjection; using ZonyLrcTools.Cli; using ZonyLrcTools.Cli.Commands; -using ZonyLrcTools.Cli.Infrastructure.DependencyInject; +using ZonyLrcTools.Common.Infrastructure.DependencyInject; namespace ZonyLrcTools.Tests {