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

😎调整swagger和大屏登录时默认租户验证码逻辑

Browse Source
This commit is contained in:
zuohuaijun 2025-02-28 11:27:47 +08:00
parent 8a5fa59d26
commit 39c7c03d06
3 changed files with 32 additions and 9 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

@ -20,9 +20,9 @@
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" /> <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.1" /> <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.1" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.16" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.17" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.16" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.17" />
<PackageReference Include="Furion.Pure" Version="4.9.7.16" /> <PackageReference Include="Furion.Pure" Version="4.9.7.17" />
<PackageReference Include="Hardware.Info" Version="101.0.1" /> <PackageReference Include="Hardware.Info" Version="101.0.1" />
<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" />
@ -48,7 +48,7 @@
<PackageReference Include="SSH.NET" Version="2024.2.0" /> <PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1188" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1189" />
<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>

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

@ -387,6 +387,12 @@ public class SysAuthService : IDynamicApiController, ITransient
{ {
try try
{ {
// 关闭默认租户验证码验证
var tenantList = _sysCacheService.Get<List<SysTenant>>(CacheConst.KeyTenant);
var tenant = tenantList.FirstOrDefault(u => u.Id == SqlSugarConst.DefaultTenantId);
tenant.Captcha = false;
_sysCacheService.Set(CacheConst.KeyTenant, tenantList);
await Login(new LoginInput await Login(new LoginInput
{ {
Account = auth.UserName, Account = auth.UserName,
@ -394,6 +400,10 @@ public class SysAuthService : IDynamicApiController, ITransient
TenantId = SqlSugarConst.DefaultTenantId TenantId = SqlSugarConst.DefaultTenantId
}); });
// 启用默认租户验证码验证
tenant.Captcha = true;
_sysCacheService.Set(CacheConst.KeyTenant, tenantList);
return 200; return 200;
} }
catch (Exception) catch (Exception)

21
Admin.NET/Plugins/Admin.NET.Plugin.GoView/Service/GoViewSys/GoViewSysService.cs
View File

@ -13,14 +13,17 @@ namespace Admin.NET.Plugin.GoView.Service;
[ApiDescriptionSettings(GoViewConst.GroupName, Module = "goview", Name = "sys", Order = 100, Description = "系统登录")] [ApiDescriptionSettings(GoViewConst.GroupName, Module = "goview", Name = "sys", Order = 100, Description = "系统登录")]
public class GoViewSysService : IDynamicApiController public class GoViewSysService : IDynamicApiController
{ {
private readonly SysAuthService _sysAuthService;
private readonly SqlSugarRepository<SysUser> _sysUserRep; private readonly SqlSugarRepository<SysUser> _sysUserRep;
private readonly SysAuthService _sysAuthService;
private readonly SysCacheService _sysCacheService;
public GoViewSysService(SysAuthService sysAuthService, public GoViewSysService(SqlSugarRepository<SysUser> sysUserRep,
SqlSugarRepository<SysUser> sysUserRep) SysAuthService sysAuthService,
SysCacheService sysCacheService)
{ {
_sysAuthService = sysAuthService;
_sysUserRep = sysUserRep; _sysUserRep = sysUserRep;
_sysAuthService = sysAuthService;
_sysCacheService = sysCacheService;
} }
/// <summary> /// <summary>
@ -34,6 +37,12 @@ public class GoViewSysService : IDynamicApiController
// 设置默认租户 // 设置默认租户
input.TenantId ??= SqlSugarConst.DefaultTenantId; input.TenantId ??= SqlSugarConst.DefaultTenantId;
// 关闭默认租户验证码验证
var tenantList = _sysCacheService.Get<List<SysTenant>>(CacheConst.KeyTenant);
var tenant = tenantList.FirstOrDefault(u => u.Id == SqlSugarConst.DefaultTenantId);
tenant.Captcha = false;
_sysCacheService.Set(CacheConst.KeyTenant, tenantList);
input.Password = CryptogramUtil.SM2Encrypt(input.Password); input.Password = CryptogramUtil.SM2Encrypt(input.Password);
var loginResult = await _sysAuthService.Login(new LoginInput() var loginResult = await _sysAuthService.Login(new LoginInput()
{ {
@ -41,6 +50,10 @@ public class GoViewSysService : IDynamicApiController
Password = input.Password, Password = input.Password,
}); });
// 启用默认租户验证码验证
tenant.Captcha = true;
_sysCacheService.Set(CacheConst.KeyTenant, tenantList);
var sysUser = await _sysUserRep.AsQueryable().ClearFilter().FirstAsync(u => u.Account.Equals(input.Username)); var sysUser = await _sysUserRep.AsQueryable().ClearFilter().FirstAsync(u => u.Account.Equals(input.Username));
return new GoViewLoginOutput() return new GoViewLoginOutput()
{ {