fix: 🐛 个性主题色冲突

Author: tk

src/backend/NetAdmin/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj

@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="$(SolutionDir)/build/code.quality.props"/>
+    <ItemGroup>
+        <EmbeddedResource Include="$(SolutionDir)/assets/captcha/**" LinkBase="Assets/Captcha"/>
+    </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="../NetAdmin.Application/NetAdmin.Application.csproj"/>
     </ItemGroup>

src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs

@@ -7,8 +7,8 @@ namespace NetAdmin.SysComponent.Application.Services.Sys;
 /// <inheritdoc cref="ICaptchaService" />
 public sealed class CaptchaService : ServiceBase<ICaptchaService>, ICaptchaService
 {
-    private static readonly Assembly _entryAsm     = Assembly.GetEntryAssembly();
-    private static readonly string   _entryAsmName = _entryAsm.FullName![.._entryAsm.FullName.IndexOf(',')];
+    private static readonly Assembly _currAsm     = Assembly.GetAssembly(typeof(CaptchaService));
+    private static readonly string   _currAsmName = _currAsm.FullName![.._currAsm.FullName.IndexOf(',')];
 
     /// <summary>
     ///     Initializes a new instance of the <see cref="CaptchaService" /> class.
@@ -19,8 +19,8 @@ public CaptchaService() { }
     public async Task<GetCaptchaRsp> GetCaptchaImageAsync()
     {
         var (backgroundImage, sliderImage, offsetSaw) = await CaptchaImageHelper.CreateSawSliderImageAsync(
-                                                                                    _entryAsm, $"{_entryAsmName}.Assets.Captcha.background"
-                                                                                  , $"{_entryAsmName}.Assets.Captcha.template", (1, 101), (1, 7)
+                                                                                    _currAsm, $"{_currAsmName}.Assets.Captcha.background"
+                                                                                  , $"{_currAsmName}.Assets.Captcha.template", (1, 101), (1, 7)
                                                                                   , new Size(50, 50))
                                                                                 .ConfigureAwait(false);
 

src/backend/NetAdmin/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj

@@ -1,8 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="$(SolutionDir)/build/code.quality.props"/>
-    <ItemGroup>
-        <EmbeddedResource Include="$(SolutionDir)/assets/captcha/**" LinkBase="Assets/Captcha"/>
-    </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="../NetAdmin.Host/NetAdmin.Host.csproj"/>
         <ProjectReference Include="../NetAdmin.SysComponent.Cache/NetAdmin.SysComponent.Cache.csproj"/>

src/frontend/admin/.prettierrc

@@ -2,7 +2,7 @@
     "attributeGroups": ["^v-", "$DEFAULT"],
     "attributeSort": "ASC",
     "bracketSameLine": true,
-    "endOfLine": "auto",
+    "endOfLine": "lf",
     "plugins": ["prettier-plugin-organize-attributes"],
     "printWidth": 150,
     "semi": false,

src/frontend/admin/index.html

@@ -30,7 +30,7 @@
                 justify-content: center;
                 align-items: center;
                 flex-direction: column;
-                background: #fff;
+                background: white;
             }
 
             .app-loading__logo {
@@ -47,7 +47,7 @@
                 width: 35px;
                 height: 35px;
                 border: 5px solid transparent;
-                border-top-color: #000;
+                border-top-color: black;
                 border-radius: 50%;
                 animation: 0.5s loader linear infinite;
                 position: relative;
@@ -79,7 +79,7 @@
             }
 
             .dark .app-loading__loader {
-                border-top-color: #fff;
+                border-top-color: white;
             }
 
             .dark .app-loading__title {
@@ -103,7 +103,7 @@
         <div class="aminui" id="app">
             <div class="app-loading">
                 <div class="app-loading__logo">
-                    <img alt="" src="/src/assets/img/logo.png" />
+                    <img alt="" src="/src/assets/img/logo.svg" />
                 </div>
                 <div class="app-loading__loader"></div>
                 <div class="app-loading__title">NetAdmin</div>