[Refactor] 학교 디비 접속 실험

src/main/java/kr/inuappcenterportal/inuportal/config/OracleConfig.java

@@ -25,19 +25,20 @@ public class OracleConfig {
     @Value("${schoolDbPassword}")
     private String password;
     @Bean(name = "oracleDataSource")
-    @ConfigurationProperties(prefix = "school.datasource")
+    //@ConfigurationProperties(prefix = "school.datasource")
     public DataSource secondDataSource() {
-        /*HikariConfig config = new HikariConfig();
+        HikariConfig config = new HikariConfig();
         config.setJdbcUrl(url);
         config.setUsername(username);
         config.setPassword(password);
+        config.setDataSourceClassName("oracle.jdbc.OracleDriver");
         // 커넥션 풀 설정 추가
         config.setMaximumPoolSize(8);
         config.setMinimumIdle(1);
         config.setConnectionTimeout(60000); // milliseconds
         config.setIdleTimeout(600000); // milliseconds
-        return new HikariDataSource(config);*/
-        return DataSourceBuilder.create().type(HikariDataSource.class).build();
+        return new HikariDataSource(config);
+        //return DataSourceBuilder.create().type(HikariDataSource.class).build();
     }
 
     @Bean(name = "oracleJdbc")

src/main/java/kr/inuappcenterportal/inuportal/controller/MemberController.java

@@ -213,8 +213,8 @@ public ResponseEntity<ResponseDto<Boolean>> checkMail(@Valid@RequestBody EmailCh
             ,@ApiResponse(responseCode = "404",description = "만료된 이메일이거나, 인증 요청을 하지 않은 이메일입니다.",content = @Content(schema = @Schema(implementation = ResponseDto.class)))
     })
     @PostMapping("/login/school")
-    public ResponseEntity<ResponseDto<Boolean>> checkLogin(@Valid@RequestBody MemberLoginDto memberLoginDto) throws SQLException, ClassNotFoundException {;
-        return new ResponseEntity<>(new ResponseDto<>(schoolLoginRepository.loginCheck(memberLoginDto.getEmail(),memberLoginDto.getPassword()),"로그인 성공 여부 테스트"),HttpStatus.OK);
+    public ResponseEntity<ResponseDto<Boolean>> checkLogin(@Valid@RequestBody LoginDto loginDto)  {
+        return new ResponseEntity<>(new ResponseDto<>(schoolLoginRepository.loginCheck(loginDto.getNum(),loginDto.getNum()),"로그인 성공 여부 테스트"),HttpStatus.OK);
     }
 
 

src/main/java/kr/inuappcenterportal/inuportal/dto/LoginDto.java

@@ -0,0 +1,27 @@
+package kr.inuappcenterportal.inuportal.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Schema(description = "로그인 요청Dto")
+@Getter
+@NoArgsConstructor
+public class LoginDto {
+    @Schema(description = "학번",example = "201901591")
+    @NotBlank
+    private String num;
+
+    @Schema(description = "비밀번호",example = "12345")
+    @NotBlank
+    private String password;
+
+    @Builder
+    public LoginDto(String num, String password){
+        this.num = num;
+        this.password = password;
+    }
+}