From 8c23e3d3079280fe1c7f6576cc124655ed81e9e3 Mon Sep 17 00:00:00 2001 From: newjaehun Date: Tue, 20 Feb 2024 02:54:41 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20Nginx-front=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9C=84=ED=95=B4=20=EC=9E=A0=EC=8B=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maven.yml | 4 ++-- .../front/book_order/adaptor/BookOrderAdaptorImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 18550a89..299bed7a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Docker Image CI on: push: - branches: [ "main", "dev" ] + branches: [ "main", "dev", "feature/l4" ] pull_request: - branches: [ "main", "dev" ] + branches: [ "main", "dev", "feature/l4" ] jobs: diff --git a/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java b/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java index 445027f0..e895a4ee 100644 --- a/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java +++ b/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java @@ -38,7 +38,7 @@ public List test() { HttpEntity> requestEntity = new HttpEntity<>(headers); - ResponseEntity> exchange = restTemplate.exchange(gatewayAdaptorProperties.getAddress() + "/api/orders-status", + ResponseEntity> exchange = restTemplate.exchange(gatewayAdaptorProperties.getAddress() + "/api/orders-statuses", HttpMethod.GET, requestEntity, new ParameterizedTypeReference>() { From 84bd05091968fe40952b435082bf4aa88faca816 Mon Sep 17 00:00:00 2001 From: newjaehun Date: Tue, 20 Feb 2024 03:10:35 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20Nginx-front=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9C=84=ED=95=B4=20=EC=9E=A0=EC=8B=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java | 2 +- src/main/resources/application.properties | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java b/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java index e895a4ee..ebe296b5 100644 --- a/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java +++ b/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java @@ -38,7 +38,7 @@ public List test() { HttpEntity> requestEntity = new HttpEntity<>(headers); - ResponseEntity> exchange = restTemplate.exchange(gatewayAdaptorProperties.getAddress() + "/api/orders-statuses", + ResponseEntity> exchange = restTemplate.exchange("http://180.210.83.227:6060" + "/api/orders-status", HttpMethod.GET, requestEntity, new ParameterizedTypeReference>() { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5351ccc5..e98e7290 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,3 +1,2 @@ server.port=8080 logging.level.root=debug -store.mybooks.front.config.gateway.address="http://180.210.83.227:6060" \ No newline at end of file From 72eec50af933e99fe7bd254b088bf6ff65ac1103 Mon Sep 17 00:00:00 2001 From: newjaehun Date: Tue, 20 Feb 2024 03:13:45 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20Nginx-front=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9C=84=ED=95=B4=20=EC=9E=A0=EC=8B=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java b/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java index ebe296b5..5bd30e17 100644 --- a/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java +++ b/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptorImpl.java @@ -38,7 +38,7 @@ public List test() { HttpEntity> requestEntity = new HttpEntity<>(headers); - ResponseEntity> exchange = restTemplate.exchange("http://180.210.83.227:6060" + "/api/orders-status", + ResponseEntity> exchange = restTemplate.exchange("http://180.210.83.227:6060" + "/api/orders-statuses", HttpMethod.GET, requestEntity, new ParameterizedTypeReference>() {