gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎升级Furion v4.9.5.14（永远相信美好的事情即将发生😘😘😘）

Browse Source
This commit is contained in:
zuohuaijun 2024-10-10 14:52:21 +08:00
parent 8aa1117e1a
commit 33e91a5b44
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -18,9 +18,9 @@
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" /> <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.15.8" /> <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.15.8" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.13" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.14" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.13" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.14" />
<PackageReference Include="Furion.Pure" Version="4.9.5.13" /> <PackageReference Include="Furion.Pure" Version="4.9.5.14" />
<PackageReference Include="Hardware.Info" Version="101.0.0" /> <PackageReference Include="Hardware.Info" Version="101.0.0" />
<PackageReference Include="Hashids.net" Version="1.7.0" /> <PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" /> <PackageReference Include="IPTools.China" Version="1.6.0" />
@ -42,7 +42,7 @@
<PackageReference Include="SqlSugarCore" Version="5.1.4.169" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.169" />
<PackageReference Include="SSH.NET" Version="2024.1.0" /> <PackageReference Include="SSH.NET" Version="2024.1.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1101" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1102" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>

6
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs
View File

@ -12,7 +12,6 @@ namespace Admin.NET.Core.Service;
/// <summary> /// <summary>
/// 系统登录授权服务 🧩 /// 系统登录授权服务 🧩
/// </summary> /// </summary>
[AllowAnonymous]
[ApiDescriptionSettings(Order = 500, Description = "登录授权")] [ApiDescriptionSettings(Order = 500, Description = "登录授权")]
public class SysAuthService : IDynamicApiController, ITransient public class SysAuthService : IDynamicApiController, ITransient
{ {
@ -45,6 +44,7 @@ public class SysAuthService : IDynamicApiController, ITransient
/// <remarks>用户名/密码：superadmin/123456</remarks> /// <remarks>用户名/密码：superadmin/123456</remarks>
/// <returns></returns> /// <returns></returns>
[DisplayName("账号密码登录")] [DisplayName("账号密码登录")]
[AllowAnonymous]
public virtual async Task<LoginOutput> Login([Required] LoginInput input) public virtual async Task<LoginOutput> Login([Required] LoginInput input)
{ {
//// 可以根据域名获取具体租户 //// 可以根据域名获取具体租户
@ -170,6 +170,7 @@ public class SysAuthService : IDynamicApiController, ITransient
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[DisplayName("手机号登录")] [DisplayName("手机号登录")]
[AllowAnonymous]
public virtual async Task<LoginOutput> LoginPhone([Required] LoginPhoneInput input) public virtual async Task<LoginOutput> LoginPhone([Required] LoginPhoneInput input)
{ {
// 校验短信验证码 // 校验短信验证码
@ -317,6 +318,7 @@ public class SysAuthService : IDynamicApiController, ITransient
/// <returns></returns> /// <returns></returns>
[SuppressMonitor] [SuppressMonitor]
[DisplayName("获取验证码")] [DisplayName("获取验证码")]
[AllowAnonymous]
public CaptchaOutput GetCaptcha() public CaptchaOutput GetCaptcha()
{ {
var codeId = YitIdHelper.NextId().ToString(); var codeId = YitIdHelper.NextId().ToString();
@ -331,6 +333,7 @@ public class SysAuthService : IDynamicApiController, ITransient
/// <returns></returns> /// <returns></returns>
[Route("/api/swagger/checkUrl"), NonUnify] [Route("/api/swagger/checkUrl"), NonUnify]
[ApiDescriptionSettings(Description = "Swagger登录检查", DisableInherite = true)] [ApiDescriptionSettings(Description = "Swagger登录检查", DisableInherite = true)]
[AllowAnonymous]
public int SwaggerCheckUrl() public int SwaggerCheckUrl()
{ {
return _httpContextAccessor.HttpContext.User.Identity.IsAuthenticated ? 200 : 401; return _httpContextAccessor.HttpContext.User.Identity.IsAuthenticated ? 200 : 401;
@ -343,6 +346,7 @@ public class SysAuthService : IDynamicApiController, ITransient
/// <returns></returns> /// <returns></returns>
[Route("/api/swagger/submitUrl"), NonUnify] [Route("/api/swagger/submitUrl"), NonUnify]
[ApiDescriptionSettings(Description = "Swagger登录提交", DisableInherite = true)] [ApiDescriptionSettings(Description = "Swagger登录提交", DisableInherite = true)]
[AllowAnonymous]
public async Task<int> SwaggerSubmitUrl([FromForm] SpecificationAuth auth) public async Task<int> SwaggerSubmitUrl([FromForm] SpecificationAuth auth)
{ {
try try