diff --git a/Infrastructure/OptionsSetting.cs b/Infrastructure/OptionsSetting.cs index be68c71..c01060c 100644 --- a/Infrastructure/OptionsSetting.cs +++ b/Infrastructure/OptionsSetting.cs @@ -11,8 +11,6 @@ namespace Infrastructure public static string ConnBus = "conn_bus"; public static string ConnBusDbType = "conn_bus_type"; - public static string DbKey = "DbKey"; - public string Redis { get; set; } public string Database { get; set; } /// diff --git a/ZR.Admin.WebApi/Framework/JwtUtil.cs b/ZR.Admin.WebApi/Framework/JwtUtil.cs index 23dbcc5..3a52795 100644 --- a/ZR.Admin.WebApi/Framework/JwtUtil.cs +++ b/ZR.Admin.WebApi/Framework/JwtUtil.cs @@ -131,7 +131,7 @@ namespace ZR.Admin.WebApi.Framework { var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData).Value; var loginUser = JsonConvert.DeserializeObject(userData); - var permissions = loginUser.Permissions;//TODO (List)CacheHelper.GetCache(GlobalConstant.UserPermKEY + loginUser?.UserId); + var permissions = (List)CacheHelper.GetCache(GlobalConstant.UserPermKEY + loginUser?.UserId); if (loginUser?.UserName == "admin") { permissions = new List() { GlobalConstant.AdminPerm }; diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs index 7ffe094..9da0605 100644 --- a/ZR.Repository/BaseRepository.cs +++ b/ZR.Repository/BaseRepository.cs @@ -1,12 +1,9 @@ -using Infrastructure.Model; -using SqlSugar; +using SqlSugar; using SqlSugar.IOC; using System; using System.Collections.Generic; using System.Data; -using System.Linq; using System.Linq.Expressions; -using System.Reflection; using ZR.Model; namespace ZR.Repository @@ -35,7 +32,7 @@ namespace ZR.Repository itenant = DbScoped.SugarScope;//设置租户接口 if (Context == null) { - Context = context ?? DbScoped.SugarScope.GetConnection(1);//根据类传入的ConfigId自动选择 + Context = DbScoped.SugarScope.GetConnection(1);//根据类传入的ConfigId自动选择 } }