修改了一些字段

username@email.com

9 天以前 1978a2687b298a69bc72d6eda0be8235bbca37d8

 Admin.NET/FZCTB.NET.API.Application/Auth/AuthService.cs

@@ -1,31 +1,23 @@
using Admin.NET.Core.Service;
using Admin.NET.Core;
using Admin.NET.Core;
using Admin.NET.Core.Service;
using cylsg.utility.Extend;
using Furion;
using Furion.DataEncryption;
using Furion.DynamicApiController;
using Furion.EventBus;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Lazy.Captcha.Core;
using Microsoft.AspNetCore.Http;
using FZCZTB.NET.MD.CutomerMd;
using Microsoft.AspNetCore.Authorization;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel;
using FZCZTB.NET.SYSService.MSM;
using FZCTB.NET.API.Application.Auth.DTO;
using Furion.FriendlyException;
using FZCZTB.NET.SYSService.CustomerSYS;
using Furion;
using NewLife;
using cylsg.utility.Extend;
using static QRCoder.PayloadGenerator;
using FZCTB.NET.API.Application.Auth.DTO;
using FZCZTB.NET.MD.CutomerMd;
using FZCZTB.NET.MD.CutomerMd.Extend;
using Furion.DependencyInjection;
using FZCZTB.NET.SYSService.MSM;
using Lazy.Captcha.Core;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using NewLife;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;

namespace FZCTB.NET.API.Application.Auth
{
@@ -33,25 +25,22 @@
    /// 鉴权服务
    /// </summary>
    [ApiDescriptionSettings("FZCAPISYS", Order = 149)]
    public class AuthService: IDynamicApiController
    public class AuthService : IDynamicApiController
    {


        private readonly SMSConfigOptions _smsOptions;
        private readonly SqlSugarRepository<FBS_CustormerUsers> _sysUserRep;
        private readonly SqlSugarRepository<FBS_CoutomerExRole> _sysUserExRol;
        private readonly SqlSugarRepository<FBS_ExRole> _sysExRol;
        private readonly IHttpContextAccessor _httpContextAccessor;
        private readonly SysMenuService _sysMenuService;
        private readonly SysOnlineUserService _sysOnlineUserService;
        private readonly SysConfigService _sysConfigService;
        private readonly SysUserService _sysUserService;
        private readonly ZCSMSService _sysSmsService;
        private readonly SysLdapService _sysLdapService;
        private readonly ICaptcha _captcha;
        private readonly IEventPublisher _eventPublisher;
        private readonly IHttpContextAccessor _httpContextAccessor;
        private readonly SMSConfigOptions _smsOptions;
        private readonly SysCacheService _sysCacheService;

        private readonly SysConfigService _sysConfigService;
        private readonly SqlSugarRepository<FBS_ExRole> _sysExRol;
        private readonly SysLdapService _sysLdapService;
        private readonly SysMenuService _sysMenuService;
        private readonly SysOnlineUserService _sysOnlineUserService;
        private readonly ZCSMSService _sysSmsService;
        private readonly SqlSugarRepository<FBS_CoutomerExRole> _sysUserExRol;
        private readonly SqlSugarRepository<FBS_CustormerUsers> _sysUserRep;
        private readonly SysUserService _sysUserService;
        public AuthService(
            SqlSugarRepository<FBS_CustormerUsers> sysUserRep,
             SqlSugarRepository<FBS_CoutomerExRole> sysUserExRol,
@@ -66,14 +55,14 @@
            SysUserService sysUserService,
            IOptions<SMSConfigOptions> smsConfigOptions,
            SqlSugarRepository<FBS_ExRole> exrel,
         

            ICaptcha captcha
            

            )
        {
            _captcha = captcha;
            _sysUserRep = sysUserRep;
       

            _sysSmsService = sysSmsService;
            _eventPublisher = eventPublisher;
            _sysUserService = sysUserService;
@@ -89,78 +78,6 @@
        }

        /// <summary>
        /// 手机号登录 🔖
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [AllowAnonymous]
        [DisplayName("手机号登录")]
        public virtual async Task<CustomerLoginOutput> LoginPhone([Required] CustomerLoginPhoneInput input)
        {
            if(input.Id>0)
            {
                //最后一次确认登陆状态
                var verifyCode = _sysCacheService.Get<string>($"{CacheConst.KeyPhoneVerCode}{input.Phone}");
                if (string.IsNullOrWhiteSpace(verifyCode)) throw Oops.Oh("验证码不存在或已失效，请重新获取！");
               
                _sysCacheService.Remove($"{CacheConst.KeyPhoneVerCode}{input.Phone}");
                if (verifyCode != input.Code)
                    throw Oops.Oh("登录码失效");
                    var user = await _sysUserRep.AsQueryable().Where(x => x.Id == input.Id && x.IsEn == true).FirstAsync();
                if(user == null)
                    throw Oops.Oh("没有找到该手机用户");
                return await CreateToken(user, input.ExRuleCode ?? "");
            }
            if(input.Code!="TEST")
            // 校验短信验证码
            _sysSmsService.VerifyCode(new SmsVerifyCodeInput { Phone = input.Phone, Code = input.Code });

            // 获取登录租户和用户
            // 获取登录租户和用户
            var userList = await _sysUserRep.AsQueryable().Where(x => x.PhoneNumber == input.Phone&&x.IsEn==true).Includes(x=>x.CusExtend).ToListAsync();
            if (userList == null)
            {
              throw    Oops.Oh("没有找到该手机用户");
            }
            if(userList.Count>1)
            {
                // 生成随机验证码
                var random = new Random();
                var verifyCode = random.Next(100000, 999999);
                //需要二次登陆
                var aRet = new CustomerLoginOutput
                {
                    TheLastLogo = false,
                    CustomerExs = new List<CustomerExVm>(),
                    Code = verifyCode.ToString(),

                  

                };
                _sysCacheService.Set($"{CacheConst.KeyPhoneVerCode}{input.Phone}", verifyCode.ToString(), TimeSpan.FromSeconds(_smsOptions.lingKai.VerifyTimeOut.ToInt()));
                foreach (var item in userList)
                {
                    aRet.CustomerExs.Add(new CustomerExVm
                    {
                        CustomerUserID = item.Id,
                        EnterpriseName = item.CusExtend.EnterpriseName,
                        UnifiedSocialCreditCode = item.CusExtend.UnifiedSocialCreditCode.MaskMiddle(),
                        IsManger = item.IsManager


                    });
                }
               return aRet;

            }

          


            return await CreateToken(userList[0], input.ExRuleCode??"");
        }

        /// <summary>
        ///  切换角色 已登录进去角色或者切换角色是调用，需要替换Token,相当于登录
        /// </summary>
        [DisplayName("切换角色")]
@@ -170,10 +87,9 @@
            if (id == 0)
            {
                throw Oops.Oh("用户凭证错误");

            }
            var rols = await _sysExRol.GetFirstAsync(x => x.Code == RuleCode && x.Status == StatusEnum.Enable);
            if(rols==null)
            if (rols == null)
                throw Oops.Oh("角色已经下线");

            // 获取登录租户和用户
@@ -187,14 +103,79 @@
            {
                throw Oops.Oh("用异常");
            }
          var exr=  await  _sysUserExRol.GetFirstAsync(x=>x.CusExtendId==user.CusExtendId&&x.ExRoleId== rols.Id);
            if (exr==null)
            var exr = await _sysUserExRol.GetFirstAsync(x => x.CusExtendId == user.CusExtendId && x.ExRoleId == rols.Id);
            if (exr == null)
                throw Oops.Oh("没有申请该角色");

            return await CreateToken(user, RuleCode);

        }

        /// <summary>
        /// 手机号登录 🔖
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [AllowAnonymous]
        [DisplayName("手机号登录")]
        public virtual async Task<CustomerLoginOutput> LoginPhone([Required] CustomerLoginPhoneInput input)
        {
            if (input.Id > 0)
            {
                //最后一次确认登陆状态
                var verifyCode = _sysCacheService.Get<string>($"{CacheConst.KeyPhoneVerCode}{input.Phone}");
                if (string.IsNullOrWhiteSpace(verifyCode)) throw Oops.Oh("验证码不存在或已失效，请重新获取！");

                _sysCacheService.Remove($"{CacheConst.KeyPhoneVerCode}{input.Phone}");
                if (verifyCode != input.Code)
                    throw Oops.Oh("登录码失效");
                var user = await _sysUserRep.AsQueryable().Where(x => x.Id == input.Id && x.IsEn == true).FirstAsync();
                if (user == null)
                    throw Oops.Oh("没有找到该手机用户");
                return await CreateToken(user, input.ExRuleCode ?? "");
            }
            if (input.Code != "TEST")
                // 校验短信验证码
                _sysSmsService.VerifyCode(new SmsVerifyCodeInput { Phone = input.Phone, Code = input.Code });

            // 获取登录租户和用户
            // 获取登录租户和用户
            var userList = await _sysUserRep.AsQueryable().Where(x => x.PhoneNumber == input.Phone && x.IsEn == true).Includes(x => x.CusExtend).ToListAsync();
            if (userList == null)
            {
                throw Oops.Oh("没有找到该手机用户");
            }
            if (userList.Count > 1)
            {
                // 生成随机验证码
                var random = new Random();
                var verifyCode = random.Next(100000, 999999);
                //需要二次登陆
                var aRet = new CustomerLoginOutput
                {
                    TheLastLogo = false,
                    CustomerExs = new List<CustomerExVm>(),
                    Code = verifyCode.ToString(),
                };
                _sysCacheService.Set($"{CacheConst.KeyPhoneVerCode}{input.Phone}", verifyCode.ToString(), TimeSpan.FromSeconds(_smsOptions.lingKai.VerifyTimeOut.ToInt()));
                foreach (var item in userList)
                {
                    aRet.CustomerExs.Add(new CustomerExVm
                    {
                        CustomerUserID = item.Id,
                        EnterpriseName = item.CusExtend.EnterpriseName,
                        UnifiedSocialCreditCode = item.CusExtend.UnifiedSocialCreditCode.MaskMiddle(),
                        IsManger = item.IsManager




                    });
                }
                return aRet;
            }

            return await CreateToken(userList[0], input.ExRuleCode ?? "");
        }
        /// <summary>
        /// 手机号登录 🔖
        /// </summary>
@@ -212,7 +193,6 @@
            //var user = await _sysUserRep.AsQueryable().Where(x=>x.Account==input.Phone).Includes(x => x.CoutomerExRols, y => y.ExRole).FirstAsync();
            //if(user==null)
            //{
                
            //}

            //return await CreateToken(user, input.ExRuleCode );
@@ -225,7 +205,7 @@
        /// <param name="sysUserEventTypeEnum"></param>\
        /// <returns></returns>
        [NonAction]
        internal  async Task<CustomerLoginOutput> CreateToken(FBS_CustormerUsers user,string ExRuleCode, SysUserEventTypeEnum sysUserEventTypeEnum = SysUserEventTypeEnum.Login)
        internal async Task<CustomerLoginOutput> CreateToken(FBS_CustormerUsers user, string ExRuleCode, SysUserEventTypeEnum sysUserEventTypeEnum = SysUserEventTypeEnum.Login)
        {
            // 单用户登录
            await _sysOnlineUserService.SingleLogin(user.Id);
@@ -237,8 +217,8 @@
            { ClaimConst.UserId, user.Id },
            { ClaimConst.TenantId, user.CusExtendId },
            { ClaimConst.Account, user.PhoneNumber.PrivacyStr() },
            { ClaimConst.RealName, user.Nickname??user.Name },        
         
            { ClaimConst.RealName, user.Nickname??user.Name },

            { ClaimConst.UserType, "Customer" },
              { ClaimConst.CustomerExId, user.CusExtendId },
                { ClaimConst.CustomerLogoinType, ExRuleCode },
@@ -274,20 +254,11 @@
                {
                    AccessToken = accessToken,
                    RefreshToken = refreshToken,
                     TheLastLogo=true,
                      

                     
                     



                    TheLastLogo = true,
                    IsManager = user.IsManager
                }
 
               
            };
            payload.Output.ExRoles = new List<CustomerExRoleVm>();


            payload.Output.ExRoles = await _sysUserExRol.AsQueryable().Where(x => x.CusExtendId == user.CusExtendId).Includes(x => x.ExRole).Select(x => new CustomerExRoleVm
            {
@@ -296,11 +267,10 @@
                Name = x.ExRole.Name
            }).ToListAsync();

           
            //暂时不出用户事件
            // 发布系统用户操作事件
            //await _eventPublisher.PublishAsync(sysUserEventTypeEnum, payload);
            return payload.Output;
        }
    }
}
}