From 1b84c97dd1cf5a746c5bbb185a0b7400b7f5ca24 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 15 八月 2025 10:08:40 +0800
Subject: [PATCH] pref:优化
---
FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs | 148 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 125 insertions(+), 23 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
index 71a666a..aeceebb 100644
--- a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
@@ -9,6 +9,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Security.Claims;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
@@ -26,7 +27,10 @@
IRequestHandler<SmsLoginCommand, LoginCommandCallback>,
IRequestHandler<WxmpLoginCommand, LoginCommandCallback>,
IRequestHandler<BindWxmpUserInfoCommand, LoginCommandCallback>,
- IRequestHandler<BindPhoneNumberCommand, bool>
+ IRequestHandler<ChangePhoneNumberCommand, bool>,
+ IRequestHandler<RegisterPersonalUserCommand, bool>,
+ IRequestHandler<GetPersonalLoginInfoQuery, GetPersonalLoginInfoQueryResult>,
+ IRequestHandler<GetEnterpriseLoginInfoQuery, GetEnterpriseLoginInfoQueryResult>
{
private readonly IRepository<User> rep = rep;
private readonly SmsUtils smsUtils = smsUtils;
@@ -68,19 +72,6 @@
var user = await rep.AsQueryable().AsNoTracking()
.Where(it => it.UserName == request.PhoneNumber && it.Type == request.Type)
.FirstOrDefaultAsync(cancellationToken);
- if (user == null && request.Type == EnumUserType.Personal)
- {
- user = new User
- {
- Type = request.Type,
- UserName = request.PhoneNumber,
- PhoneNumber = request.PhoneNumber,
- IsCheckPhoneNumber = true,
- Level = 1,
- Status = EnumUserStatus.Normal
- };
- await rep.InsertAsync(user);
- }
if (user == null)
throw Oops.Oh(EnumUserErrorCodeType.u1000);
if (user.Status == EnumUserStatus.Disabled)
@@ -96,11 +87,15 @@
/// <returns></returns>
public async Task<LoginCommandCallback> Handle(WxmpLoginCommand request, CancellationToken cancellationToken)
{
+ if (request.Type == EnumUserType.Operation)
+ {
+ throw Oops.Oh(EnumErrorCodeType.s400, "涓嶆敮鎸佹绫诲瀷璐﹀彿鐧诲綍");
+ }
var snsJscode2session = await wxmpUtils.SnsJscode2sessionAsync(request.Type, request.Code, cancellationToken);
var user = await rep.AsQueryable().AsNoTracking()
.Where(it => it.WxmpOpenId == snsJscode2session.openid && it.Type == request.Type)
.FirstOrDefaultAsync(cancellationToken);
- if (user == null && request.Type == EnumUserType.Personal)
+ if (user == null)
{
user = new User
{
@@ -116,28 +111,34 @@
throw Oops.Oh(EnumUserErrorCodeType.u1000);
if (user.Status == EnumUserStatus.Disabled)
throw Oops.Oh(EnumUserErrorCodeType.u1001);
- return GetCurrentLogier(user, EnumClientType.Wxmp);
+ return GetCurrentLogier(user, EnumClientType.Wxmp, snsJscode2session.session_key);
}
/// <summary>
- /// 缁戝畾鎵嬫満鍙�
+ /// 鏇存崲鎵嬫満鍙�
/// </summary>
/// <param name="request"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public async Task<bool> Handle(BindPhoneNumberCommand request, CancellationToken cancellationToken)
+ public async Task<bool> Handle(ChangePhoneNumberCommand request, CancellationToken cancellationToken)
{
await smsUtils.CheckVerifyCode(new CheckVerifyCodeModel
{
PhoneNumber = request.PhoneNumber,
VerifyCode = request.VerifyCode,
- TemplateCode = EnumSmsTemplateCode.LoginOrRegister
+ TemplateCode = EnumSmsTemplateCode.UpdateUserPhoneNumber
});
var logier = JwtUtils.GetCurrentLogier();
var user = await rep.AsQueryable()
.FirstOrDefaultAsync(it => it.Id == logier.Id);
if (user == null)
throw Oops.Oh(EnumErrorCodeType.s404, "褰撳墠璐﹀彿涓嶅瓨鍦�");
+
+ var exist = await rep.AsQueryable()
+ .Where(it => it.Type == logier.Type && it.PhoneNumber == request.PhoneNumber && it.Id != user.Id)
+ .AnyAsync(cancellationToken);
+ if (exist) throw Oops.Oh(EnumUserErrorCodeType.u1010);
+
user.UserName = request.PhoneNumber;
user.PhoneNumber = request.PhoneNumber;
user.IsCheckPhoneNumber = true;
@@ -153,9 +154,15 @@
/// <exception cref="NotImplementedException"></exception>
public async Task<LoginCommandCallback> Handle(BindWxmpUserInfoCommand request, CancellationToken cancellationToken)
{
- var logier = JwtUtils.GetCurrentLogier();
+ var claims = JWTEncryption.ReadJwtToken(request.AccessToken).Claims;
+ var claimIdentity = new ClaimsIdentity("AuthenticationTypes.Federation");
+ claimIdentity.AddClaims(claims);
+ var claimsPrincipal = new ClaimsPrincipal(claimIdentity);
+ var id = claimsPrincipal.FindFirstValue("Id").ToGuid();
+ var type = claimsPrincipal.FindFirstValue("Type").ToEnum<EnumUserType>();
+
var user = await rep.AsQueryable()
- .Where(it => it.Type == logier.Type && it.Id == logier.Id)
+ .Where(it => it.Type == type && it.Id == id)
.FirstOrDefaultAsync(cancellationToken);
if (user == null) throw Oops.Oh(EnumErrorCodeType.s404, "褰撳墠璐﹀彿");
if (user.WxmpOpenId.IsNull()) throw Oops.Oh(EnumUserErrorCodeType.u1100);
@@ -188,10 +195,14 @@
}
var bindPhoneNumberUser = await rep.AsQueryable()
- .Where(it => it.Type == logier.Type && it.PhoneNumber == info.PhoneNumber && it.Id != user.Id)
+ .Where(it => it.Type == type && it.PhoneNumber == info.PhoneNumber && it.Id != user.Id)
.FirstOrDefaultAsync(cancellationToken);
if (bindPhoneNumberUser == null)
{
+ if (type == EnumUserType.Enterprise)
+ {
+ throw Oops.Oh(EnumErrorCodeType.s404, "璐﹀彿");
+ }
user.PhoneNumber = info.PhoneNumber;
user.ContactPhoneNumber = info.PhoneNumber;
user.IsCheckPhoneNumber = true;
@@ -216,12 +227,101 @@
}
/// <summary>
+ /// 娉ㄥ唽涓汉璐﹀彿
+ /// </summary>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<bool> Handle(RegisterPersonalUserCommand request, CancellationToken cancellationToken)
+ {
+ await smsUtils.CheckVerifyCode(new CheckVerifyCodeModel
+ {
+ PhoneNumber = request.PhoneNumber,
+ VerifyCode = request.VerifyCode,
+ TemplateCode = EnumSmsTemplateCode.LoginOrRegister
+ });
+ var user = await rep.AsQueryable()
+ .FirstOrDefaultAsync(it => it.Type == EnumUserType.Personal && it.UserName == request.PhoneNumber);
+ if (user != null)
+ throw Oops.Oh(EnumUserErrorCodeType.u1010);
+
+ user = new User
+ {
+ Type = EnumUserType.Personal,
+ UserName = request.PhoneNumber,
+ PhoneNumber = request.PhoneNumber,
+ ContactPhoneNumber = request.PhoneNumber,
+ IsCheckPhoneNumber = true,
+ Level = 1,
+ Status = EnumUserStatus.Normal
+ };
+ await rep.InsertAsync(user);
+
+ return true;
+ }
+
+ /// <summary>
+ /// 鏌ヨ涓汉鐢ㄦ埛鐧诲綍淇℃伅
+ /// </summary>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<GetPersonalLoginInfoQueryResult> Handle(GetPersonalLoginInfoQuery request, CancellationToken cancellationToken)
+ {
+ var model = await rep.GetPersonalQueryable(true)
+ .GetDetail<User, GetPersonalLoginInfoQueryResult>(cancellationToken);
+ var taskUserQueryable = rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking()
+ .Where(it => it.EnterpriseEmployee.UserId == model.Id);
+ model.TaskCount = await taskUserQueryable.CountAsync(tu =>
+ tu.HireStatus == EnumTaskUserHireStatus.Wait
+ || tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait);
+ model.HirePassTaskCount = await taskUserQueryable.CountAsync(tu =>
+ tu.ArrangeStatus == EnumTaskUserArrangeStatus.Complete);
+ model.HireRefuseTaskCount = await taskUserQueryable.CountAsync(tu =>
+ tu.HireStatus == EnumTaskUserHireStatus.Refuse
+ || tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Refuse
+ || tu.EnterpriseEmployee.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Refuse);
+ return model;
+ }
+
+ /// <summary>
+ /// 鏌ヨ浼佷笟鐢ㄦ埛鐧诲綍淇℃伅
+ /// </summary>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<GetEnterpriseLoginInfoQueryResult> Handle(GetEnterpriseLoginInfoQuery request, CancellationToken cancellationToken)
+ {
+ var logier = JwtUtils.GetCurrentLogier();
+ var model = await rep.AsQueryable().AsNoTracking()
+ .Where(it => it.Id == logier.Id)
+ .GetDetail<User, GetEnterpriseLoginInfoQueryResult>(cancellationToken);
+ model.Roles = await rep.Change<Role>().AsQueryable().AsNoTracking()
+ .Where(it => it.UserRoles.Any(ur => ur.UserId == logier.Id))
+ .Select(it => it.Name)
+ .ToListAsync();
+ var collects = await rep.Change<EnterpriseUserCollect>().AsQueryable().AsNoTracking()
+ .Where(it => it.EnterpriseId == logier.EnterpriseId)
+ .Select(it => new
+ {
+ it.UserId,
+ it.IsCollected,
+ it.IsContacted
+ })
+ .ToListAsync();
+ model.CollectedUserCount = collects.Count(it => it.IsCollected);
+ model.ContactedRecordCount = collects.Count(it => it.IsContacted);
+ return model;
+ }
+
+ /// <summary>
/// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
/// </summary>
/// <param name="user"></param>
/// <param name="clientType"></param>
+ /// <param name="session_key"></param>
/// <returns></returns>
- private LoginCommandCallback GetCurrentLogier(User user, EnumClientType clientType)
+ private LoginCommandCallback GetCurrentLogier(User user, EnumClientType clientType, string? session_key = null)
{
var logier = new CurrentLogier
{
@@ -242,6 +342,8 @@
Id = logier.Id,
AccessToken = logier.AccessToken,
RefreshToken = logier.RefreshToken,
+ SessionKey = session_key,
+ IsBindPhoneNumber = logier.PhoneNumber.IsNotNull()
};
}
}
--
Gitblit v1.9.1