Browse Source

同步后端代码

夜鹰 4 months ago
parent
commit
354599ebb5

+ 5 - 5
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -19,9 +19,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.2.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.217" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.217" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.217" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.221" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.221" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.221" />
     <PackageReference Include="Hardware.Info" Version="101.1.0.1" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
@@ -46,7 +46,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.4.210" />
     <PackageReference Include="SSH.NET" Version="2025.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.1" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1352" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1355" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" Aliases="BouncyCastleV2" />
@@ -69,6 +69,6 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.11" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.4" />
     <PackageReference Include="XiHan.Framework.Utils" Version="1.4.5" />
-  </ItemGroup>
+  </ItemGroup>	
 
 </Project>

+ 7 - 0
Admin.NET/Admin.NET.Core/Entity/SysUser.cs

@@ -319,6 +319,13 @@ public partial class SysUser : EntityBaseTenantOrg
     [SugarColumn(ColumnDescription = "语言代码")]
     public string LangCode { get; set; } = App.GetOptions<LocalizationSettingsOptions>().DefaultCulture;
 
+    /// <summary>
+    /// 个性化首页地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "个性化首页地址", Length = 512)]
+    [MaxLength(512)]
+    public string? Homepage { get; set; }
+
     /// <summary>
     /// 验证超级管理员类型,若账号类型为超级管理员则报错
     /// </summary>

+ 5 - 0
Admin.NET/Admin.NET.Core/Service/Auth/Dto/LoginOutput.cs

@@ -20,4 +20,9 @@ public class LoginOutput
     /// 刷新Token
     /// </summary>
     public string RefreshToken { get; set; }
+
+    /// <summary>
+    /// 个性化首页
+    /// </summary>
+    public string? Homepage { get; set; }
 }

+ 2 - 1
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -279,7 +279,8 @@ public class SysAuthService : IDynamicApiController, ITransient
             Output = new LoginOutput
             {
                 AccessToken = accessToken,
-                RefreshToken = refreshToken
+                RefreshToken = refreshToken,
+                Homepage = user.Homepage
             }
         };
 

+ 1 - 0
Admin.NET/Admin.NET.Core/Service/Dict/Dto/DictTypeInput.cs

@@ -29,6 +29,7 @@ public class AddDictTypeInput : SysDictType
     /// 是否是租户字典(Y-是,N-否)
     /// </summary>
     public override YesNoEnum IsTenant { get; set; } = YesNoEnum.Y;
+
     /// <summary>
     /// 是否是内置字典(Y-是,N-否)
     /// </summary>

+ 0 - 2
Admin.NET/Admin.NET.Core/Utils/GiteeHelper.cs

@@ -4,8 +4,6 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
 
-using System.Diagnostics.CodeAnalysis;
-
 namespace Admin.NET.Core;
 
 /// <summary>

+ 1 - 1
Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Furion.Xunit" Version="4.9.7.217" />
+    <PackageReference Include="Furion.Xunit" Version="4.9.7.221" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="Selenium.Support" Version="4.38.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.38.0" />

+ 0 - 1
Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/GlobalUsings.cs

@@ -4,7 +4,6 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
 
-global using Admin.NET.Core;
 global using Furion;
 global using Furion.HttpRemote;
 global using Newtonsoft.Json;