From 547c7d1b6d57d8dbe1ac58080d836613df71aea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com>
Date: Mon, 29 Apr 2024 14:42:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Managers/UserManager.cs                        | 14 ++++++++++----
 .../src/Yi.Abp.Web/Properties/launchSettings.json  |  4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs
index 64388c27..7d72138f 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/UserManager.cs
@@ -1,11 +1,8 @@
 using System.Text.RegularExpressions;
 using Mapster;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using TencentCloud.Ame.V20190916.Models;
 using Volo.Abp.Authorization;
 using Volo.Abp.Caching;
 using Volo.Abp.Domain.Services;
@@ -109,7 +106,16 @@ namespace Yi.Framework.Rbac.Domain.Managers
                 throw new UserFriendlyException("密码需大于等于6位！");
             }
 
-            var isExist = await _repository.IsAnyAsync(x => x.UserName == userEntity.UserName || x.Phone == userEntity.Phone);
+            if (userEntity.Phone is not null)
+            {
+                if (await _repository.IsAnyAsync(x => x.Phone == userEntity.Phone))
+                {
+                    throw new UserFriendlyException("用户手机号已重复");
+
+                }
+            }
+
+            var isExist = await _repository.IsAnyAsync(x => x.UserName == userEntity.UserName);
             if (isExist)
             {
                 throw new UserFriendlyException("用户已存在，创建失败");
diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Properties/launchSettings.json b/Yi.Abp.Net8/src/Yi.Abp.Web/Properties/launchSettings.json
index 56770734..8f58fa9b 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/Properties/launchSettings.json
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Properties/launchSettings.json
@@ -5,8 +5,8 @@
       "launchBrowser": true,
       "launchUrl": "swagger",
       "environmentVariables": {
-        //"ASPNETCORE_ENVIRONMENT": "Development"
-        ,"ASPNETCORE_ENVIRONMENT": "Staging"
+        //"ASPNETCORE_ENVIRONMENT": "Development",
+        "ASPNETCORE_ENVIRONMENT": "Staging"
       },
       "dotnetRunMessages": true,
       "applicationUrl": "http://localhost:19001"