Merge branch 'main' into yoon

This commit is contained in:
yoon 2025-02-18 11:15:51 +09:00
commit cf4e687aab
2 changed files with 13 additions and 12 deletions

View File

@ -29,10 +29,11 @@ public class MapBasedUrlRoleMapper implements UrlRoleMapper{
@Override
public Map<String, String> getUrlRoleMappings() {
urlRoleMappings.put("/api/user/**", PERMIT_ALL);
urlRoleMappings.put("/api/project/**", ROLE_MEMBER);
// urlRoleMappings.put("/api/test/**", ROLE_MEMBER);
urlRoleMappings.put("/api/project/**", ROLE_MEMBER);
urlRoleMappings.put("/api/vacation/**", PERMIT_ALL);
urlRoleMappings.put("/api/board/**", PERMIT_ALL);
urlRoleMappings.put("/api/vote/**", PERMIT_ALL);
urlRoleMappings.put("/api/worddict/**", PERMIT_ALL);
return new HashMap<>(urlRoleMappings);
}
}

View File

@ -80,8 +80,8 @@ public class BoardController {
@ParameterCheck
@PostMapping
public ApiResponse<BigInteger> createBoard(@ReqMap MapDto map) {
//Long userId = AuthUtil.getUser().getId();
map.put("MEMBERSEQ", 22);
Long userId = AuthUtil.getUser().getId();
map.put("MEMBERSEQ", userId);
if (map.containsKey("LOCBRDPWD") && !map.getString("LOCBRDPWD").trim().isEmpty()) { // 체크
String rawPassword = map.getString("LOCBRDPWD");
@ -143,8 +143,8 @@ public class BoardController {
@ParameterCheck
@PostMapping("/{CMNBRDSEQ}/attachments")
public ApiResponse<String> uploadAttachment(@ReqMap MapDto map) {
//Long userId = AuthUtil.getUser().getId();
map.put("CMNFLEREG", 22);
Long userId = AuthUtil.getUser().getId();
map.put("CMNFLEREG", userId);
boardService.addAttachment(map);
return ApiResponse.ok("첨부파일이 저장되었습니다.");
}
@ -158,8 +158,8 @@ public class BoardController {
@ParameterCheck
@PostMapping("/{LOCBRDSEQ}/{LOCCMTSEQ}/reaction")
public ApiResponse<String> reactToBoard(@ReqMap MapDto map) {
//Long userId = AuthUtil.getUser().getId();
map.put("MEMBERSEQ", 22);
Long userId = AuthUtil.getUser().getId();
map.put("MEMBERSEQ", userId);
boardService.reactToBoard(map);
return ApiResponse.ok("반응이 성공적으로 처리되었습니다.");
}
@ -186,8 +186,8 @@ public class BoardController {
@ParameterCheck
@PostMapping("/{LOCBRDSEQ}/comment")
public ApiResponse<String> addCommentOrReply(@ReqMap MapDto map) {
//Long userId = AuthUtil.getUser().getId();
map.put("MEMBERSEQ", 22);
Long userId = AuthUtil.getUser().getId();
map.put("MEMBERSEQ", userId);
if (map.containsKey("LOCCMTPWD") && !map.getString("LOCCMTPWD").trim().isEmpty()) { // 체크
String rawPassword = map.getString("LOCCMTPWD");