更新Identity中文描述

yidaibawang · Mar 28, 2018 · 652708d · 652708d
1 parent 762e285
commit 652708d
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 6 deletions.
diff --git a/build/version.props b/build/version.props
@@ -3,7 +3,7 @@
 		<VersionMajor>1</VersionMajor>
 		<VersionMinor>0</VersionMinor>
 		<VersionPatch>9</VersionPatch>
-		<VersionQuality>7</VersionQuality>
+		<VersionQuality>8</VersionQuality>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 		<VersionSuffix>preview$(VersionQuality)</VersionSuffix>
 	</PropertyGroup>

diff --git a/sample/Util.Samples.Webs/package.json b/sample/Util.Samples.Webs/package.json
@@ -56,7 +56,6 @@
     "typescript": "2.7.2",
     "url-loader": "1.0.1",
     "webpack": "3.11.0",
-    "webpack-cli": "2.0.12",
     "webpack-hot-middleware": "2.21.2",
     "angular-router-loader": "0.8.2"
   }

diff --git a/src/Util.Datas/Ef/Internal/DbContextWrapper.cs b/src/Util.Datas/Ef/Internal/DbContextWrapper.cs
@@ -118,7 +118,7 @@ public TEntity Single( Expression<Func<TEntity, bool>> predicate ) {
         /// 获取单个实体
         /// </summary>
         /// <param name="predicate">查询条件</param>
-        /// <param name="cancellationToken">取消标识</param>
+        /// <param name="cancellationToken">取消令牌</param>
         public async Task<TEntity> SingleAsync( Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default( CancellationToken ) ) {
             return await Find().FirstOrDefaultAsync( predicate, cancellationToken );
         }

diff --git a/src/Util.Security/Identity/Describers/IdentityErrorChineseDescriber.cs b/src/Util.Security/Identity/Describers/IdentityErrorChineseDescriber.cs
@@ -8,7 +8,6 @@ public class IdentityErrorChineseDescriber : IdentityErrorDescriber {
         /// <summary>
         /// 密码太短
         /// </summary>
-        /// <param name="length">密码长度</param>
         public override IdentityError PasswordTooShort( int length ) {
             return new IdentityError {
                 Code = nameof( PasswordTooShort ),
@@ -65,5 +64,25 @@ public override IdentityError InvalidUserName( string userName ) {
                 Description = string.Format( SecurityResource.InvalidUserName, userName )
             };
         }
+
+        /// <summary>
+        /// 用户名重复
+        /// </summary>
+        public override IdentityError DuplicateUserName( string userName ) {
+            return new IdentityError {
+                Code = nameof( DuplicateUserName ),
+                Description = string.Format( SecurityResource.DuplicateUserName, userName )
+            };
+        }
+
+        /// <summary>
+        /// 电子邮件重复
+        /// </summary>
+        public override IdentityError DuplicateEmail( string email ) {
+            return new IdentityError {
+                Code = nameof( DuplicateEmail ),
+                Description = string.Format( SecurityResource.DuplicateEmail, email )
+            };
+        }
     }
 }
diff --git a/src/Util.Security/Identity/Options/UserOptions.cs b/src/Util.Security/Identity/Options/UserOptions.cs
@@ -9,7 +9,7 @@ public class UserOptions {
         public string UserNameCharacters { get; set; } = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._@+";
 
         /// <summary>
-        /// 每个用户具有唯一的电子邮件，默认不启用
+        /// 用户的电子邮件必须唯一，默认不启用
         /// </summary>
         public bool UniqueEmail { get; set; }
     }

diff --git a/src/Util.Security/SecurityResource.Designer.cs b/src/Util.Security/SecurityResource.Designer.cs
diff --git a/src/Util.Security/SecurityResource.resx b/src/Util.Security/SecurityResource.resx
@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="DuplicateEmail" xml:space="preserve">
+    <value>电子邮件 {0} 已存在</value>
+  </data>
+  <data name="DuplicateUserName" xml:space="preserve">
+    <value>用户名 {0} 已存在</value>
+  </data>
   <data name="InvalidUserName" xml:space="preserve">
     <value>用户名 {0} 无效，仅允许字母或数字</value>
   </data>

diff --git a/src/Util/Domains/Repositories/IReadableRepository.cs b/src/Util/Domains/Repositories/IReadableRepository.cs
@@ -87,7 +87,7 @@ public interface IReadableRepository<TEntity, in TKey> : IScopeDependency where
         /// 获取单个实体
         /// </summary>
         /// <param name="predicate">查询条件</param>
-        /// <param name="cancellationToken">取消标识</param>
+        /// <param name="cancellationToken">取消令牌</param>
         Task<TEntity> SingleAsync( Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default( CancellationToken ) );
         /// <summary>
         /// 查找实体集合