jwt 3.0 perfect authorize

v-anzha · v-anzha · commit 7300b8022cbc · 2018-12-18T19:26:37.000+08:00
diff --git a/Blog.Core.FrameWork/Blog.Core.FrameWork.IRepository/Blog.Core.FrameWork.IRepository.cs b/Blog.Core.FrameWork/Blog.Core.FrameWork.IRepository/Blog.Core.FrameWork.IRepository.cs
@@ -1,5 +1,4 @@
 ﻿
-
 //引入命名空间
 
 
@@ -12,7 +11,7 @@
 
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成
-//	   生成时间 2018-10-09 13:33:11 
+//	   生成时间 2018-12-17 13:02:18 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
diff --git a/Blog.Core.FrameWork/Blog.Core.FrameWork.IServices/Blog.Core.FrameWork.IServices.cs b/Blog.Core.FrameWork/Blog.Core.FrameWork.IServices/Blog.Core.FrameWork.IServices.cs
@@ -1,5 +1,4 @@
 ﻿
-
 //引入命名空间
 
 
@@ -12,7 +11,7 @@
 
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成
-//	   生成时间 2018-10-09 13:33:13 
+//	   生成时间 2018-12-17 13:05:54 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
diff --git a/Blog.Core.FrameWork/Blog.Core.FrameWork.Repository/Blog.Core.FrameWork.Repository.cs b/Blog.Core.FrameWork/Blog.Core.FrameWork.Repository/Blog.Core.FrameWork.Repository.cs
@@ -1,5 +1,4 @@
 ﻿
-
 //引入命名空间
 
 
@@ -12,7 +11,7 @@
 
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成
-//	   生成时间 2018-10-09 13:33:11 
+//	   生成时间 2018-12-17 13:07:29 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
diff --git a/Blog.Core.FrameWork/Blog.Core.FrameWork.Services/Blog.Core.FrameWork.Services.cs b/Blog.Core.FrameWork/Blog.Core.FrameWork.Services/Blog.Core.FrameWork.Services.cs
@@ -1,5 +1,4 @@
 ﻿
-
 //引入命名空间
 
 
@@ -12,7 +11,7 @@
 
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成
-//	   生成时间 2018-10-09 13:33:12 
+//	   生成时间 2018-12-17 13:08:24 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
diff --git a/Blog.Core.IRepository/IModuleRepository.cs b/Blog.Core.IRepository/IModuleRepository.cs
@@ -0,0 +1,17 @@
+using Blog.Core.IRepository.Base;
+using Blog.Core.Model.Models;
+
+namespace Blog.Core.IRepository
+{	
+	/// <summary>
+	/// IModuleRepository
+	/// </summary>	
+	public interface IModuleRepository : IBaseRepository<Module>//类名
+    {
+
+       
+    }
+}
+
+
+	
diff --git a/Blog.Core.IRepository/IRoleModulePermissionRepository.cs b/Blog.Core.IRepository/IRoleModulePermissionRepository.cs
@@ -0,0 +1,14 @@
+using Blog.Core.IRepository.Base;
+using Blog.Core.Model.Models;
+
+namespace Blog.Core.IRepository
+{	
+	/// <summary>
+	/// IRoleModulePermissionRepository
+	/// </summary>	
+	public interface IRoleModulePermissionRepository : IBaseRepository<RoleModulePermission>//类名
+    {
+
+       
+    }
+}
diff --git a/Blog.Core.IServices/IModuleServices.cs b/Blog.Core.IServices/IModuleServices.cs
@@ -0,0 +1,14 @@
+using Blog.Core.IServices.BASE;
+using Blog.Core.Model.Models;
+
+namespace Blog.Core.IServices
+{	
+	/// <summary>
+	/// ModuleServices
+	/// </summary>	
+    public interface IModuleServices :IBaseServices<Module>
+	{
+
+       
+    }
+}
diff --git a/Blog.Core.IServices/IRoleModulePermissionServices.cs b/Blog.Core.IServices/IRoleModulePermissionServices.cs
@@ -0,0 +1,16 @@
+using Blog.Core.IServices.BASE;
+using Blog.Core.Model.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Blog.Core.IServices
+{	
+	/// <summary>
+	/// RoleModulePermissionServices
+	/// </summary>	
+    public interface IRoleModulePermissionServices :IBaseServices<RoleModulePermission>
+	{
+
+        Task<List<RoleModulePermission>> GeRoleModule();
+    }
+}
diff --git a/Blog.Core.Model/Blog.Core.Model.csproj b/Blog.Core.Model/Blog.Core.Model.csproj
@@ -8,4 +8,8 @@
     <DocumentationFile>..\Blog.Core\Blog.Core.Model.xml</DocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="sqlSugarCore" Version="4.9.7" />
+  </ItemGroup>
+
 </Project>
diff --git a/Blog.Core.Model/Models/Module.cs b/Blog.Core.Model/Models/Module.cs
@@ -7,15 +7,15 @@
 namespace Blog.Core.Model.Models
 {
     /// <summary>
-    /// 菜单表
+    /// 接口API地址信息表
     /// </summary>
     public class Module
     {
         public Module()
         {
-            this.ChildModule = new List<Module>();
-            this.ModulePermission = new List<ModulePermission>();
-            this.RoleModulePermission = new List<RoleModulePermission>();
+            //this.ChildModule = new List<Module>();
+            //this.ModulePermission = new List<ModulePermission>();
+            //this.RoleModulePermission = new List<RoleModulePermission>();
         }
 
         public int Id { get; set; }
@@ -97,9 +97,9 @@ public Module()
         /// </summary>
         public DateTime? ModifyTime { get; set; }
 
-        public virtual Module ParentModule { get; set; }
-        public virtual ICollection<Module> ChildModule { get; set; }
-        public virtual ICollection<ModulePermission> ModulePermission { get; set; }
-        public virtual ICollection<RoleModulePermission> RoleModulePermission { get; set; }
+        //public virtual Module ParentModule { get; set; }
+        //public virtual ICollection<Module> ChildModule { get; set; }
+        //public virtual ICollection<ModulePermission> ModulePermission { get; set; }
+        //public virtual ICollection<RoleModulePermission> RoleModulePermission { get; set; }
     }
 }
diff --git a/Blog.Core.Model/Models/ModulePermission.cs b/Blog.Core.Model/Models/ModulePermission.cs
@@ -50,7 +50,7 @@ public class ModulePermission
         /// </summary>
         public DateTime? ModifyTime { get; set; }
 
-        public virtual Module Module { get; set; }
-        public virtual Permission Permission { get; set; }
+        //public virtual Module Module { get; set; }
+        //public virtual Permission Permission { get; set; }
     }
 }
diff --git a/Blog.Core.Model/Models/Permission.cs b/Blog.Core.Model/Models/Permission.cs
@@ -13,8 +13,8 @@ public  class Permission
     {
         public Permission()
         {
-            this.ModulePermission = new List<ModulePermission>();
-            this.RoleModulePermission = new List<RoleModulePermission>();
+            //this.ModulePermission = new List<ModulePermission>();
+            //this.RoleModulePermission = new List<RoleModulePermission>();
         }
         public int Id { get; set; }
 
@@ -71,7 +71,7 @@ public Permission()
         /// </summary>
         public DateTime? ModifyTime { get; set; }
 
-        public virtual ICollection<ModulePermission> ModulePermission { get; set; }
-        public virtual ICollection<RoleModulePermission> RoleModulePermission { get; set; }
+        //public virtual ICollection<ModulePermission> ModulePermission { get; set; }
+        //public virtual ICollection<RoleModulePermission> RoleModulePermission { get; set; }
     }
 }
diff --git a/Blog.Core.Model/Models/RoleModulePermission.cs b/Blog.Core.Model/Models/RoleModulePermission.cs
@@ -1,8 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using SqlSugar;
+using System;
 
 namespace Blog.Core.Model.Models
 {
@@ -11,6 +8,12 @@ namespace Blog.Core.Model.Models
     /// </summary>
     public class RoleModulePermission
     {
+        public RoleModulePermission() {
+            this.Role = new Role();
+            this.Module = new Module();
+            this.Permission = new Permission();
+
+        }
         public int Id { get; set; }
 
         /// <summary>
@@ -54,8 +57,12 @@ public class RoleModulePermission
         /// </summary>
         public DateTime? ModifyTime { get; set; }
 
+        // 下边三个实体参数，只是做传参作用，所以忽略下
+        [SugarColumn(IsIgnore = true)]
         public virtual Role Role { get; set; }
+        [SugarColumn(IsIgnore = true)]
         public virtual Module Module { get; set; }
+        [SugarColumn(IsIgnore = true)]
         public virtual Permission Permission { get; set; }
     }
 }
diff --git a/Blog.Core.Repository/ModuleRepository.cs b/Blog.Core.Repository/ModuleRepository.cs
@@ -0,0 +1,15 @@
+using Blog.Core.Repository.Base;
+using Blog.Core.Model.Models;
+using Blog.Core.IRepository;
+
+namespace Blog.Core.Repository
+{	
+	/// <summary>
+	/// ModuleRepository
+	/// </summary>	
+	public class ModuleRepository : BaseRepository<Module>, IModuleRepository
+    {
+
+       
+    }
+}
diff --git a/Blog.Core.Repository/RoleModulePermissionRepository.cs b/Blog.Core.Repository/RoleModulePermissionRepository.cs
@@ -0,0 +1,17 @@
+using Blog.Core.Repository.Base;
+using Blog.Core.Model.Models;
+using Blog.Core.IRepository;
+
+namespace Blog.Core.Repository
+{	
+	/// <summary>
+	/// RoleModulePermissionRepository
+	/// </summary>	
+	public class RoleModulePermissionRepository : BaseRepository<RoleModulePermission>, IRoleModulePermissionRepository
+    {
+
+       
+    }
+}
+
+	
diff --git a/Blog.Core.Services/ModuleServices.cs b/Blog.Core.Services/ModuleServices.cs
@@ -0,0 +1,22 @@
+using Blog.Core.Services.BASE;
+using Blog.Core.Model.Models;
+using Blog.Core.IRepository;
+using Blog.Core.IServices;
+
+namespace Blog.Core.Services
+{	
+	/// <summary>
+	/// ModuleServices
+	/// </summary>	
+	public class ModuleServices : BaseServices<Module>, IModuleServices
+    {
+	
+        IModuleRepository dal;
+        public ModuleServices(IModuleRepository dal)
+        {
+            this.dal = dal;
+            base.baseDal = dal;
+        }
+       
+    }
+}
diff --git a/Blog.Core.Services/RoleModulePermissionServices.cs b/Blog.Core.Services/RoleModulePermissionServices.cs
@@ -0,0 +1,51 @@
+﻿using Blog.Core.Services.BASE;
+using Blog.Core.Model.Models;
+using Blog.Core.IServices;
+using Blog.Core.IRepository;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Blog.Core.Common;
+
+namespace Blog.Core.Services
+{
+    /// <summary>
+    /// RoleModulePermissionServices 应用服务
+    /// </summary>	
+    public class RoleModulePermissionServices : BaseServices<RoleModulePermission>, IRoleModulePermissionServices
+    {
+
+        IRoleModulePermissionRepository dal;
+        IModuleRepository moduleRepository;
+        IRoleRepository roleRepository;
+
+        // 将多个仓储接口注入
+        public RoleModulePermissionServices(IRoleModulePermissionRepository dal, IModuleRepository moduleRepository, IRoleRepository roleRepository)
+        {
+            this.dal = dal;
+            this.moduleRepository = moduleRepository;
+            this.roleRepository = roleRepository;
+            base.baseDal = dal;
+        }
+
+        /// <summary>
+        /// 获取全部 角色接口(按钮)关系数据
+        /// </summary>
+        /// <returns></returns>
+        [Caching(AbsoluteExpiration = 10)]
+        public async Task<List<RoleModulePermission>> GeRoleModule()
+        {
+            var roleModulePermissions = await dal.Query(a => a.IsDeleted == false);
+            if (roleModulePermissions.Count > 0)
+            {
+                foreach (var item in roleModulePermissions)
+                {
+                    item.Role = await roleRepository.QueryByID(item.RoleId);
+                    item.Module = await moduleRepository.QueryByID(item.ModuleId);
+                }
+
+            }
+            return roleModulePermissions;
+        }
+
+    }
+}
diff --git a/Blog.Core/AuthHelper/Policys/JwtToken.cs b/Blog.Core/AuthHelper/Policys/JwtToken.cs
@@ -14,12 +14,13 @@ public class JwtToken
         /// <summary>
         /// 获取基于JWT的Token
         /// </summary>
-        /// <param name="claims"></param>
-        /// <param name="permissionRequirement"></param>
+        /// <param name="claims">需要在登陆的时候配置</param>
+        /// <param name="permissionRequirement">在startup中定义的参数</param>
         /// <returns></returns>
         public static dynamic BuildJwtToken(Claim[] claims, PermissionRequirement permissionRequirement)
         {
             var now = DateTime.Now;
+            // 实例化JwtSecurityToken
             var jwt = new JwtSecurityToken(
                 issuer: permissionRequirement.Issuer,
                 audience: permissionRequirement.Audience,
@@ -28,12 +29,15 @@ public static dynamic BuildJwtToken(Claim[] claims, PermissionRequirement permis
                 expires: now.Add(permissionRequirement.Expiration),
                 signingCredentials: permissionRequirement.SigningCredentials
             );
+            // 生成 Token
             var encodedJwt = new JwtSecurityTokenHandler().WriteToken(jwt);
+
+            //打包返回前台
             var responseJson = new
             {
                 success = true,
                 token = encodedJwt,
-                expires_in = permissionRequirement.Expiration.TotalMilliseconds,
+                expires_in = permissionRequirement.Expiration.TotalSeconds,
                 token_type = "Bearer"
             };
             return responseJson;
diff --git a/Blog.Core/AuthHelper/Policys/PermissionHandler.cs b/Blog.Core/AuthHelper/Policys/PermissionHandler.cs
diff --git a/Blog.Core/AuthHelper/Policys/PermissionRequirement.cs b/Blog.Core/AuthHelper/Policys/PermissionRequirement.cs
diff --git a/Blog.Core/Blog.Core.xml b/Blog.Core/Blog.Core.xml
diff --git a/Blog.Core/Controllers/BlogController.cs b/Blog.Core/Controllers/BlogController.cs
diff --git a/Blog.Core/Controllers/ValuesController.cs b/Blog.Core/Controllers/ValuesController.cs
diff --git a/Blog.Core/Controllers/v2/ApbController.cs b/Blog.Core/Controllers/v2/ApbController.cs
diff --git a/Blog.Core/Startup.cs b/Blog.Core/Startup.cs

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@`
`7`	`7`	`namespace Blog.Core.Model.Models`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`		`- /// 菜单表`
	`10`	`+ /// 接口API地址信息表`
`11`	`11`	`/// </summary>`
`12`	`12`	`public class Module`
`13`	`13`	`{`
`14`	`14`	`public Module()`
`15`	`15`	`{`
`16`		`- this.ChildModule = new List<Module>();`
`17`		`- this.ModulePermission = new List<ModulePermission>();`
`18`		`- this.RoleModulePermission = new List<RoleModulePermission>();`
	`16`	`+ //this.ChildModule = new List<Module>();`
	`17`	`+ //this.ModulePermission = new List<ModulePermission>();`
	`18`	`+ //this.RoleModulePermission = new List<RoleModulePermission>();`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public int Id { get; set; }`
`@@ -97,9 +97,9 @@ public Module()`
`97`	`97`	`/// </summary>`
`98`	`98`	`public DateTime? ModifyTime { get; set; }`
`99`	`99`
`100`		`- public virtual Module ParentModule { get; set; }`
`101`		`- public virtual ICollection<Module> ChildModule { get; set; }`
`102`		`- public virtual ICollection<ModulePermission> ModulePermission { get; set; }`
`103`		`- public virtual ICollection<RoleModulePermission> RoleModulePermission { get; set; }`
	`100`	`+ //public virtual Module ParentModule { get; set; }`
	`101`	`+ //public virtual ICollection<Module> ChildModule { get; set; }`
	`102`	`+ //public virtual ICollection<ModulePermission> ModulePermission { get; set; }`
	`103`	`+ //public virtual ICollection<RoleModulePermission> RoleModulePermission { get; set; }`
`104`	`104`	`}`
`105`	`105`	`}`