diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/login/LoginServiceImpl.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/login/LoginServiceImpl.java index af43c23..5228f57 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/login/LoginServiceImpl.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/login/LoginServiceImpl.java @@ -80,10 +80,6 @@ public class LoginServiceImpl implements LoginService { } } - private void initUserRole(UserDO userDO) { - // todo - } - /** * 发送短信 */ diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/role/RoleServiceImpl.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/role/RoleServiceImpl.java index 31cdef3..1fed7d4 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/role/RoleServiceImpl.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/role/RoleServiceImpl.java @@ -10,6 +10,7 @@ import com.yinlihupo.enlish.service.service.RoleService; import com.yinlihupo.framework.common.util.JsonUtils; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; @@ -22,7 +23,7 @@ import java.util.stream.Collectors; public class RoleServiceImpl implements RoleService { @Resource - private StringRedisTemplate stringRedisTemplate; + private RedisTemplate redisTemplate; @Resource private RoleDOMapper roleDOMapper; @Resource @@ -34,11 +35,12 @@ public class RoleServiceImpl implements RoleService { List roleDOS = roleDOMapper.selectAll(); List roleKeys = roleDOS.stream().map(RoleDO::getRoleKey).toList(); log.info("将角色同步到 redis 中, {}", roleKeys); - stringRedisTemplate.opsForValue().set(RoleConstants.ROLE, JsonUtils.toJsonString(roleKeys), 60 * 60 * 24); + redisTemplate.opsForValue().set(RoleConstants.ROLE, JsonUtils.toJsonString(roleKeys)); Map roleId2RoleDO = roleDOS.stream().collect(Collectors.toMap(RoleDO::getId, roleDO -> roleDO)); List userRoleRelDOS = userRoleRelDOMapper.selectAll(); + log.info("将用户角色关系同步到 redis 中, {}", userRoleRelDOS); Map> userId2UserRoleRelDOs = userRoleRelDOS.stream().collect(Collectors.groupingBy(UserRoleRelDO::getUserId)); userId2UserRoleRelDOs.forEach((userId, userRoleRelDOs) -> { @@ -46,7 +48,7 @@ public class RoleServiceImpl implements RoleService { List roleDOs = roleIds.stream().map(roleId2RoleDO::get).toList(); List user2RoleKeys = roleDOs.stream().map(RoleDO::getRoleKey).toList(); log.info("将用户 {} 的角色同步到 redis 中, {}", userId, roleKeys); - stringRedisTemplate.opsForValue().set(RoleConstants.buildUserRoleKey(userId), JsonUtils.toJsonString(user2RoleKeys)); + redisTemplate.opsForValue().set(RoleConstants.buildUserRoleKey(userId), JsonUtils.toJsonString(user2RoleKeys)); }); } diff --git a/enlish-service/src/main/resources/mapper/UserRoleRelDOMapper.xml b/enlish-service/src/main/resources/mapper/UserRoleRelDOMapper.xml index dfc6269..f5ecc66 100644 --- a/enlish-service/src/main/resources/mapper/UserRoleRelDOMapper.xml +++ b/enlish-service/src/main/resources/mapper/UserRoleRelDOMapper.xml @@ -11,7 +11,6 @@