重构代码

重构代码

Yi.Framework.Net6/Yi.Framework.Core/MakeJwt.cs

@@ -14,10 +14,9 @@ using JwtRegisteredClaimNames = Microsoft.IdentityModel.JsonWebTokens.JwtRegiste
 namespace Yi.Framework.Core
 {
 
-    public class jwtUser
+    public class JwtUser
     { 
-        public user user { get; set; }
-        public List<menu> menuIds { get; set; }
+        public User user { get; set; }
     
     }
 
@@ -29,23 +28,23 @@ namespace Yi.Framework.Core
         /// </summary>
         /// <param name="_user"></param>
         /// <returns></returns>
-        public static string app(jwtUser _user)
+        public static string app(JwtUser _user)
         {
             //通过查询权限，把所有权限加入进令牌中
             List<Claim> claims = new List<Claim>();
             claims.Add(new Claim(JwtRegisteredClaimNames.Nbf, $"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}"));
             claims.Add(new Claim(JwtRegisteredClaimNames.Exp, $"{new DateTimeOffset(DateTime.Now.AddMinutes(30)).ToUnixTimeSeconds()}"));
-            claims.Add(new Claim(ClaimTypes.Name, _user.user.username));
-            claims.Add(new Claim(ClaimTypes.Sid, _user.user.id.ToString()));
+            claims.Add(new Claim(ClaimTypes.Name, _user.user.Username));
+            claims.Add(new Claim(ClaimTypes.Sid, _user.user.Id.ToString()));
             //现在不存放在jwt中，而存放在redis中
             //foreach (var k in _user?.menuIds)
             //{
             //    claims.Add(new Claim("menuIds",k.id.ToString()));
             //}
-            foreach (var k in _user.user.roles)
-            {
-                claims.Add(new Claim(ClaimTypes.Role, k.role_name));
-            }
+            //foreach (var k in _user.user.roles)
+            //{
+            //    claims.Add(new Claim(ClaimTypes.Role, k.role_name));
+            //}
             var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(JwtConst.SecurityKey));
             var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
 

Yi.Framework.Net6/Yi.Framework.Core/Yi.Framework.Core.csproj

@@ -7,6 +7,7 @@
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="2.0.8" />
     <PackageReference Include="Consul" Version="1.6.10.3" />
+    <PackageReference Include="CSRedisCore" Version="3.6.9" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
@@ -40,4 +41,8 @@
     </Reference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Library\" />
+  </ItemGroup>
+
 </Project>