충돌 병합

app/kac-app/src/test/java/kr/co/palnet/kac/user/account/UserAccountControllerTest.java

@@ -11,11 +11,6 @@ import org.springframework.restdocs.headers.HeaderDocumentation;
 import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders;
 import org.springframework.restdocs.payload.JsonFieldType;
 import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;

web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/service/UserAccountService.java

@@ -81,6 +81,7 @@ public class UserAccountService {
                 ptyTermsDomainService.savePtyTermsAgreeTxn(agreeEntity);
             }
         }
+
     }
 
     @Transactional

web/security/src/main/java/kr/co/palnet/kac/config/security/SecurityConfig.java

@@ -53,9 +53,9 @@ public abstract class SecurityConfig {
 
     @Bean
     PasswordEncoder passwordEncoder() {
-//        return new BCryptPasswordEncoder();
+        return new BCryptPasswordEncoder();
         // TODO 테스트 후 BCryptPasswordEncoder 로 변경 - 회원가입 로직 구현 후 제거
-        return NoOpPasswordEncoder.getInstance();
+//        return NoOpPasswordEncoder.getInstance();
     }
 
     @Bean