From 992a7f9c6d28587eabe1314df64668e657b46faf Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 31 三月 2025 13:48:11 +0800
Subject: [PATCH] fix:s
---
LifePayment/LifePayment.Application/User/AccountService.cs | 152 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 125 insertions(+), 27 deletions(-)
diff --git a/LifePayment/LifePayment.Application/User/AccountService.cs b/LifePayment/LifePayment.Application/User/AccountService.cs
index 0837679..58f2164 100644
--- a/LifePayment/LifePayment.Application/User/AccountService.cs
+++ b/LifePayment/LifePayment.Application/User/AccountService.cs
@@ -5,17 +5,22 @@
using LifePayment.Domain.Shared;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
+using Nest;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Linq.Dynamic.Core;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Services;
+using Volo.Abp.Caching;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Identity;
using Volo.Abp.Identity.Application.Contracts.Account;
using Volo.Abp.IdentityModel;
+using Volo.Abp.Threading;
using ZeroD.Util;
+using ZeroD.Util.Fadd;
using static LifePayment.Domain.Shared.LifePaymentConstant;
@@ -25,11 +30,14 @@
{
private readonly IWxManager _wxManager;
private readonly IRepository<LifePayUser, Guid> _lifePayUserRepository;
+ private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRepository;
private readonly IConfiguration _configuration;
private readonly IIdentityModelAuthenticationService _authenticator;
private readonly IRepository<User, Guid> _userRepository;
private readonly IRepository<UserChannle, Guid> _userChannleRep;
private readonly IIdentityUserAppService _identityUserService;
+ private readonly IDistributedCache<string> _distributedCache;
+
public AccountService(
IWxManager wxManager,
@@ -38,31 +46,74 @@
IRepository<User, Guid> userRepository,
IIdentityUserAppService identityUserService,
IRepository<LifePayUser, Guid> lifePayUserRepository,
- IRepository<UserChannle, Guid> userChannleRep)
+ IRepository<LifePayChannles, Guid> lifePayChannlesRepository,
+ IRepository<UserChannle, Guid> userChannleRep,
+ IDistributedCache<string> distributedCache)
{
_configuration = configuration;
_wxManager = wxManager;
_identityUserService = identityUserService;
_lifePayUserRepository = lifePayUserRepository;
+ _lifePayChannlesRepository = lifePayChannlesRepository;
_authenticator = authenticator;
_userRepository = userRepository;
_userChannleRep = userChannleRep;
+ _distributedCache = distributedCache;
}
#region 鏌ヨ
public async Task<WxMiniAppIndentityInfo> GetLifePayWxIndentity(string code)
{
- var res = await _wxManager.GetWxOauth2AccessToken(code);
- var result = new WxMiniAppIndentityInfo
+ var cacheData = await _distributedCache.GetAsync(code);
+ var result = new WxMiniAppIndentityInfo();
+ if (cacheData != null)
{
- SessionKey = res.SessionKey,
- OpenId = res.OpenId,
- UnionId = res.UnionId
- };
+ result.OpenId = cacheData;
+ }
+ else
+ {
+ var res = await _wxManager.GetWxOauth2AccessToken(code);
+ result = new WxMiniAppIndentityInfo
+ {
+ SessionKey = res.SessionKey,
+ OpenId = res.OpenId,
+ UnionId = res.UnionId
+ };
+ if (!string.IsNullOrEmpty(res.OpenId))
+ {
+ await _distributedCache.SetAsync(code, res.OpenId, options: new Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions()
+ {
+ AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(24)
+ });
+ }
+
+ }
+
return result;
}
+
+ public async Task<BackClientUserInfoOutput> GetBackClientUserInfo()
+ {
+ var channlesNums = await _userChannleRep.Where(x => x.UserId == CurrentUser.Id).Select(s => s.ChannleId).Distinct().ToListAsync();
+
+ var channleList = await _lifePayChannlesRepository.Where(x => channlesNums.Contains(x.ChannlesNum)).Select(s => new ChannelOutput()
+ {
+ Name = s.ChannlesName,
+ ChannlesId = s.Id,
+ ChannlesNum = s.ChannlesNum
+ }).ToListAsync();
+
+ BackClientUserInfoOutput result = new BackClientUserInfoOutput()
+ {
+ IsBackClientUser = CurrentUser.ClientId == Constant.ClientType.Back,
+ IsSystem = CurrentUser.IsSystem,
+ ChannleList = channleList
+ };
+ return result;
+ }
+
#endregion
@@ -79,17 +130,8 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task<Guid> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input)
+ public async Task<LifePayPhoneMesssageCodeLoginOutput> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input)
{
- //var vcodeType = VerificationCodeBusinessTypeEnum.LifePayPhoneMesssageCodeLogin;
-
- //var checkResult = await _verificationCodeManager.CheckVerificationCodeByBusinessType(vcodeType,
- // input.PhoneNumber,
- // input.Code,
- // true);
- //CheckExtensions.IfTrueThrowUserFriendlyException(!checkResult,
- // CustomeErrorMessage.SometingWrongOrSometing, "楠岃瘉鐮�", "宸插け鏁�");
-
var lifeUser = await _lifePayUserRepository.Where(x => x.PhoneNumber == input.PhoneNumber).FirstOrDefaultAsync();
if (lifeUser == null)
{
@@ -110,7 +152,56 @@
await _lifePayUserRepository.UpdateAsync(lifeUser);
}
- return lifeUser.Id;
+ List<ChannelOutput> channlesNum = new List<ChannelOutput>();
+ var backClientUser = await _userRepository.Where(x => x.ClientId == Constant.ClientType.Back
+ && x.PhoneNumber == input.PhoneNumber).FirstOrDefaultAsync();
+ if (backClientUser != null)
+ {
+ channlesNum = await _userChannleRep.Where(x => x.UserId == backClientUser.Id)
+ .Select(s => new ChannelOutput()
+ {
+ Name = _lifePayChannlesRepository.Where(x => x.ChannlesNum == s.ChannleId).Select(r => r.ChannlesName).FirstOrDefault(),
+ ChannlesNum = s.ChannleId
+ }).ToListAsync();
+ }
+
+ var result = await LifePayUserMesssageByPhone(lifeUser.PhoneNumber);
+ result.UserId = lifeUser.Id;
+ return result;
+ }
+
+ public async Task<LifePayPhoneMesssageCodeLoginOutput> LifePayUserMesssageByIduser(Guid id)
+ {
+ var lifeUser = await _lifePayUserRepository.Where(x => x.Id == id).FirstOrDefaultAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(lifeUser == null,
+ "鐢ㄦ埛涓嶅瓨鍦�");
+
+ var result = await LifePayUserMesssageByPhone(lifeUser.PhoneNumber);
+ result.UserId = id;
+ return result;
+ }
+
+ public async Task<LifePayPhoneMesssageCodeLoginOutput> LifePayUserMesssageByPhone(string phoneNumber)
+ {
+ List<ChannelOutput> channlesNum = new List<ChannelOutput>();
+ var backClientUser = await _userRepository.Where(x => x.ClientId == Constant.ClientType.Back
+ && x.PhoneNumber == phoneNumber).FirstOrDefaultAsync();
+ if (backClientUser != null)
+ {
+ channlesNum = await _userChannleRep.Where(x => x.UserId == backClientUser.Id)
+ .Select(s => new ChannelOutput()
+ {
+ Name = _lifePayChannlesRepository.Where(x => x.ChannlesNum == s.ChannleId).Select(r => r.ChannlesName).FirstOrDefault(),
+ ChannlesNum = s.ChannleId
+ }).ToListAsync();
+ }
+
+ LifePayPhoneMesssageCodeLoginOutput result = new LifePayPhoneMesssageCodeLoginOutput()
+ {
+ IsBackClientUser = backClientUser == null ? false : true,
+ ChannlesNum = channlesNum
+ };
+ return result;
}
public async Task<IdentityModelTokenCacheItem> GetTokenForWeb(AccessRequestDto accessRequestDto, string webClientIp)
@@ -129,25 +220,27 @@
var user = await _userRepository.Where(r => r.UserName == accessRequestDto.UserName && !r.IsDeleted).FirstOrDefaultAsync();
// 璁板綍鏃ュ織
- // await PublishUserOperateHistoryEvent(LogsSpecies.Login, LogsSpecies.Login, user.Id, user.Id, creatorName: user.Name);
+ // await PublishUserOperateHistoryEvent(LogsSpecies.Login, LogsSpecies.Login, user.Id, user.Id, creatorName: user.Name);
return result;
}
- public async Task<Guid> CreateAccount(CreateAccountInput input, bool isSend, bool isAdminCreate = false, string password = null)
+ public async Task<Guid> CreateAccount(CreateAccountInput input, bool isSend, bool isAdminCreate = false)
{
- if (input.ClientId == LifePaymentConstant.ClientId.Back)
- {
- CheckExtensions.IfTrueThrowUserFriendlyException(!input.CompanyOrgId.HasValue || !input.DepartmentOrgId.HasValue,
- "鎵�灞炲叕鍙稿拰閮ㄩ棬涓嶈兘涓虹┖");
- }
+ //if (input.ClientId == LifePaymentConstant.ClientId.Back)
+ //{
+ // CheckExtensions.IfTrueThrowUserFriendlyException(!input.CompanyOrgId.HasValue || !input.DepartmentOrgId.HasValue,
+ // "鎵�灞炲叕鍙稿拰閮ㄩ棬涓嶈兘涓虹┖");
+ //}
var any = await _userRepository.Where(x => x.PhoneNumber == input.PhoneNumber && x.ClientId == input.ClientId).AnyAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(any,
CustomeErrorMessage.PhoneNumberRepeatSaveFail);
- password ??= GlobalRandom.GetRandomPassword();
+ /// input.Password ??= GlobalRandom.GetRandomPassword();
+ CheckExtensions.IfTrueThrowUserFriendlyException(string.IsNullOrEmpty(input.Password),
+ "璇疯緭鍏ュ瘑鐮�");
var res = await _identityUserService.CreateAsync(new IdentityUserCreateDto
{
Name = input.Name,
@@ -155,7 +248,7 @@
UserName = input.UserName,
RoleNames = input.RoleNames,
ClientId = input.ClientId,
- Password = password,
+ Password = input.Password,
});
var user = await _userRepository.InsertAsync(new User
{
@@ -251,10 +344,15 @@
return res.Id;
}
+
+
+
+
#endregion
#endregion
}
+
}
\ No newline at end of file
--
Gitblit v1.9.1