fix: 修改声明扩展以及调整包ID

Author: jianxuanbing

framework/src/Bing.Caching.FreeRedis/project.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <AssemblyName>Bing.Caching.FreeRedis</AssemblyName>
-    <PackageId>BingNS.Caching.FreeRedis</PackageId>
+    <PackageId>Bing.Caching.FreeRedis</PackageId>
     <Description>Bing.Caching.FreeRedis是基于FreeRedis实现Redis缓存操作类库。</Description>
   </PropertyGroup>
 </Project>

framework/src/Bing.FreeSQL.MySql/project.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <AssemblyName>Bing.FreeSQL.MySql</AssemblyName>
-    <PackageId>BingNS.FreeSQL.MySql</PackageId>
+    <PackageId>Bing.FreeSQL.MySql</PackageId>
     <Description>Bing.FreeSQL.MySql 是Bing应用框架的FreeSQL.MySql数据访问类库。</Description>
   </PropertyGroup>
 </Project>

framework/src/Bing.FreeSQL/project.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <AssemblyName>Bing.FreeSQL</AssemblyName>
-    <PackageId>BingNS.FreeSQL</PackageId>
+    <PackageId>Bing.FreeSQL</PackageId>
     <Description>Bing.FreeSQL 是Bing应用框架的FreeSQL数据访问核心类库。</Description>
   </PropertyGroup>
 </Project>

framework/src/Bing.Locks.CSRedis/project.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <AssemblyName>Bing.Locks.CSRedis</AssemblyName>
-    <PackageId>BingNS.Locks.CSRedis</PackageId>
+    <PackageId>Bing.Locks.CSRedis</PackageId>
     <Description>Bing.Locks.CSRedis是Bing应用框架的基于Redis实现的分布式锁操作类库。</Description>
   </PropertyGroup>
 </Project>

framework/src/Bing.ObjectMapping/project.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <AssemblyName>Bing.ObjectMapping</AssemblyName>
-    <PackageId>BingNS.ObjectMapping</PackageId>
+    <PackageId>Bing.ObjectMapping</PackageId>
     <Description>Bing.ObjectMapping是Bing应用框架的对象映射抽象类库。</Description>
   </PropertyGroup>
 </Project>

framework/src/Bing.Security/Bing/Security/Claims/BingClaimTypes.cs

@@ -10,6 +10,16 @@ public static class BingClaimTypes
         /// </summary>
         public static string UserName { get; set; } = System.Security.Claims.ClaimTypes.Name;
 
+        /// <summary>
+        /// 名字，默认：<see cref="System.Security.Claims.ClaimTypes.GivenName"/>
+        /// </summary>
+        public static string Name { get; set; } = System.Security.Claims.ClaimTypes.GivenName;
+
+        /// <summary>
+        /// 姓。默认：<see cref="System.Security.Claims.ClaimTypes.Surname"/>
+        /// </summary>
+        public static string SurName { get; set; } = System.Security.Claims.ClaimTypes.Surname;
+
         /// <summary>
         /// 姓名。默认："full_name"
         /// </summary>

framework/src/Bing.Security/System/Security/Principal/BingClaimsIdentityExtensions.cs

@@ -141,5 +141,49 @@ public static string FindClientId(this IIdentity identity)
         }
 
         #endregion
+
+        #region Add(添加)
+
+        /// <summary>
+        /// 添加。如果不存在指定声明，则进行添加
+        /// </summary>
+        /// <param name="claimsIdentity">声明标识</param>
+        /// <param name="claim">声明</param>
+        public static ClaimsIdentity AddIfNotContains(this ClaimsIdentity claimsIdentity, Claim claim)
+        {
+            Check.NotNull(claimsIdentity, nameof(claimsIdentity));
+            if (!claimsIdentity.Claims.Any(x => string.Equals(x.Type, claim.Type, StringComparison.OrdinalIgnoreCase)))
+                claimsIdentity.AddClaim(claim);
+            return claimsIdentity;
+        }
+
+        /// <summary>
+        /// 添加或替换。如果指定声明不存在直接添加，否则进行替换
+        /// </summary>
+        /// <param name="claimsIdentity">声明标识</param>
+        /// <param name="claim">声明</param>
+        public static ClaimsIdentity AddOrReplace(this ClaimsIdentity claimsIdentity, Claim claim)
+        {
+            Check.NotNull(claimsIdentity, nameof(claimsIdentity));
+            foreach (var x in claimsIdentity.FindAll(claim.Type).ToList())
+                claimsIdentity.RemoveClaim(x);
+            claimsIdentity.AddClaim(claim);
+            return claimsIdentity;
+        }
+
+        /// <summary>
+        /// 添加。如果不存在指定声明标识，则进行添加
+        /// </summary>
+        /// <param name="principal">声明主体</param>
+        /// <param name="identity">声明标识</param>
+        public static ClaimsPrincipal AddIdentityIfNotContains(this ClaimsPrincipal principal, ClaimsIdentity identity)
+        {
+            Check.NotNull(principal, nameof(principal));
+            if (!principal.Identities.Any(x => string.Equals(x.AuthenticationType, identity.AuthenticationType, StringComparison.OrdinalIgnoreCase)))
+                principal.AddIdentity(identity);
+            return principal;
+        }
+
+        #endregion
     }
 }