Browse Source

[MODIFY]短信发送修改,用户修改手机号优化

dev-zzj
zhaozhenjing 4 weeks ago
parent
commit
e864eecb3d
  1. 14
      src/2.services/ATS.NonCustodial.Application/Impl/Admins/SMSService.cs
  2. 15
      src/2.services/ATS.NonCustodial.Application/Impl/Admins/UserService.cs
  3. 5
      src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Admins/User/Input/UserUpdateInput.cs

14
src/2.services/ATS.NonCustodial.Application/Impl/Admins/SMSService.cs

@ -209,7 +209,7 @@ namespace ATS.NonCustodial.Application.Impl.Admins
var random = new Random(); var random = new Random();
var code = random.Next(100000, 999999).ToString(); var code = random.Next(100000, 999999).ToString();
var name = "新用户注册"; var name = "新用户注册";
var sendMessage = $"您的验证码为:{code},请于分钟内填写,若非本人操作,请勿泄露。"; var sendMessage = $"您的验证码为:{code},请于5分钟内填写,若非本人操作,请勿泄露。";
// 创建验证码记录 // 创建验证码记录
var addSMS = new AppSMS var addSMS = new AppSMS
@ -375,7 +375,7 @@ namespace ATS.NonCustodial.Application.Impl.Admins
try try
{ {
var smsConfig = LazyGetRequiredService<SmsConfiguration>(); // var smsConfig = LazyGetRequiredService<SmsConfiguration>();
var signName = await GetDictionariesOutput("sms_config", "SignName"); var signName = await GetDictionariesOutput("sms_config", "SignName");
var feeType = await GetDictionariesOutput("sms_config", "FeeType"); var feeType = await GetDictionariesOutput("sms_config", "FeeType");
var baseUrl = await GetDictionariesOutput("sms_config", "BaseUrl"); var baseUrl = await GetDictionariesOutput("sms_config", "BaseUrl");
@ -384,17 +384,17 @@ namespace ATS.NonCustodial.Application.Impl.Admins
var parameters = new SmsParameters() var parameters = new SmsParameters()
{ {
Pwd = pwd.Value ?? smsConfig.Pwd, Pwd = pwd.Value,
Content = content, Content = content,
FeeType = feeType.Value ?? smsConfig.FeeType, FeeType = feeType.Value,
LoginName = loginName.Value ?? smsConfig.LoginName, LoginName = loginName.Value,
SignName = signName.Value ?? smsConfig.SignName, SignName = signName.Value,
Mobile = phone Mobile = phone
}; };
// 构建查询字符串 // 构建查询字符串
var queryString = BuildQueryString(parameters); var queryString = BuildQueryString(parameters);
var requestUrl = $"{baseUrl.Value ?? smsConfig.BaseUrl}?{queryString}"; var requestUrl = $"{baseUrl.Value}?{queryString}";
// 发送HTTP GET请求 // 发送HTTP GET请求
var response = await _httpClient.GetAsync(requestUrl); var response = await _httpClient.GetAsync(requestUrl);

15
src/2.services/ATS.NonCustodial.Application/Impl/Admins/UserService.cs

@ -538,8 +538,11 @@ namespace ATS.NonCustodial.Application.Impl.Admins
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
public async Task<IResultOutput> UpdateAsync(UserUpdateInput input) public async Task<IResultOutput> UpdateAsync(UserUpdateInput input)
{
if(!input.PhoneUpdateFlag.HasValue() || input.PhoneUpdateFlag != "1")
{ {
if (!(await IsAdmin(User.Id)).IsAdmin) return ResultOutput.NotOk("无操作权限"); if (!(await IsAdmin(User.Id)).IsAdmin) return ResultOutput.NotOk("无操作权限");
}
if (!(input?.Id > 0)) return ResultOutput.NotOk(); if (!(input?.Id > 0)) return ResultOutput.NotOk();
var user = await _userRepository.FindAsync(input.Id); var user = await _userRepository.FindAsync(input.Id);
@ -920,20 +923,20 @@ namespace ATS.NonCustodial.Application.Impl.Admins
/// <returns></returns> /// <returns></returns>
public async Task<ResultOutput<List<KeyValueDto>>> GetUserSelectList(int isCourt = 0) public async Task<ResultOutput<List<KeyValueDto>>> GetUserSelectList(int isCourt = 0)
{ {
var userRoles = await this.IsAdmin(null); // var userRoles = await this.IsAdmin(null);
var dataDict = await _appDictionaryService.GetListNoApiAsync("job_position"); // var dataDict = await _appDictionaryService.GetListNoApiAsync("job_position");
// 安全地处理可能的空值 // 安全地处理可能的空值
var codeList = dataDict?.FirstOrDefault()?.Dictionaries? // var codeList = dataDict?.FirstOrDefault()?.Dictionaries?
.Where(w => w.Code == (isCourt == 0 ? "inquisitor" : "judge")) // .Where(w => w.Code == (isCourt == 0 ? "inquisitor" : "judge"))
.ToList() ?? new List<DictionaryGetOutput>(); // .ToList() ?? new List<DictionaryGetOutput>();
var rtn = await _userRepository.AsQueryable(false, true) var rtn = await _userRepository.AsQueryable(false, true)
.Where(w => w.ChatPersonType != ChatPersonTypeEnum.SupervisedPerson && w.DataStatus != DataStatusEnum.Disable && !w.UserName.Contains("_aks")) .Where(w => w.ChatPersonType != ChatPersonTypeEnum.SupervisedPerson && w.DataStatus != DataStatusEnum.Disable && !w.UserName.Contains("_aks"))
.WhereIf(codeList.Count > 0, w => w.PositionId == codeList.FirstOrDefault().Id) // .WhereIf(codeList.Count > 0, w => w.PositionId == codeList.FirstOrDefault().Id)
// .WhereIf(!userRoles.IsAdmin, w => w.Id == User.Id) 2025 -10-20 段肖确认修改 // .WhereIf(!userRoles.IsAdmin, w => w.Id == User.Id) 2025 -10-20 段肖确认修改
.Select(w => new KeyValueDto() .Select(w => new KeyValueDto()
{ {

5
src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Admins/User/Input/UserUpdateInput.cs

@ -72,5 +72,10 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Admins.User.Input
/// 手机号(手机号限制输入为手机号格式,位数为11位。) /// 手机号(手机号限制输入为手机号格式,位数为11位。)
/// </summary> /// </summary>
public string? Phone { get; set; } public string? Phone { get; set; }
/// <summary>
/// 用户修改手机号标识
/// </summary>
public string? PhoneUpdateFlag { get; set; }
} }
} }
Loading…
Cancel
Save