✨ 优化图像加载逻辑

Author: Redns

.gitignore

@@ -12,7 +12,7 @@ src/North/.vs
 src/North/bin
 src/North/obj
 src/North/.config
-# src/North/appsettings.json
+src/North/appsettings.json
 # North End
 
 # North.Core Start
@@ -32,7 +32,6 @@ src/North.Nsfw/.vs
 src/North.Nsfw/bin
 src/North.Nsfw/obj
 src/North.Nsfw/Properties
-src/North.Nsfw/appsettings.json
 # North.Nsfw End
 
 # North.RCL Start
@@ -59,4 +58,11 @@ src/North.PluginTest/*
 src/North.Plugin.NetVips/.vs
 src/North.Plugin.NetVips/bin
 src/North.Plugin.NetVips/obj
-# North.Plugin.NetVips End
+# North.Plugin.NetVips End
+/src/North/appsettings.json
+/src/North/Properties/PublishProfiles/linux-arm64.pubxml
+/src/North/Properties/PublishProfiles/linux-arm64.pubxml.user
+/src/North/Properties/PublishProfiles/win-x64-v2.4.15.pubxml
+/src/North/Properties/PublishProfiles/win-x64-v2.4.15.pubxml.user
+/src/North/Properties/PublishProfiles/win-x64.pubxml
+/src/North/Properties/PublishProfiles/win-x64.pubxml.user

src/North.Core/Common/AppSetting.cs

@@ -1,33 +1,23 @@
 using Microsoft.Data.SqlClient;
-using North.Core.Entities;
 using North.Core.Services.Logger;
 using SqlSugar;
+using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace North.Core.Common
 {
     public class AppSetting
     {
+        public WelcomeSetting Welcome { get; set; }
         public GeneralSetting General { get; set; }
-        public AppearanceSetting Appearance { get; set; }
+        public AppearanceSetting Appearance { get; set; } 
         public RegisterSetting Register { get; set; }
         public NotifySetting Notify { get; set; }
         public AuthSetting Auth { get; set; }
         public LogSetting Log { get; set; }
         public PluginSetting Plugin { get; set; }
 
-        public AppSetting(GeneralSetting general, AppearanceSetting appearance, RegisterSetting register, NotifySetting notify, AuthSetting auth, LogSetting log, PluginSetting plugin)
-        {
-            General = general;
-            Appearance = appearance;
-            Register = register;
-            Notify = notify;
-            Auth = auth;
-            Log = log;
-            Plugin = plugin;
-        }
-
 
         /// <summary>
         /// 加载设置
@@ -36,21 +26,56 @@ public AppSetting(GeneralSetting general, AppearanceSetting appearance, Register
         /// <returns></returns>
         public static AppSetting Load(string path = "appsettings.json") => JsonSerializer.Deserialize<AppSetting>(File.ReadAllText(path)) ?? throw new Exception($"Load {path} failed");
 
-
         /// <summary>
         /// 保存设置
         /// </summary>
         /// <param name="path"></param>
         public void Save(string path = "appsettings.json") => File.WriteAllText(path, ToString());
 
-        public AppSetting Clone() => new(General.Clone(), Appearance.Clone(), Register.Clone(), Notify.Clone(), Auth.Clone(), Log.Clone(), Plugin.Clone());
+        /// <summary>
+        /// 深拷贝设置对象
+        /// </summary>
+        /// <returns></returns>
+        public AppSetting Clone() => new()
+        {
+            General = General.Clone(),
+            Appearance = Appearance.Clone(),
+            Register = Register.Clone(),
+            Notify = Notify.Clone(),
+            Auth = Auth.Clone(),
+            Log = Log.Clone(),
+            Plugin = Plugin.Clone()
+        };
 
+        /// <summary>
+        /// 序列化对象
+        /// </summary>
+        /// <returns></returns>
         public override string ToString() => JsonSerializer.Serialize(this, new JsonSerializerOptions()
         {
             WriteIndented = true
         });
     }
 
+    #region 欢迎设置
+    public class WelcomeSetting
+    {
+        /// <summary>
+        /// 应用版本
+        /// </summary>
+        private string? _version = null;
+
+        [JsonIgnore]
+        public string Version
+        {
+            get
+            {
+                return _version ??= Assembly.GetEntryAssembly()?.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "*";
+            }
+        }
+    }
+    #endregion
+
     #region 通用设置
 
     /// <summary>
@@ -77,7 +102,6 @@ public GeneralSetting(DataBaseSetting dataBase, string applicationUrl)
         public GeneralSetting Clone() => new(DataBase.Clone(), ApplicationUrl);
     }
 
-
     /// <summary>
     /// 数据库设置
     /// </summary>

src/North.Core/Entities/UserEntity.cs

@@ -148,6 +148,18 @@ public class UserEntity : Entity
         public double UploadRemainedCapacityByte => UploadRemainedCapacity * 1024 * 1024;
         #endregion
 
+        #region 图片存储策略（重命名、冲突）
+        /// <summary>
+        /// 图片重命名策略
+        /// </summary>
+        public ImageRenamePolicy ImageRenamePolicy { get; set; }
+
+        /// <summary>
+        /// 图片重命名冲突策略
+        /// </summary>
+        public ImageRenameConflictPolicy ImageRenameConflictPolicy { get; set;}
+        #endregion
+
         #region 导航属性
         /// <summary>
         /// 用户图片
@@ -179,20 +191,22 @@ public class UserEntity : Entity
             MaxUploadNums = MaxUploadNums,
             MaxUploadCapacity = MaxUploadSize,
             SingleMaxUploadNums = SingleMaxUploadNums,
-            SingleMaxUploadSize = SingleMaxUploadSize
+            SingleMaxUploadSize = SingleMaxUploadSize,
+            ImageRenamePolicy = ImageRenamePolicy,
+            ImageRenameConflictPolicy = ImageRenameConflictPolicy
         };
 
 
         /// <summary>
         /// 用户 Claims 认证对象
         /// </summary>
         [SugarColumn(IsIgnore = true)]
-        public ClaimsIdentity ClaimsIdentify => new(new Claim[]
-        {
-            new Claim(ClaimTypes.Role, Role),
-            new Claim(ClaimTypes.SerialNumber, Id.ToString()),
-            new Claim("LastModifyTime", LastModifyTime.ToString("G"))
-        }, CookieAuthenticationDefaults.AuthenticationScheme);
+        public ClaimsIdentity ClaimsIdentify => new(
+        [
+            new(ClaimTypes.Role, Role),
+            new(ClaimTypes.SerialNumber, Id.ToString()),
+            new("LastModifyTime", LastModifyTime.ToString("G"))
+        ], CookieAuthenticationDefaults.AuthenticationScheme);
 
 
         /// <summary>
@@ -321,6 +335,18 @@ public class UserDTOEntity : Entity
         /// </summary>
         public double UploadRemainedCapacityByte => UploadRemainedCapacity * 1024 * 1024;
         #endregion
+    
+        #region 图片存储策略（重命名、冲突）
+        /// <summary>
+        /// 图片重命名策略
+        /// </summary>
+        public ImageRenamePolicy ImageRenamePolicy { get; init; }
+
+        /// <summary>
+        /// 图片重命名冲突策略
+        /// </summary>
+        public ImageRenameConflictPolicy ImageRenameConflictPolicy { get; init;}
+        #endregion
     }
 
 
@@ -343,4 +369,27 @@ public enum UserState
         Normal,             // 正常
         Forbidden           // 封禁中
     }
-}
+
+
+    /// <summary>
+    /// 图片存储策略
+    /// </summary>
+    public enum ImageRenamePolicy
+    {
+        Origin = 0,                     // 保持源名城
+        Timestamp,                      // 时间戳重命名
+        RandomString                    // 随机字符串重命名
+    }
+
+
+    /// <summary>
+    /// 图片存储冲突策略
+    /// </summary>
+    public enum ImageRenameConflictPolicy
+    {
+        Override = 0,                   // 覆写原图片
+        Abort,                          // 放弃保存当前图片
+        RandomPrefix,                   // 随机字符串前缀
+        RandomSuffix                    // 随机字符串后缀
+    }
+}

src/North.Core/Helpers/AuthorizationHelper.cs

@@ -0,0 +1,11 @@
+using Microsoft.AspNetCore.Http;
+
+namespace North.Core.Services.AuthService
+{
+    public interface IAuthService<UserDto> where UserDto : class
+    {
+        ValueTask<bool> AuthAsync(HttpContext context, string? relativeUri = null);
+
+        ValueTask<UserDto?> AuthAndQueryAsync(HttpContext context);
+    }
+}

src/North.Core/Services/AuthService/IAuthService.cs

@@ -0,0 +1,83 @@
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Http;
+using North.Core.Entities;
+using North.Core.Helpers;
+using North.Core.Repository;
+using System.Security.Claims;
+
+namespace North.Core.Services.AuthService
+{
+    public class NorthAuthService : IAuthService<UserDTOEntity>
+    {
+        private readonly UserRepository _repository;
+        private readonly string[] _withoutAuthenticationPages;
+
+        public NorthAuthService(UserRepository repository, string[] withoutAuthenticationPages)
+        {
+            _repository = repository;
+            _withoutAuthenticationPages = withoutAuthenticationPages;
+        }
+
+        /// <summary>
+        /// 查询认证用户信息
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="queryUserDelegate"></param>
+        /// <returns>认证信息过期或用户不存在返回 null</returns>
+        private async ValueTask<UserDTOEntity?> GetAuthUserAsync(HttpContext context)
+        {
+            if (context.User.Identity?.IsAuthenticated is not true)
+            {
+                return null;
+            }
+
+            // 解析 ClaimIdentifies 中的用户信息
+            var userId = context.User.FindFirst(ClaimTypes.SerialNumber)?.Value;
+            var userLastModifyTime = context.User.FindFirst("LastModifyTime")?.Value;
+            if (string.IsNullOrEmpty(userId) || string.IsNullOrEmpty(userLastModifyTime))
+            {
+                return null;
+            }
+
+            // 核对云端认证信息
+            var user = await _repository.SingleAsync(u => u.Id.ToString() == userId);
+            if ((user?.LastModifyTime.ToString("G") != userLastModifyTime) || (user.State is not UserState.Normal))
+            {
+                return null;
+            }
+
+            return user.DTO;
+        }
+
+        /// <summary>
+        /// 认证用户
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="relativeUri">当前相对路径</param>
+        /// <returns></returns>
+        public async ValueTask<bool> AuthAsync(HttpContext context, string? relativeUri = null)
+        {
+            // 获取当前地址并判断是否需要校验
+            if (relativeUri?.Contains(_withoutAuthenticationPages, true) is true)
+            {
+                return true;
+            }
+
+            // 查询用户
+            var user = await GetAuthUserAsync(context);
+            return user is not null;
+        }
+
+        /// <summary>
+        /// 认证用户（默认当前页面需要授权）
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="redirectUri"></param>
+        /// <returns></returns>
+        public async ValueTask<UserDTOEntity?> AuthAndQueryAsync(HttpContext context)
+        {
+            // 查询用户
+            return await GetAuthUserAsync(context);
+        }
+    }
+}

src/North.Core/Services/AuthService/NorthAuthService.cs

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}

src/North.NSFW/appsettings.json

@@ -1,5 +1,7 @@
 @using North.Common
 @using North.Core.Common;
+@using North.Core.Entities
+@using North.Core.Services.AuthService
 @using North.RCL.Texts
 @using SqlSugar;
 
@@ -8,10 +10,11 @@
 @inject ISqlSugarClient _client
 @inject PluginsContext _pluginContext
 @inject IHttpContextAccessor _accessor
+@inject IAuthService<UserDTOEntity> _authService
 
 <PageTitle>@_appSetting.Appearance.Name</PageTitle>
 <CascadingAuthenticationState>
-    <Router AppAssembly="@typeof(App).Assembly"
+    <Router AppAssembly="@typeof(App).Assembly" OnNavigateAsync="AuthAsync"
             AdditionalAssemblies="@_pluginContext.RazorPageAssembies">
         <Found Context="routeData">
             <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />