|
|
@@ -6,7 +6,10 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ytpm.constant.StrConstant;
|
|
|
import com.ytpm.handle.CustomerException;
|
|
|
import com.ytpm.middle.dao.MiddleUserMapper;
|
|
|
+import com.ytpm.middle.dao.PermissionMapper;
|
|
|
+import com.ytpm.middle.param.MiddlePermissionParam;
|
|
|
import com.ytpm.middle.util.RedisUtil;
|
|
|
+import com.ytpm.middle.view.MiddleRoleVO;
|
|
|
import com.ytpm.middle.view.MiddleUserInfo;
|
|
|
import lombok.Data;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -23,8 +26,10 @@ import org.springframework.util.StringUtils;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
|
import java.util.LinkedHashMap;
|
|
|
+import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Objects;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 自定义Security上下文信息
|
|
|
@@ -41,6 +46,8 @@ public class CustomUserAuthenticationConverter implements UserAuthenticationConv
|
|
|
private RedisUtil redisService;
|
|
|
@Autowired
|
|
|
private MiddleUserMapper userMapper;
|
|
|
+ @Autowired
|
|
|
+ private PermissionMapper permissionMapper;
|
|
|
|
|
|
@Override
|
|
|
public Map<String, ?> convertUserAuthentication(Authentication authentication) {
|
|
|
@@ -71,6 +78,11 @@ public class CustomUserAuthenticationConverter implements UserAuthenticationConv
|
|
|
authorities = jwtUser.getAuthorities();
|
|
|
} else {
|
|
|
user.setRoleList(userMapper.getRoleList(user.getUserId()));
|
|
|
+ List<Integer> roleIdList = user.getRoleList().stream()
|
|
|
+ .map(MiddleRoleVO::getRoleId).collect(Collectors.toList());
|
|
|
+ user.setPermissionList(user.getSuperAdmin() == 1?
|
|
|
+ permissionMapper.queryAll(new MiddlePermissionParam())
|
|
|
+ : permissionMapper.queryAllByRoleIds(roleIdList));
|
|
|
MiddleUserInfo jwtUser = new MiddleUserInfo();
|
|
|
BeanUtil.copyProperties(user,jwtUser);
|
|
|
authorities = jwtUser.getAuthorities();
|