DBNT
/
kcscDev
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

사용자 권한 설정 방식 변경. 

관리자 메뉴 목록 호출 쿼리 변경.
thkim
강석 최 2024-04-22 14:24:02 +09:00
parent fcb5ed5a42
commit d31b147935
7 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
egovframe-template-simple-react-contribution/src/pages/admin/users/UserInfoModal.jsx
View File

@ -139,7 +139,8 @@ function UserInfoModal({savedInfo, reloadFunction}){
사용자 권한
</Form.Label>
<Col sm={9}>
<CheckBox name={"userRole"} grpCd={"ROLE"} selectedValue={savedInfo?.userRole} />
{/*<CheckBox name={"userRole"} grpCd={"ROLE"} selectedValue={savedInfo?.userRole} />*/}
<SelectOption name={"userRole"} grpCd={"ROLE"} selectedValue={savedInfo?.userRole} />
</Col>
</Form.Group>
<Form.Group as={Row} className="mb-3">

2
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcMenu.java
View File

@ -64,7 +64,7 @@ public class TcMenu {
private String menuAuth;
@Transient
private List<String> roleList;
private String role;
@Transient
private List<TcMenu> childList;

4
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java
View File

@ -163,10 +163,10 @@ public class AdminConfigService extends EgovAbstractServiceImpl {
}
public List<TcMenu> selectMenuListToRole(String menuTypeCd, List<String> roleList){
public List<TcMenu> selectMenuListToRole(String menuTypeCd, String role){
TcMenu params = new TcMenu();
params.setMenuTypeCd(menuTypeCd);
params.setRoleList(roleList);
params.setRole(role);
return menuMapper.selectMenuListToRole(params);
}

5
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/leftNav/LeftNavController.java
View File

@ -3,6 +3,7 @@ package com.dbnt.kcscbackend.admin.leftNav;
import com.dbnt.kcscbackend.admin.config.entity.TcMenu;
import com.dbnt.kcscbackend.admin.config.service.AdminConfigService;
import com.dbnt.kcscbackend.admin.users.service.AdminUsersService;
import com.dbnt.kcscbackend.auth.entity.LoginVO;
import com.dbnt.kcscbackend.config.common.ResultVO;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -22,6 +23,7 @@ import java.util.*;
public class LeftNavController {
private final AdminConfigService adminConfigService;
private final AdminUsersService adminUsersService;
@RequestMapping(method = RequestMethod.GET, value = "/menu")
public ResultVO getMenu(
@ -29,7 +31,8 @@ public class LeftNavController {
@RequestParam(value="menuType", required = true) String menuTypeCd
){
ResultVO resultVO = new ResultVO();
List<TcMenu> menuList = adminConfigService.selectMenuListToRole(menuTypeCd, Arrays.asList(user.getUserRole().split(",")));
String userRole = adminUsersService.selectUserInfo(user.getUserSeq()).getUserRole();
List<TcMenu> menuList = adminConfigService.selectMenuListToRole(menuTypeCd, userRole);
Map<String, String> groupMap = new LinkedHashMap<>();
for(TcMenu menu: menuList){
groupMap.put(menu.getMenuGroup(), menu.getGroupTitle());

9
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/jwt/EgovJwtTokenUtil.java
View File

@ -70,14 +70,6 @@ public class EgovJwtTokenUtil implements Serializable{
Claims claims = getClaimFromToken(token);
return claims.get("userSe").toString();
}
public String getUserRoleFromToken(String token) {
Claims claims = getClaimFromToken(token);
return claims.get("userRole").toString();
}
public String getInfoFromToken(String type, String token) {
Claims claims = getClaimFromToken(token);
return claims.get(type).toString();
}
public Claims getClaimFromToken(String token) {
return getAllClaimsFromToken(token);
}
@ -101,7 +93,6 @@ public class EgovJwtTokenUtil implements Serializable{
claims.put("id", loginVO.getUserId());
claims.put("remoteAddr", remoteAddr);
claims.put("userSe", loginVO.getUserSe());
claims.put("userRole", loginVO.getUserRole());
claims.put("type", "Authorization");
log.debug("===>>> secret = "+SECRET_KEY);

4
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/jwt/JwtAuthenticationFilter.java
View File

@ -70,10 +70,6 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
loginVO.setUserSeq(Integer.parseInt(jwtTokenUtil.getUserSeqFromToken(jwtToken)));
loginVO.setId(id);
loginVO.setUserSe(jwtTokenUtil.getUserSeFromToken(jwtToken));
loginVO.setUserRole(jwtTokenUtil.getUserRoleFromToken(jwtToken));
// loginVO.setUniqId( jwtTokenUtil.getInfoFromToken("uniqId",jwtToken) );
// loginVO.setOrgnztId( jwtTokenUtil.getInfoFromToken("orgnztId",jwtToken) );
// loginVO.setName( jwtTokenUtil.getInfoFromToken("name",jwtToken) );
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(loginVO, null,
Arrays.asList(new SimpleGrantedAuthority("ROLE_USER"))

5
kcsc-back-end/src/main/resources/mybatisMapper/TcMenuMapper.xml
View File

@ -51,10 +51,7 @@
inner join (
select menu_id , string_agg(role_id, ',') as role_cd
from tb_menu_role
where role_id in
<foreach collection="roleList" item="role" separator="," open="(" close=")">
#{role}
</foreach>
where role_id = #{role}
group by menu_id
) b on a.menu_id = b.menu_id
inner join tc_menu c on a.menu_group = c.menu_id