浏览代码

redis业务实现类部分方法修改后调整使用类

rengb 3 年之前
父节点
当前提交
3837d924f2

+ 2 - 4
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/DictionaryInfoFacade.java

@@ -1,8 +1,6 @@
 package com.lantone.dblayermbg.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.lantone.common.constant.AuthConstant;
 import com.lantone.common.dto.GetDictionaryInfoByTypeDTO;
 import com.lantone.common.enums.IsDeleteEnum;
@@ -64,7 +62,7 @@ public class DictionaryInfoFacade extends DictionaryInfoServiceImpl {
      */
     public Map<String, Map<String, String>> getDicMap(String returnType, List<String> groupTypes) {
         Map<String, Map<String, String>> outDicMap = new HashMap<>();
-        Map<String, Map<String, Map<String, String>>> dicMap = (Map<String, Map<String, Map<String, String>>>) redisService.get(AuthConstant.DIC_MAP_KEY);
+        Map<String, Map<String, Map<String, String>>> dicMap = redisService.get(AuthConstant.DIC_MAP_KEY);
         Map<String, Map<String, String>> returnDicMap = dicMap.get(returnType);
         if (MapUtils.isNotEmpty(returnDicMap) && ListUtil.isNotEmpty(groupTypes)) {
             groupTypes.stream().forEach(groupType -> {
@@ -79,7 +77,7 @@ public class DictionaryInfoFacade extends DictionaryInfoServiceImpl {
      * @param returnType 返回类型
      * @param groupTypes 分组集合
      * @Description获取指定groupTyeps的字典集(返回结果集为对象形式)
-     * @Return java.util.Map<java.lang.String,java.util.List<com.lantone.common.dto.GetDictionaryInfoByTypeDTO>>
+     * @Return java.util.Map<java.lang.String, java.util.List < com.lantone.common.dto.GetDictionaryInfoByTypeDTO>>
      */
     public Map<String, List<GetDictionaryInfoByTypeDTO>> getDicMapObj(String returnType, List<String> groupTypes) {
         Map<String, List<GetDictionaryInfoByTypeDTO>> outDicMap = new HashMap<>();

+ 3 - 3
gateway-service/src/main/java/com/lantone/authorization/AuthorizationManager.java

@@ -4,10 +4,10 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.lantone.common.constant.AuthConstant;
 import com.lantone.common.domain.UserDto;
+import com.lantone.common.service.RedisService;
 import com.lantone.common.util.SysUserUtils;
 import com.lantone.config.IgnoreUrlsConfig;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.security.authorization.AuthorizationDecision;
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 public class AuthorizationManager implements ReactiveAuthorizationManager<AuthorizationContext> {
 
     @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
+    private RedisService redisService;
     @Autowired
     private IgnoreUrlsConfig ignoreUrlsConfig;
 
@@ -71,7 +71,7 @@ public class AuthorizationManager implements ReactiveAuthorizationManager<Author
             return Mono.just(new AuthorizationDecision(true));
         }
         //管理端路径需校验权限
-        Map<Object, Object> resourceRolesMap = redisTemplate.opsForHash().entries(AuthConstant.RESOURCE_ROLES_MAP_KEY);
+        Map<Object, Object> resourceRolesMap = redisService.hGetAll(AuthConstant.RESOURCE_ROLES_MAP_KEY);
         Iterator<Object> iterator = resourceRolesMap.keySet().iterator();
         List<String> authorities = new ArrayList<>();
         while (iterator.hasNext()) {