Merge pull request #26 from MarketPlace-O2O-Platform/refactor/#25

[Refactor/#25] Swagger 서버 URL 프로퍼티 파일 분리
MarketPlace-O2O-Platform · Oct 14, 2024 · eb27159 · eb27159
2 parents cf8b48e + 4d39127
commit eb27159
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/src/main/java/com/appcenter/marketplace/domain/member/service/impl/MemberServiceImpl.java b/src/main/java/com/appcenter/marketplace/domain/member/service/impl/MemberServiceImpl.java
@@ -30,15 +30,8 @@ public MemberLoginResDto login(MemberLoginReqDto memberLoginReqDto) {
     // 학번 로그인 검증 및 형변환
     private Long validateAndParseStudentId(MemberLoginReqDto memberLoginReqDto) {
         // 로그인 검증
-        if(!inuLoginRepository.loginCheck(memberLoginReqDto.getStudentId(), memberLoginReqDto.getPassword())) {
-            throw new CustomException(UNAUTHORIZED_LOGIN_ERROR);
-        }
-        try {
-            // 형변환
+        if(inuLoginRepository.loginCheck(memberLoginReqDto.getStudentId(), memberLoginReqDto.getPassword()))
             return Long.valueOf(memberLoginReqDto.getStudentId());
-        }catch (Exception e){
-            throw new CustomException(INVALID_STUDENT_ID);
-        }
+        else throw new CustomException(UNAUTHORIZED_LOGIN_ERROR);
     }
-
 }
diff --git a/src/main/java/com/appcenter/marketplace/global/config/OracleConfig.java b/src/main/java/com/appcenter/marketplace/global/config/OracleConfig.java
@@ -12,7 +12,6 @@
 import javax.sql.DataSource;
 
 @Configuration
-@EnableJpaRepositories
 public class OracleConfig {
 
     @Bean(name = "oracleDataSource")

diff --git a/src/main/java/com/appcenter/marketplace/global/config/SwaggerConfig.java b/src/main/java/com/appcenter/marketplace/global/config/SwaggerConfig.java
@@ -3,15 +3,26 @@
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.servers.Server;
+
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+
 @Configuration
 public class SwaggerConfig {
+
+    @Value("${swagger.server-url}")
+    private String serverUrl;
+
     @Bean
     public OpenAPI openAPI() {
+        Server server = new Server();
+        server.setUrl(serverUrl);
         return new OpenAPI()
                 .components(new Components())
+                .addServersItem(server)
                 .info(apiInfo());
     }
 

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
@@ -1,3 +1,5 @@
+swagger.server-url=http://localhost:8080
+
 # ???? ?? ?? ??
 spring.jpa.properties.hibernate.show_sql=true
 

diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
@@ -1,5 +1,7 @@
 server.port=8088
 
+swagger.server-url=https://marketplace.inuappcenter.kr
+
 # ???? ?? ?? ??
 spring.jpa.properties.hibernate.show_sql=true