From dec3256750233942ede87d5bf64b08337151e8d9 Mon Sep 17 00:00:00 2001 From: 70825 Date: Thu, 14 Sep 2023 02:16:20 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=9A=A9=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C,=20=EA=B8=B0=EC=A1=B4=20=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=ED=8C=8C=EC=9D=BC=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/presentation/AuthApiController.java | 9 -------- .../src/main/resources/application-local.yml | 22 ++++++------------- backend/src/main/resources/application.yml | 4 ++-- backend/src/main/resources/logback-spring.xml | 2 +- 4 files changed, 10 insertions(+), 27 deletions(-) diff --git a/backend/src/main/java/com/funeat/auth/presentation/AuthApiController.java b/backend/src/main/java/com/funeat/auth/presentation/AuthApiController.java index 61935a3d0..f7931460c 100644 --- a/backend/src/main/java/com/funeat/auth/presentation/AuthApiController.java +++ b/backend/src/main/java/com/funeat/auth/presentation/AuthApiController.java @@ -52,15 +52,6 @@ public ResponseEntity loginAuthorizeUser(@RequestParam("code") final Strin .build(); } - @GetMapping("/api/login/login/{id}") - public ResponseEntity loginlogin(final HttpServletRequest request) { - final Long memberId = 1L; - request.getSession().setAttribute(SESSION_ATTRIBUTE_NAME, memberId); - return ResponseEntity.ok() - .location(URI.create(HOME)) - .build(); - } - @PostMapping("/api/logout") public ResponseEntity logout(@AuthenticationPrincipal final LoginInfo loginInfo, final HttpServletRequest request, final HttpServletResponse response) { diff --git a/backend/src/main/resources/application-local.yml b/backend/src/main/resources/application-local.yml index 132645482..2f71c6e2a 100644 --- a/backend/src/main/resources/application-local.yml +++ b/backend/src/main/resources/application-local.yml @@ -1,12 +1,13 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/funeat_test - username: root + url: + username: password: + jpa: hibernate: - ddl-auto: none + ddl-auto: create properties: hibernate: format_sql: true @@ -17,15 +18,6 @@ logging: org.hibernate.type.descriptor.sql: trace kakao: - rest-api-key: 1234 - redirect-uri: 1234 - admin-key: 1234 - -cloud: - aws: - region: - static: 1234 - s3: - bucket: 1234 - folder: 1234 - cloudfrontPath: / + rest-api-key: { LOCAL_REST_API_KEY } + redirect-uri: { LOCAL_REDIRECT_URI } + admin-key: { LOCAL_ADMIN_KEY } diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 5b81938d0..4f38671c0 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: { DEPLOY_ACTIVE } servlet: multipart: enabled: true @@ -13,7 +13,7 @@ springdoc: logging: file: - path: / + path: { LOG_DIR } server: servlet: diff --git a/backend/src/main/resources/logback-spring.xml b/backend/src/main/resources/logback-spring.xml index 3a7638325..ccea7008c 100644 --- a/backend/src/main/resources/logback-spring.xml +++ b/backend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ - +