Merge branch 'dev' into deploy-dev-admin

This commit is contained in:
주수현
2025-07-11 14:58:48 +09:00
27 changed files with 109 additions and 92 deletions

View File

@@ -63,7 +63,7 @@ public class RoleUpdateAspect {
|| currentRoles.stream().anyMatch(item -> !beforeRoles.contains(item))) { || currentRoles.stream().anyMatch(item -> !beforeRoles.contains(item))) {
createLog = true; createLog = true;
} }
} else if (currentRoles.size() > 0) { } else if (!currentRoles.isEmpty()) {
createLog = true; createLog = true;
} }

View File

@@ -10,6 +10,8 @@ import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand;
import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -37,7 +39,7 @@ public class AdminAuthFailEvent {
@EventListener @EventListener
public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) { public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) {
HttpServletRequest request = HttpServletRequest request =
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
if (event.getException() instanceof BadCredentialsException) { if (event.getException() instanceof BadCredentialsException) {
adminViewPortIn adminViewPortIn

View File

@@ -10,6 +10,8 @@ import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortIn;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Objects;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@@ -49,7 +51,7 @@ public class AdminAuthSuccessEvent {
AdminUser adminUser = (AdminUser) authentication.getPrincipal(); AdminUser adminUser = (AdminUser) authentication.getPrincipal();
HttpServletRequest request = HttpServletRequest request =
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
// 로그인 실패 회수 초기화 // 로그인 실패 회수 초기화
adminViewPortIn adminViewPortIn

View File

@@ -82,7 +82,7 @@ public class AdminSecurityConfig {
List<String> permitPaths = List<String> permitPaths =
Arrays.stream(PublicAccess.values()) Arrays.stream(PublicAccess.values())
.map(PublicAccess::getPath) .map(PublicAccess::getPath)
.collect(Collectors.toList()); .toList();
http.authorizeHttpRequests( http.authorizeHttpRequests(
(auth) -> (auth) ->

View File

@@ -2,10 +2,12 @@ package app.module.admin.config.application.security;
import java.util.Collection; import java.util.Collection;
import lombok.Getter; import lombok.Getter;
import lombok.Setter;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.User;
@Getter @Getter
@Setter
public class AdminUser extends User { public class AdminUser extends User {
private Long seq; private Long seq;
private String roleId; private String roleId;

View File

@@ -1,11 +1,15 @@
package app.module.admin.config.application.util.model; package app.module.admin.config.application.util.model;
import lombok.Getter;
import lombok.Setter;
import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.IndexedColors;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.Map; import java.util.Map;
@Getter
@Setter
public class ExcelSheetDto { public class ExcelSheetDto {
/** /**
* 시트명 * 시트명
@@ -36,10 +40,4 @@ public class ExcelSheetDto {
this.commaColumns = commaColumns; this.commaColumns = commaColumns;
this.headerBgColors = headerBgColors; this.headerBgColors = headerBgColors;
} }
public String getSheetName() { return sheetName; }
public List<String> getHeaders() { return headers; }
public List<List<String>> getData() { return data; }
public Set<Integer> getCommaColumns() { return commaColumns; }
public Map<Integer, IndexedColors> getHeaderBgColors() { return headerBgColors; }
} }

View File

@@ -11,9 +11,14 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
@Controller @Controller
@RequiredArgsConstructor @RequiredArgsConstructor
class CreateNoticeController { class CreateNoticeController {
@@ -23,8 +28,13 @@ class CreateNoticeController {
ResponseEntity<?> operate(@RequestBody @Valid CreateNoticeReqVO reqVO, BindingResult bindingResult) { ResponseEntity<?> operate(@RequestBody @Valid CreateNoticeReqVO reqVO, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
List<String> fieldOrder = Arrays.asList("title", "content", "visible", "startDate", "endDate");
List<FieldError> sortedErrors = bindingResult.getFieldErrors().stream()
.sorted(Comparator.comparingInt(error -> fieldOrder.indexOf(error.getField())))
.toList();
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors()); .body(sortedErrors);
} }
CreateNotice article = CreateNotice article =

View File

@@ -15,19 +15,19 @@ import java.util.List;
@AllArgsConstructor @AllArgsConstructor
@EqualsAndHashCode @EqualsAndHashCode
public class CreateNoticeReqVO { public class CreateNoticeReqVO {
@NotBlank(message = "{valid.common.required}") @NotBlank(message = "제목은 필수입력값입니다.")
private String title; private String title;
@NotBlank(message = "{valid.common.required}") @NotBlank(message = "내용은 {valid.common.required}")
private String content; private String content;
@NotNull(message = "{valid.common.required}") @NotNull(message = "노출 여부는 {valid.common.required}")
private Boolean visible; private Boolean visible;
@NotNull(message = "{valid.common.required}") @NotNull(message = "시작일은 {valid.common.required}")
private LocalDateTime startDate; private LocalDateTime startDate;
@NotNull(message = "{valid.common.required}") @NotNull(message = "종료일은 {valid.common.required}")
private LocalDateTime endDate; private LocalDateTime endDate;
private List<String> fileMappingId; private List<String> fileMappingId;

View File

@@ -11,10 +11,15 @@ import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
class UpdateNoticeController { class UpdateNoticeController {
@@ -26,8 +31,13 @@ class UpdateNoticeController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
List<String> fieldOrder = Arrays.asList("title", "content", "visible", "startDate", "endDate");
List<FieldError> sortedErrors = bindingResult.getFieldErrors().stream()
.sorted(Comparator.comparingInt(error -> fieldOrder.indexOf(error.getField())))
.toList();
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors()); .body(sortedErrors);
} }
updateFilePortIn.operate( updateFilePortIn.operate(

View File

@@ -17,20 +17,20 @@ public class UpdateNoticeReqVO {
@NotNull(message = "{valid.common.required}") @NotNull(message = "{valid.common.required}")
private Long id; private Long id;
@NotBlank(message = "{valid.common.required}") @NotBlank(message = "제목은 {valid.common.required}")
private String title; private String title;
@NotBlank(message = "{valid.common.required}") @NotBlank(message = "내용은 {valid.common.required}")
private String content; private String content;
@NotNull(message = "{valid.common.required}") @NotNull(message = "노출여부는 {valid.common.required}")
private Boolean visible; private Boolean visible;
@NotNull(message = "{valid.common.required}") @NotNull(message = "시작일은 {valid.common.required}")
private LocalDateTime startDate; private LocalDateTime startDate;
@NotNull(message = "{valid.common.required}") @NotNull(message = "종료일은 {valid.common.required}")
private LocalDateTime endDate; private LocalDateTime endDate;
private List<String> fileMappingId; private List<String> fileMappingId;

View File

@@ -2,6 +2,7 @@ package app.module.admin.usecase.home.adapters.web;
import app.module.admin.config.application.util.AdminUtil; import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import java.security.Principal; import java.security.Principal;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -28,8 +29,9 @@ public class HomeController {
model.addAttribute("loginUserRoles", loginUser.getRole()); model.addAttribute("loginUserRoles", loginUser.getRole());
}); });
model.addAttribute("smsActive", GetSmsAutoStatus smsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null);
getSmsAutoStatusPortIn.operate().orElse(null).getActive());
model.addAttribute("smsActive", smsAutoStatus != null && smsAutoStatus.getActive());
return "home"; return "home";
} }

View File

@@ -23,7 +23,7 @@ class CreateHouseholdUIController {
RedirectAttributes redirectAttributes) { RedirectAttributes redirectAttributes) {
// 임가 등록 페이지는 관리자만 접근 가능 // 임가 등록 페이지는 관리자만 접근 가능
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) { if (!"ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다."); redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
return "redirect:/households"; return "redirect:/households";
} }

View File

@@ -63,7 +63,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null); CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null);
ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3)); ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3));
if(!checkHouseholdNum.getIsDuplicated() && contactVO != null) { if(checkHouseholdNum != null && !checkHouseholdNum.getIsDuplicated() && contactVO != null) {
int flag = 0; int flag = 0;
ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO(); ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO();
household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호 household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호

View File

@@ -31,7 +31,7 @@ class GetHouseholdsStatusUIController {
// 로그인한 관리자 역할 // 로그인한 관리자 역할
model.addAttribute("userRole", AdminUtil.getLoginUserRole()); model.addAttribute("userRole", AdminUtil.getLoginUserRole());
model.addAttribute("userRegionMainCode", admin.getRegionMainCode()); model.addAttribute("userRegionMainCode", admin != null ? admin.getRegionMainCode() : null);
// 실사 코드 목록 // 실사 코드 목록
// 지방실사와 조사원은 담당실사 지역만 조회 // 지방실사와 조사원은 담당실사 지역만 조회

View File

@@ -39,7 +39,7 @@ class SaveBankAutoTransferExpenseService implements SaveBankAutoTransferExpenseP
inCmd.getPrice(), inCmd.getPrice(),
"code.bank.output", // 지출 type code "code.bank.output", // 지출 type code
"2", // 지출 유형 2 고정 "2", // 지출 유형 2 고정
monthlyInputStatus.getId(), monthlyInputStatus != null ? monthlyInputStatus.getId() : null,
monthlyInputStatus.getBankAutoTransferOutputStatus())); monthlyInputStatus != null ? monthlyInputStatus.getBankAutoTransferOutputStatus() : null));
} }
} }

View File

@@ -41,8 +41,8 @@ class SaveBankAutoTransferIncomeService implements SaveBankAutoTransferIncomePor
inCmd.getPrice(), inCmd.getPrice(),
"code.bank.input", // 수입 type code "code.bank.input", // 수입 type code
"1", // 수입 유형 1 고정 "1", // 수입 유형 1 고정
monthlyInputStatus.getId(), monthlyInputStatus != null ? monthlyInputStatus.getId() : null,
monthlyInputStatus.getBankAutoTransferInputStatus() monthlyInputStatus != null ? monthlyInputStatus.getBankAutoTransferInputStatus() : null
)); ));
} }
} }

View File

@@ -32,7 +32,7 @@ class UpdateHouseholdStatusUIController {
RedirectAttributes redirectAttributes) { RedirectAttributes redirectAttributes) {
// 임가 수정 페이지는 관리자만 접근 가능 // 임가 수정 페이지는 관리자만 접근 가능
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) { if (!"ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다."); redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
return "redirect:/households"; return "redirect:/households";
} }
@@ -52,34 +52,36 @@ class UpdateHouseholdStatusUIController {
GetHouseholdStatus result = GetHouseholdStatus result =
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null); getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null);
model.addAttribute("householdInfo", if (result != null) {
new UpdateHouseholdStatusUIResVO( model.addAttribute("householdInfo",
result.getHouseholdSeq(), new UpdateHouseholdStatusUIResVO(
result.getHouseholdNum(), result.getHouseholdSeq(),
result.getHouseholdName(), result.getHouseholdNum(),
result.getHouseholdAge(), result.getHouseholdName(),
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[0] : "", result.getHouseholdAge(),
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[1] : "", StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[0] : "",
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[2] : "", StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[1] : "",
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[0] : "", StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[2] : "",
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[1] : "", StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[0] : "",
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[2] : "", StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[1] : "",
result.getRegionMainCode(), StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[2] : "",
result.getRegionSubCode(), result.getRegionMainCode(),
result.getRegionDetailCode(), result.getRegionSubCode(),
result.getAddress(), result.getRegionDetailCode(),
result.getIndustryLargeCode(), result.getAddress(),
result.getIndustryMiddleCode(), result.getIndustryLargeCode(),
result.getIndustrySubMiddleName(), result.getIndustryMiddleCode(),
result.getIndustryDetailName(), result.getIndustrySubMiddleName(),
result.getIsPanel(), result.getIndustryDetailName(),
result.getUsageType(), result.getIsPanel(),
result.getEmploymentType(), result.getUsageType(),
result.getMemo(), result.getEmploymentType(),
result.getResearcherSeq(), result.getMemo(),
result.getResearcherName(), result.getResearcherSeq(),
result.getResearcherPhone() result.getResearcherName(),
)); result.getResearcherPhone()
));
}
return "households/update/{seq}"; return "households/update/{seq}";
} }

View File

@@ -29,15 +29,17 @@
<tr> <tr>
<th>첨부파일<i class="ico-required-mark" role="img" aria-label="필수">*</i></th> <th>첨부파일<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td colspan="3"> <td colspan="3">
<div class="btns-row align-left publicFileInputs"> <div class="input-file-group">
<button type="button" class="btn btn-secondary" onclick="addFileInput();"> <label for="file" class="input-file-btn">
<span class="btn-txt">다건 파일 첨부</span> <input type="file" name="multipartAttachments" id="file" onchange="uiUtil.uploadFile('NOTICE', this);" >
</button> <span class="file-txt">파일첨부</span>
</label>
<p class="desc">첨부 가능 파일 형식: 문서(pdf, docx, xlsx, pptx, hwp), 이미지(jpg, jpeg, png, gif), 기타(zip,
csv, txt) / 파일당 최대 5MB까지 등록 가능합니다.</p>
<ul class="file-list input-group" id="noticeAttachments">
</ul>
</div> </div>
</td> </td>
</tr> </tr>
@@ -74,8 +76,6 @@
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -164,7 +164,8 @@
}, },
// validation fail // validation fail
422: function (res) { 422: function (res) {
alert("error"); debugger
alert(res.responseJSON[0].defaultMessage);
// $(res.responseJSON).each((idx, oj) => { // $(res.responseJSON).each((idx, oj) => {
// let target = $(f).find('[name=' + oj.field + ']'); // let target = $(f).find('[name=' + oj.field + ']');
// target.addClass('is-invalid'); // target.addClass('is-invalid');

View File

@@ -220,7 +220,7 @@
}, },
// validation fail // validation fail
422: function (res) { 422: function (res) {
alert('error'); alert(res.responseJSON[0].defaultMessage);
// $(res.responseJSON).each((idx, oj) => { // $(res.responseJSON).each((idx, oj) => {
// let target = $(f).find('[name=' + oj.field + ']'); // let target = $(f).find('[name=' + oj.field + ']');
// target.addClass('is-invalid'); // target.addClass('is-invalid');

View File

@@ -98,7 +98,7 @@ public class ExcelUtil {
wb.write(responseOutputStream); wb.write(responseOutputStream);
wb.close(); wb.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); log.error("[ExcelUtil] generateWithoutPassword: {}", e.getMessage(), e);
} }
} }
} }

View File

@@ -84,7 +84,7 @@ public class CreateCellService implements CreateCellPortIn {
// 셀 스타일 적용 (null 체크) // 셀 스타일 적용 (null 체크)
if (cellConfig.getCellStyle() != null) { if (cellConfig.getCellStyle() != null) {
cell.setCellStyle(cellConfig.getCellStyle()); cell.setCellStyle(cellConfig.getCellStyle());
} else { //} else {
// TODO: cellConfig.getCellStyle()이 null인 경우, 워크북에서 새로운 스타일을 생성하거나 기본 스타일을 적용하는 로직 고려 // TODO: cellConfig.getCellStyle()이 null인 경우, 워크북에서 새로운 스타일을 생성하거나 기본 스타일을 적용하는 로직 고려
// XSSFWorkbook workbook = (XSSFWorkbook) sheet.getWorkbook(); // XSSFWorkbook workbook = (XSSFWorkbook) sheet.getWorkbook();
// cell.setCellStyle(workbook.createCellStyle()); // cell.setCellStyle(workbook.createCellStyle());

View File

@@ -34,9 +34,9 @@ class URICurrentMatchingService implements URICurrentMatchingPortIn {
// {{pathVar}} 을 가진 URI 라면 배열검증 수행 // {{pathVar}} 을 가진 URI 라면 배열검증 수행
if (comparePath.endsWith("/{{pathVar}}")) { if (comparePath.endsWith("/{{pathVar}}")) {
List<String> pathComponents = List<String> pathComponents =
Arrays.stream(comparePath.split("/")).collect(Collectors.toList()); Arrays.stream(comparePath.split("/")).toList();
List<String> targetComponents = List<String> targetComponents =
Arrays.stream(targetUri.split("/")).collect(Collectors.toList()); Arrays.stream(targetUri.split("/")).toList();
if (pathComponents.size() != targetComponents.size()) { if (pathComponents.size() != targetComponents.size()) {
return false; return false;

View File

@@ -69,7 +69,7 @@ public class FrontSecurityConfig {
List<String> publicAccess = List<String> publicAccess =
Arrays.stream(PublicAccess.values()) Arrays.stream(PublicAccess.values())
.map(PublicAccess::getPath) .map(PublicAccess::getPath)
.collect(Collectors.toList()); .toList();
// front - 익명 사용자 접근 허용 URI 등록 (admin 과 달리 공개/비공개 URL 이 존재한다) // front - 익명 사용자 접근 허용 URI 등록 (admin 과 달리 공개/비공개 URL 이 존재한다)
FrontPublicAccess.getInstance().setURIs(List.of("/", "/user/register", "/policy/**")); FrontPublicAccess.getInstance().setURIs(List.of("/", "/user/register", "/policy/**"));

View File

@@ -2,10 +2,12 @@ package app.module.front.config.application.security;
import java.util.Collection; import java.util.Collection;
import lombok.Getter; import lombok.Getter;
import lombok.Setter;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.User;
@Getter @Getter
@Setter
public class FrontUser extends User { public class FrontUser extends User {
private String nickname; private String nickname;

View File

@@ -70,7 +70,7 @@ public class DailyRecordController {
*/ */
@PostMapping(path = "/{searchMonth}/{groupNo}/today-none") @PostMapping(path = "/{searchMonth}/{groupNo}/today-none")
ResponseEntity<?> todayNone(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo ResponseEntity<?> todayNone(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
, @RequestParam(name = "target", required = true, defaultValue = "") String targetType , @RequestParam(name = "target", defaultValue = "") String targetType
, @RequestParam(name = "status", required = false, defaultValue = "N") String targetStatus) { , @RequestParam(name = "status", required = false, defaultValue = "N") String targetStatus) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);

View File

@@ -12,7 +12,6 @@ import java.util.List;
@EqualsAndHashCode @EqualsAndHashCode
public class CreateBankInputReqVO { public class CreateBankInputReqVO {
// private Boolean status; // private Boolean status;
private Long id; private Long id;
private String transferType; private String transferType;
@@ -22,9 +21,4 @@ public class CreateBankInputReqVO {
return bankList != null ? bankList : new ArrayList<>(); return bankList != null ? bankList : new ArrayList<>();
} }
public void setBankList(List<CreateBankInputProductReqVO> bankList) {
this.bankList = bankList;
}
} }

View File

@@ -11,8 +11,6 @@ import java.util.List;
@AllArgsConstructor @AllArgsConstructor
@EqualsAndHashCode @EqualsAndHashCode
public class CreateMonthlyReqVO { public class CreateMonthlyReqVO {
private Boolean status; private Boolean status;
private Long id; private Long id;
private List<CreateMonthlyProductReqVO> productList; private List<CreateMonthlyProductReqVO> productList;
@@ -20,10 +18,4 @@ public class CreateMonthlyReqVO {
public List<CreateMonthlyProductReqVO> getProductList() { public List<CreateMonthlyProductReqVO> getProductList() {
return productList != null ? productList : new ArrayList<>(); return productList != null ? productList : new ArrayList<>();
} }
public void setProductList(List<CreateMonthlyProductReqVO> productList) {
this.productList = productList;
}
} }