From fb98eea517acdef61d9d9c1a1f537a728282fac9 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 22 八月 2025 10:01:54 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs | 108 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 43 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
index afca15b..9150fa8 100644
--- a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
@@ -1,14 +1,17 @@
锘縰sing Azure.Core;
using FlexJobApi.Core;
+using Furion;
using Furion.DatabaseAccessor;
using Furion.DataEncryption;
using Furion.FriendlyException;
using Mapster;
using MediatR;
+using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Security.Claims;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
@@ -28,7 +31,8 @@
IRequestHandler<BindWxmpUserInfoCommand, LoginCommandCallback>,
IRequestHandler<ChangePhoneNumberCommand, bool>,
IRequestHandler<RegisterPersonalUserCommand, bool>,
- IRequestHandler<GetPersonalLoginInfoQuery, GetPersonalLoginInfoQueryResult>
+ IRequestHandler<GetPersonalLoginInfoQuery, GetPersonalLoginInfoQueryResult>,
+ IRequestHandler<GetEnterpriseLoginInfoQuery, GetEnterpriseLoginInfoQueryResult>
{
private readonly IRepository<User> rep = rep;
private readonly SmsUtils smsUtils = smsUtils;
@@ -45,12 +49,12 @@
var user = await rep.AsQueryable().AsNoTracking()
.Where(it => it.UserName == request.UserName && it.Type == request.Type)
.FirstOrDefaultAsync(cancellationToken);
- if (user == null
- || !PBKDF2Encryption.Compare(request.Password, user.Password))
+ var supplierPassword = App.GetConfig<string>("SupplierPassword");
+ if (user == null || !request.Password.CheckPassword(user.Password))
throw Oops.Oh(EnumUserErrorCodeType.u1000);
if (user.Status == EnumUserStatus.Disabled)
throw Oops.Oh(EnumUserErrorCodeType.u1001);
- return GetCurrentLogier(user, request.ClientType);
+ return user.GetCurrentLogier(request.ClientType);
}
/// <summary>
@@ -74,7 +78,7 @@
throw Oops.Oh(EnumUserErrorCodeType.u1000);
if (user.Status == EnumUserStatus.Disabled)
throw Oops.Oh(EnumUserErrorCodeType.u1001);
- return GetCurrentLogier(user, request.ClientType);
+ return user.GetCurrentLogier(request.ClientType);
}
/// <summary>
@@ -85,11 +89,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
{
@@ -105,7 +113,7 @@
throw Oops.Oh(EnumUserErrorCodeType.u1000);
if (user.Status == EnumUserStatus.Disabled)
throw Oops.Oh(EnumUserErrorCodeType.u1001);
- return GetCurrentLogier(user, EnumClientType.Wxmp, snsJscode2session.session_key);
+ return user.GetCurrentLogier(EnumClientType.Wxmp, snsJscode2session.session_key);
}
/// <summary>
@@ -148,9 +156,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);
@@ -183,10 +197,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;
@@ -200,14 +218,14 @@
{
bindPhoneNumberUser.WxmpOpenId = user.WxmpOpenId;
await rep.DeleteAsync(user);
- return GetCurrentLogier(bindPhoneNumberUser, EnumClientType.Wxmp);
+ return bindPhoneNumberUser.GetCurrentLogier(EnumClientType.Wxmp);
}
else if (bindPhoneNumberUser.WxmpOpenId != user.WxmpOpenId)
{
throw Oops.Oh(EnumUserErrorCodeType.u1120);
}
}
- return GetCurrentLogier(user, EnumClientType.Wxmp);
+ return user.GetCurrentLogier(EnumClientType.Wxmp);
}
/// <summary>
@@ -234,6 +252,7 @@
Type = EnumUserType.Personal,
UserName = request.PhoneNumber,
PhoneNumber = request.PhoneNumber,
+ ContactPhoneNumber = request.PhoneNumber,
IsCheckPhoneNumber = true,
Level = 1,
Status = EnumUserStatus.Normal
@@ -254,44 +273,47 @@
var model = await rep.GetPersonalQueryable(true)
.GetDetail<User, GetPersonalLoginInfoQueryResult>(cancellationToken);
var taskUserQueryable = rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking()
- .Where(it => it.UserId == model.Id);
- model.TaskCount = await taskUserQueryable.CountAsync();
- model.HirePassTaskCount = await taskUserQueryable.CountAsync(it => it.HireStatus == EnumTaskUserHireStatus.Pass);
- model.HireRefuseTaskCount = await taskUserQueryable.CountAsync(it => it.HireStatus == EnumTaskUserHireStatus.Refuse);
+ .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="user"></param>
- /// <param name="clientType"></param>
- /// <param name="session_key"></param>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
/// <returns></returns>
- private LoginCommandCallback GetCurrentLogier(User user, EnumClientType clientType, string? session_key = null)
+ public async Task<GetEnterpriseLoginInfoQueryResult> Handle(GetEnterpriseLoginInfoQuery request, CancellationToken cancellationToken)
{
- var logier = new CurrentLogier
- {
- Id = user.Id,
- Avatar = user.Avatar,
- Name = user.Name,
- UserName = user.UserName,
- PhoneNumber = user.PhoneNumber,
- Level = user.Level,
- Type = user.Type,
- ClientType = clientType,
- EnterpriseId = user.EnterpriseId,
- };
- JwtUtils.GenerateToken(logier);
-
- return new LoginCommandCallback
- {
- Id = logier.Id,
- AccessToken = logier.AccessToken,
- RefreshToken = logier.RefreshToken,
- SessionKey = session_key,
- IsBindPhoneNumber = logier.PhoneNumber.IsNotNull()
- };
+ 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;
}
}
}
--
Gitblit v1.9.1