Commit 6afeacdd authored by wzp's avatar wzp

修改bug

parent 69da943c
...@@ -110,7 +110,7 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -110,7 +110,7 @@ public class ChinaMobileRestApiController extends BaseController {
@Resource @Resource
private TAppRunPicService appRunPicService; private TAppRunPicService appRunPicService;
private static final String SHIRO_JWT_TOKEN = "shiro:jwt:macToken:"; private static final String SHIRO_JWT_TOKEN = "shiro:jwt:Token:";
//用户登录次数计数 redisKey 前缀 //用户登录次数计数 redisKey 前缀
private static final String SHIRO_LOGIN_COUNT = "shiro_login_count_"; private static final String SHIRO_LOGIN_COUNT = "shiro_login_count_";
//用户登录是否被锁定 一小时 redisKey 前缀 //用户登录是否被锁定 一小时 redisKey 前缀
......
...@@ -177,7 +177,7 @@ public class LoginController extends BaseController { ...@@ -177,7 +177,7 @@ public class LoginController extends BaseController {
List<String> list1 = new ArrayList<>(); List<String> list1 = new ArrayList<>();
//获取当前用户角色拥有菜单 //获取当前用户角色拥有菜单
List<Menu> userMenuPerms = new ArrayList<>(); List<Menu> userMenuPerms = new ArrayList<>();
if (roles != null && roles.get(0) != null) { if (roles != null &&roles.size()>0 &&roles.get(0) != null) {
roles.forEach(r -> list1.add(r.getId())); roles.forEach(r -> list1.add(r.getId()));
user.setRoleList(list1); user.setRoleList(list1);
userMenuPerms = this.menuService.getUserMenuPerms(list1); userMenuPerms = this.menuService.getUserMenuPerms(list1);
......
...@@ -50,7 +50,7 @@ public class TBoxOperationController extends BaseController { ...@@ -50,7 +50,7 @@ public class TBoxOperationController extends BaseController {
@Resource @Resource
private StringRedisTemplate stringRedisTemplate; private StringRedisTemplate stringRedisTemplate;
private static final String SHIRO_JWT_MACTOKEN = "shiro:jwt:macToken:"; private static final String SHIRO_JWT_TOKEN = "shiro:jwt:Token:";
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
@ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"), @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
...@@ -146,7 +146,7 @@ public class TBoxOperationController extends BaseController { ...@@ -146,7 +146,7 @@ public class TBoxOperationController extends BaseController {
if (3==tBoxOperation.getStatus()) { if (3==tBoxOperation.getStatus()) {
tBoxOperation.setMac(""); tBoxOperation.setMac("");
TUser u = userService.getOne(new UpdateWrapper<TUser>().eq("org_id",tBoxOperation.getOrganId()).eq("type", 3).eq("is_deleted", false)); TUser u = userService.getOne(new UpdateWrapper<TUser>().eq("org_id",tBoxOperation.getOrganId()).eq("type", 3).eq("is_deleted", false));
Set<String> keys = stringRedisTemplate.keys(SHIRO_JWT_MACTOKEN + "*"); Set<String> keys = stringRedisTemplate.keys(SHIRO_JWT_TOKEN + "*");
ValueOperations<String, String> value = stringRedisTemplate.opsForValue(); ValueOperations<String, String> value = stringRedisTemplate.opsForValue();
for (String key : keys) { for (String key : keys) {
if (u.getId().equals(value.get(key))){ if (u.getId().equals(value.get(key))){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment