diff --git a/src/main/kotlin/upbrella/be/rent/controller/RentController.kt b/src/main/kotlin/upbrella/be/rent/controller/RentController.kt index 303fb393..ee799d41 100644 --- a/src/main/kotlin/upbrella/be/rent/controller/RentController.kt +++ b/src/main/kotlin/upbrella/be/rent/controller/RentController.kt @@ -47,14 +47,12 @@ class RentController( @GetMapping("/return/form/{storeId}") fun findReturnForm( @PathVariable storeId: Long, - httpSession: HttpSession, - @RequestParam(required = false) salt: String?, - @RequestParam(required = false) signature: String? + httpSession: HttpSession ): ResponseEntity> { val user = httpSession.getAttribute("user") as SessionUser val userToReturn = userReader.findUserById(user.id) - val returnForm = rentService.findReturnForm(storeId, userToReturn, salt!!, signature!!) + val returnForm = rentService.findReturnForm(storeId, userToReturn) return ResponseEntity .ok() diff --git a/src/main/kotlin/upbrella/be/rent/service/RentService.kt b/src/main/kotlin/upbrella/be/rent/service/RentService.kt index c3abc69a..d38873bc 100644 --- a/src/main/kotlin/upbrella/be/rent/service/RentService.kt +++ b/src/main/kotlin/upbrella/be/rent/service/RentService.kt @@ -51,12 +51,9 @@ class RentService( fun findReturnForm( storeId: Long, - userToReturn: User, - salt: String, - signature: String + userToReturn: User ): ReturnFormResponse { val storeMeta: StoreMeta = storeMetaReader.findById(storeId) - lockerService.validateLockerSignature(storeMeta.id!!, salt, signature) val history = rentRepository.findByUserIdAndReturnedAtIsNull(userToReturn.id!!) .orElseThrow { NonExistingUmbrellaForRentException("[ERROR] 해당 유저가 대여 중인 우산이 없습니다.") } return ReturnFormResponse.of(storeMeta, history) diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 6b540487..02a6d1c8 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -2,21 +2,15 @@ - - /home/ubuntu/upbrella-log/upbrella.log - - - /home/ubuntu/upbrella-log/upbrella.%d{yyyy-MM-dd}.log - 30 - + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - +