From cb7570697e4ceb39457790583fb6a98da632dd06 Mon Sep 17 00:00:00 2001 From: guno-p Date: Tue, 5 Aug 2025 10:21:33 +0900 Subject: [PATCH 01/13] refactor: application.properties -> application-dev.properties --- src/main/resources/application.properties | 39 +---------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cb50402..32e368b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,38 +1 @@ -#jdbc.driver=com.mysql.cj.jdbc.Driver -#jdbc.url=jdbc:log4jdbc:mysql://localhost:3306/scoula_db -jdbc.driver=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -jdbc.url=jdbc:log4jdbc:mysql://localhost:3306/jeju_gom -jdbc.username=root -jdbc.password=1234 -kakao.client.id=3915e266f2340851e307cca982620137 -kakao.redirect.uri=http://localhost:8080/auth/kakao/callback -frontend.url=http://localhost:5173 -mongodb.uri=mongodb+srv://jejugom:jejugom1234@cluster0.ghkl2er.mongodb.net/jeju_gom?retryWrites=true&w=majority&appName=Cluster0 -mongodb.database=jeju_gom -mybatis.mapper-locations:classpath:mapper/*.xml -# -#spring: -# profiles: -# active: test -# -# datasource: -# url: jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE -# driver-class-name: org.h2.Driver -# username: sa -# password: -# -# h2: -# console: -# enabled: true -# path: /h2-console -# jpa: -# hibernate: -# ddl-auto: create-drop # ?? update (?? ??? ??) -# show-sql: true -# CODEF API 설정 -codef.oauth.domain=https://oauth.codef.io -codef.api.domain=https://development.codef.io/ -codef.client.id=a984203f-1ec7-4ca1-99ae-a44c41f81330 -codef.client.secret=a6d59695-f1f6-4a40-be15-bec655a9e64f -codef.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA16b/65lV/rIU+flAbbtxhRZnxgyVSjhb0vR4dfaz8e1CnhaR1BikHQycAh5A1xQFIWDYlfIx8fgXfjqjplvkNeaqGOuPv0cnYiP9aer+/VXczXNwj5WLG8hVA7l8m2cxWDQc/nPqelWv9TSH6wW0TFg0bevvfqv8dm6mP5wNS7UzSh4hErXPu0vl5Z14/JOjzK4ak2NoFX4FZoE62KQgvvJarib9Ylrbm4BhevUIOEr7zP8oNcZtFl13p/2Gr+KfHvF1PUXaG27HrMH3RUCp3vFTeYDrTFlUyEFzWCSvMWJ+C6T0VJnhbAfdk6NqW3WNxcoZiJ0IAmxU1XGS53SiHQIDAQAB - +# move to dev \ No newline at end of file From eef4076c5146edb1e321d3311b6131f7cae81758 Mon Sep 17 00:00:00 2001 From: guno-p Date: Tue, 5 Aug 2025 10:27:32 +0900 Subject: [PATCH 02/13] Revert "refactor: application.properties -> application-dev.properties" This reverts commit 670dd99efe3e7e7d1b6271e3df7a4fae4c903572. --- src/main/resources/application.properties | 39 ++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 32e368b..cb50402 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,38 @@ -# move to dev \ No newline at end of file +#jdbc.driver=com.mysql.cj.jdbc.Driver +#jdbc.url=jdbc:log4jdbc:mysql://localhost:3306/scoula_db +jdbc.driver=net.sf.log4jdbc.sql.jdbcapi.DriverSpy +jdbc.url=jdbc:log4jdbc:mysql://localhost:3306/jeju_gom +jdbc.username=root +jdbc.password=1234 +kakao.client.id=3915e266f2340851e307cca982620137 +kakao.redirect.uri=http://localhost:8080/auth/kakao/callback +frontend.url=http://localhost:5173 +mongodb.uri=mongodb+srv://jejugom:jejugom1234@cluster0.ghkl2er.mongodb.net/jeju_gom?retryWrites=true&w=majority&appName=Cluster0 +mongodb.database=jeju_gom +mybatis.mapper-locations:classpath:mapper/*.xml +# +#spring: +# profiles: +# active: test +# +# datasource: +# url: jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE +# driver-class-name: org.h2.Driver +# username: sa +# password: +# +# h2: +# console: +# enabled: true +# path: /h2-console +# jpa: +# hibernate: +# ddl-auto: create-drop # ?? update (?? ??? ??) +# show-sql: true +# CODEF API 설정 +codef.oauth.domain=https://oauth.codef.io +codef.api.domain=https://development.codef.io/ +codef.client.id=a984203f-1ec7-4ca1-99ae-a44c41f81330 +codef.client.secret=a6d59695-f1f6-4a40-be15-bec655a9e64f +codef.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA16b/65lV/rIU+flAbbtxhRZnxgyVSjhb0vR4dfaz8e1CnhaR1BikHQycAh5A1xQFIWDYlfIx8fgXfjqjplvkNeaqGOuPv0cnYiP9aer+/VXczXNwj5WLG8hVA7l8m2cxWDQc/nPqelWv9TSH6wW0TFg0bevvfqv8dm6mP5wNS7UzSh4hErXPu0vl5Z14/JOjzK4ak2NoFX4FZoE62KQgvvJarib9Ylrbm4BhevUIOEr7zP8oNcZtFl13p/2Gr+KfHvF1PUXaG27HrMH3RUCp3vFTeYDrTFlUyEFzWCSvMWJ+C6T0VJnhbAfdk6NqW3WNxcoZiJ0IAmxU1XGS53SiHQIDAQAB + From 5c373d0c2f04e55e7c5b09b3f1d38c2542794a8f Mon Sep 17 00:00:00 2001 From: guno-p Date: Tue, 5 Aug 2025 10:37:06 +0900 Subject: [PATCH 03/13] =?UTF-8?q?refactor:=20ci-cd.yml=20runner=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EB=B6=80=EC=97=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci-cd.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 4a4f19d..57c003e 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -46,6 +46,11 @@ jobs: - name: Build WAR file run: ./gradlew clean build -x test + - name: Add runner user to docker group + run: | + sudo usermod -aG docker $USER + newgrp docker + - name: DockerHub Login & Push env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} From 5bdf5bbd0659889da15808fbbfb469e31bd3341b Mon Sep 17 00:00:00 2001 From: guno-p Date: Tue, 5 Aug 2025 10:43:08 +0900 Subject: [PATCH 04/13] =?UTF-8?q?refactor:=20ci-cd.yml=20EC2=20sudo=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EB=B6=80=EC=97=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci-cd.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 57c003e..846cd02 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -84,8 +84,8 @@ jobs: username: ubuntu key: ${{ secrets.EC2_PRIVATE_KEY }} script: | - docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker pull ${{ secrets.DOCKER_USERNAME }}/jejugom - docker-compose down - docker-compose up -d - docker image prune -f + sudo docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + sudo docker pull ${{ secrets.DOCKER_USERNAME }}/jejugom + sudo docker-compose down + sudo docker-compose up -d + sudo docker image prune -f From b810e9242e2958c0ba408992948c666cb71eba37 Mon Sep 17 00:00:00 2001 From: guno-p Date: Tue, 5 Aug 2025 11:07:53 +0900 Subject: [PATCH 05/13] =?UTF-8?q?refactor:=20application.properties=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 39 +---------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cb50402..32e368b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,38 +1 @@ -#jdbc.driver=com.mysql.cj.jdbc.Driver -#jdbc.url=jdbc:log4jdbc:mysql://localhost:3306/scoula_db -jdbc.driver=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -jdbc.url=jdbc:log4jdbc:mysql://localhost:3306/jeju_gom -jdbc.username=root -jdbc.password=1234 -kakao.client.id=3915e266f2340851e307cca982620137 -kakao.redirect.uri=http://localhost:8080/auth/kakao/callback -frontend.url=http://localhost:5173 -mongodb.uri=mongodb+srv://jejugom:jejugom1234@cluster0.ghkl2er.mongodb.net/jeju_gom?retryWrites=true&w=majority&appName=Cluster0 -mongodb.database=jeju_gom -mybatis.mapper-locations:classpath:mapper/*.xml -# -#spring: -# profiles: -# active: test -# -# datasource: -# url: jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE -# driver-class-name: org.h2.Driver -# username: sa -# password: -# -# h2: -# console: -# enabled: true -# path: /h2-console -# jpa: -# hibernate: -# ddl-auto: create-drop # ?? update (?? ??? ??) -# show-sql: true -# CODEF API 설정 -codef.oauth.domain=https://oauth.codef.io -codef.api.domain=https://development.codef.io/ -codef.client.id=a984203f-1ec7-4ca1-99ae-a44c41f81330 -codef.client.secret=a6d59695-f1f6-4a40-be15-bec655a9e64f -codef.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA16b/65lV/rIU+flAbbtxhRZnxgyVSjhb0vR4dfaz8e1CnhaR1BikHQycAh5A1xQFIWDYlfIx8fgXfjqjplvkNeaqGOuPv0cnYiP9aer+/VXczXNwj5WLG8hVA7l8m2cxWDQc/nPqelWv9TSH6wW0TFg0bevvfqv8dm6mP5wNS7UzSh4hErXPu0vl5Z14/JOjzK4ak2NoFX4FZoE62KQgvvJarib9Ylrbm4BhevUIOEr7zP8oNcZtFl13p/2Gr+KfHvF1PUXaG27HrMH3RUCp3vFTeYDrTFlUyEFzWCSvMWJ+C6T0VJnhbAfdk6NqW3WNxcoZiJ0IAmxU1XGS53SiHQIDAQAB - +# move to dev \ No newline at end of file From f9855990692d4dc2fecd261920b67cef9f8b3eb6 Mon Sep 17 00:00:00 2001 From: guno-p Date: Tue, 5 Aug 2025 20:20:38 +0900 Subject: [PATCH 06/13] =?UTF-8?q?[NHDR-204]=20=EB=B0=B1=EC=97=94=EB=93=9C?= =?UTF-8?q?=20=EB=B0=B0=ED=8F=AC=20=EC=9E=91=EB=8F=99=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/scoula/View/home/controller/HomeController.java | 6 ++++++ .../java/org/scoula/security/config/SecurityConfig.java | 1 + 2 files changed, 7 insertions(+) diff --git a/src/main/java/org/scoula/View/home/controller/HomeController.java b/src/main/java/org/scoula/View/home/controller/HomeController.java index 1bcb8ef..4032549 100644 --- a/src/main/java/org/scoula/View/home/controller/HomeController.java +++ b/src/main/java/org/scoula/View/home/controller/HomeController.java @@ -42,4 +42,10 @@ public ResponseEntity getHome(){ String email = auth.getName(); return ResponseEntity.ok(homeService.getHomeData(email)); } + + @ApiOperation(value = "테스트 엔드포인트", notes = "배포 테스트용 간단한 GET 엔드포인트입니다.") + @GetMapping("/test") + public ResponseEntity test(){ + return ResponseEntity.ok("Hello from JejuGom Server! Deployment test successful."); + } } \ No newline at end of file diff --git a/src/main/java/org/scoula/security/config/SecurityConfig.java b/src/main/java/org/scoula/security/config/SecurityConfig.java index 0f81cc4..25f31ca 100644 --- a/src/main/java/org/scoula/security/config/SecurityConfig.java +++ b/src/main/java/org/scoula/security/config/SecurityConfig.java @@ -67,6 +67,7 @@ public void configure(HttpSecurity http) throws Exception { "/", "/favicon.ico", "/api/home", + "/api/home/test", "/auth/kakao", "/auth/kakao/callback", "/api/retirement", From d7b3e22d5a3c6bade4263a0d514ed87bba6273a0 Mon Sep 17 00:00:00 2001 From: guno-p Date: Tue, 5 Aug 2025 20:20:50 +0900 Subject: [PATCH 07/13] =?UTF-8?q?[NHDR-204]=20application.properties=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/main/resources/application.properties diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 32e368b..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -# move to dev \ No newline at end of file From d8ccd8a33c7bddfc89d19e0ffe1894d51ee986bc Mon Sep 17 00:00:00 2001 From: guno-p Date: Wed, 6 Aug 2025 10:35:40 +0900 Subject: [PATCH 08/13] =?UTF-8?q?[NHDR-204]=20cors=20=ED=95=84=ED=84=B0=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/scoula/security/config/SecurityConfig.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/scoula/security/config/SecurityConfig.java b/src/main/java/org/scoula/security/config/SecurityConfig.java index 25f31ca..062bfec 100644 --- a/src/main/java/org/scoula/security/config/SecurityConfig.java +++ b/src/main/java/org/scoula/security/config/SecurityConfig.java @@ -43,7 +43,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override public void configure(HttpSecurity http) throws Exception { // 필터 순서 설정: 인코딩 필터 -> JWT 인증 필터 -> Spring Security 기본 필터 - http.addFilterBefore(encodingFilter(), UsernamePasswordAuthenticationFilter.class) + http.cors() // CORS 필터 추가 + .and() + .addFilterBefore(encodingFilter(), UsernamePasswordAuthenticationFilter.class) .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); // stateless REST API 설정을 위해 기본 보안 기능 비활성화 From 6bf813c4f5b9157c03cb209f23a0638d48d34da0 Mon Sep 17 00:00:00 2001 From: guno-p Date: Fri, 8 Aug 2025 18:28:26 +0900 Subject: [PATCH 09/13] =?UTF-8?q?feat:=20=EC=98=88=EC=95=BD=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/scoula/product/service/ProductServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/org/scoula/product/service/ProductServiceImpl.java b/src/main/java/org/scoula/product/service/ProductServiceImpl.java index 9e53591..a580971 100644 --- a/src/main/java/org/scoula/product/service/ProductServiceImpl.java +++ b/src/main/java/org/scoula/product/service/ProductServiceImpl.java @@ -21,6 +21,14 @@ public class ProductServiceImpl implements ProductService { */ @Override public String getProductNameByCode(String finPrdtCd) { + // 특수 코드 처리 (시나리오 설계 서비스) + if ("inheritance".equals(finPrdtCd)) { + return "상속 시나리오 설계"; + } + if ("gift".equals(finPrdtCd)) { + return "증여 시나리오 설계"; + } + // 1. 매퍼를 호출하여 DB에서 상품 이름을 조회합니다. String productName = productMapper.findNameByCode(finPrdtCd); From c1210c2d4264bb45f99e0c8b9b30bca18578ddc2 Mon Sep 17 00:00:00 2001 From: guno-p Date: Sat, 9 Aug 2025 15:05:52 +0900 Subject: [PATCH 10/13] trigger rebuild From a9dfee9f5c7a5b61622875c8a0ca2b1a9357a96f Mon Sep 17 00:00:00 2001 From: guno-p Date: Sat, 9 Aug 2025 15:14:39 +0900 Subject: [PATCH 11/13] trigger rebuild From c5c60e287794a209dad1612fcd6b7ff1ea2fe7ec Mon Sep 17 00:00:00 2001 From: guno-p Date: Sat, 9 Aug 2025 15:33:02 +0900 Subject: [PATCH 12/13] trigger rebuild From 085d8d8177d0f09fa013ac90867257a4ee1bff32 Mon Sep 17 00:00:00 2001 From: guno-p Date: Wed, 13 Aug 2025 14:50:27 +0900 Subject: [PATCH 13/13] emptyCommitForDeployment