From 28db30e5a458ee012959269d50e16eadaa0c5d12 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 05 九月 2025 15:10:09 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs | 57 +++++++++++++--------------------------------------------
1 files changed, 13 insertions(+), 44 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
index 4c90c52..9150fa8 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;
@@ -47,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>
@@ -76,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>
@@ -89,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()
@@ -111,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>
@@ -201,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;
@@ -216,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>
@@ -273,12 +275,12 @@
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;
@@ -312,39 +314,6 @@
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, string? session_key = null)
- {
- 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()
- };
}
}
}
--
Gitblit v1.9.1