移除IUser.MemberId

build/pkg.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>3.0.2</Version>
+    <Version>3.0.3</Version>
 	<TargetFramework>net7.0</TargetFramework>
 	<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>

src/platform/ZhonTai.Admin/Core/Auth/ClaimAttributes.cs

@@ -10,11 +10,6 @@ public static class ClaimAttributes
     /// </summary>
     public const string UserId = "sub";
 
-    /// <summary>
-    /// 会员Id
-    /// </summary>
-    public const string MemberId = "mi";
-
     /// <summary>
     /// 用户名
     /// </summary>

src/platform/ZhonTai.Admin/Core/Auth/IUser.cs

@@ -14,11 +14,6 @@ public interface IUser
     /// </summary>
     long Id { get; }
 
-    /// <summary>
-    /// 会员Id
-    /// </summary>
-    long MemberId { get; }
-
     /// <summary>
     /// 用户名
     /// </summary>

src/platform/ZhonTai.Admin/Core/Auth/User.cs

@@ -38,22 +38,6 @@ public class User : IUser
         }
     }
 
-    /// <summary>
-    /// 会员Id
-    /// </summary>
-    public virtual long MemberId
-    {
-        get
-        {
-            var id = _accessor?.HttpContext?.User?.FindFirst(ClaimAttributes.MemberId);
-            if (id != null && id.Value.NotNull())
-            {
-                return id.Value.ToLong();
-            }
-            return 0;
-        }
-    }
-
     /// <summary>
     /// 用户名
     /// </summary>

src/platform/ZhonTai.Admin/Core/Db/DbHelper.cs

@@ -167,14 +167,9 @@ public class DbHelper
         {
             switch (e.Property.Name)
             {
-                case "MemberId":
-                    if (e.Value == null || (long)e.Value == default || (long?)e.Value == default)
-                    {
-                        e.Value = user.MemberId;
-                    }
-                    break;
-                case "OwnerId":
                 case "CreatedUserId":
+                case "OwnerId":
+                case "MemberId":
                     if (e.Value == null || (long)e.Value == default || (long?)e.Value == default)
                     {
                         e.Value = user.Id;
@@ -470,7 +465,7 @@ public class DbHelper
             }
 
             //会员过滤器
-            fsql.GlobalFilter.ApplyOnly<IMember>(FilterNames.Member, a => a.MemberId == user.MemberId);
+            fsql.GlobalFilter.ApplyOnly<IMember>(FilterNames.Member, a => a.MemberId == user.Id);
 
             //数据权限过滤器
             fsql.GlobalFilter.ApplyOnlyIf<IData>(FilterNames.Self,

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -84,11 +84,6 @@
             用户Id
             </summary>
         </member>
-        <member name="F:ZhonTai.Admin.Core.Auth.ClaimAttributes.MemberId">
-            <summary>
-            会员Id
-            </summary>
-        </member>
         <member name="F:ZhonTai.Admin.Core.Auth.ClaimAttributes.UserName">
             <summary>
             用户名
@@ -147,11 +142,6 @@
             用户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Auth.IUser.MemberId">
-            <summary>
-            会员Id
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Core.Auth.IUser.UserName">
             <summary>
             用户名
@@ -230,11 +220,6 @@
             用户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Auth.User.MemberId">
-            <summary>
-            会员Id
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Core.Auth.User.UserName">
             <summary>
             用户名