From b34043b9d0c62eff88b14a2689940bea1c39e38e Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期一, 18 八月 2025 09:24:45 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
index 94880e8..5e369b4 100644
--- a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
@@ -1,10 +1,12 @@
锘縰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;
@@ -29,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;
@@ -46,8 +49,8 @@
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);
@@ -88,7 +91,7 @@
{
if (request.Type == EnumUserType.Operation)
{
- throw Oops.Oh(EnumErrorCodeType.s400, "涓嶆敮鎸佽绫诲瀷璐﹀彿鐧诲綍");
+ throw Oops.Oh(EnumErrorCodeType.s400, "涓嶆敮鎸佹绫诲瀷璐﹀彿鐧诲綍");
}
var snsJscode2session = await wxmpUtils.SnsJscode2sessionAsync(request.Type, request.Code, cancellationToken);
var user = await rep.AsQueryable().AsNoTracking()
@@ -200,7 +203,7 @@
{
if (type == EnumUserType.Enterprise)
{
- throw Oops.Oh(EnumErrorCodeType.s404, "璇ヨ处鍙�");
+ throw Oops.Oh(EnumErrorCodeType.s404, "璐﹀彿");
}
user.PhoneNumber = info.PhoneNumber;
user.ContactPhoneNumber = info.PhoneNumber;
@@ -249,6 +252,7 @@
Type = EnumUserType.Personal,
UserName = request.PhoneNumber,
PhoneNumber = request.PhoneNumber,
+ ContactPhoneNumber = request.PhoneNumber,
IsCheckPhoneNumber = true,
Level = 1,
Status = EnumUserStatus.Normal
@@ -271,18 +275,48 @@
var taskUserQueryable = rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking()
.Where(it => it.EnterpriseEmployee.UserId == model.Id);
model.TaskCount = await taskUserQueryable.CountAsync(tu =>
- tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait
+ 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.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Refuse
+ 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>
--
Gitblit v1.9.1