From 78dae182232a78d1f027f4f1b61eea3f5cd72645 Mon Sep 17 00:00:00 2001 From: minsu Date: Fri, 16 Feb 2024 21:19:17 +0900 Subject: [PATCH 01/23] =?UTF-8?q?feat:=20EurekaApplication=20@EnableEureka?= =?UTF-8?q?Server=20=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/store/mybooks/eureka/EurekaApplication.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/store/mybooks/eureka/EurekaApplication.java b/src/main/java/store/mybooks/eureka/EurekaApplication.java index 5ec8fba..a3c6070 100644 --- a/src/main/java/store/mybooks/eureka/EurekaApplication.java +++ b/src/main/java/store/mybooks/eureka/EurekaApplication.java @@ -2,12 +2,14 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; +@EnableEurekaServer @SpringBootApplication public class EurekaApplication { - public static void main(String[] args) { - SpringApplication.run(EurekaApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(EurekaApplication.class, args); + } } From d3350bf7826c1241d9913a9e11ef71e1fbf0c3f3 Mon Sep 17 00:00:00 2001 From: minsu Date: Fri, 16 Feb 2024 21:20:43 +0900 Subject: [PATCH 02/23] =?UTF-8?q?feat:=20SecurityConfig=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybooks/eureka/config/SecurityConfig.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/main/java/store/mybooks/eureka/config/SecurityConfig.java diff --git a/src/main/java/store/mybooks/eureka/config/SecurityConfig.java b/src/main/java/store/mybooks/eureka/config/SecurityConfig.java new file mode 100644 index 0000000..b4c63c2 --- /dev/null +++ b/src/main/java/store/mybooks/eureka/config/SecurityConfig.java @@ -0,0 +1,36 @@ +package store.mybooks.eureka.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.web.SecurityFilterChain; + +/** + * packageName : store.mybooks.eureka.config + * fileName : SecurityConfig + * author : minsu11 + * date : 2/16/24 + * description : + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 2/16/24 minsu11 최초 생성 + */ +@EnableWebSecurity(debug = false) +@Configuration +public class SecurityConfig { + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http + .csrf() + .disable() + .authorizeRequests() + .anyRequest().authenticated() + .and() + .httpBasic(); + + return http.build(); + + } +} From 3c49f208ed8fb52954a7b58efacf89b65a92c8aa Mon Sep 17 00:00:00 2001 From: minsu Date: Fri, 16 Feb 2024 21:33:42 +0900 Subject: [PATCH 03/23] =?UTF-8?q?feat:=20application.properties=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8b13789..e0dc191 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,10 @@ +server.shutdown=graceful +spring.lifecycle.timeout-per-shutdown-phase=10s +eureka.client.register-with-eureka=false +eureka.client.fetch-registry=false +spring.security.user.name=admin +spring.security.user.password=1234 +server.port=5050 +eureka.client.service-url.defaultZone=\ + http://${spring.security.user.name}:${spring.security.user.password}@localhost:${server.port}/eureka/ From 6410ff200fbd82ae252701671919d2bcc3c7d5fa Mon Sep 17 00:00:00 2001 From: minsu Date: Sat, 17 Feb 2024 16:24:28 +0900 Subject: [PATCH 04/23] =?UTF-8?q?feat:=20Dockerfile=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=20=EB=B0=8F=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..e136347 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM eclipse-temurin:11 +ARG JAR_FILE=./target/*.jar +COPY ${JAR_FILE} app.jar + +ENTRYPOINT ["java", "-jar", "app.jar"] \ No newline at end of file From 41372894639fb07fb76ec28d371e17a48ca24079 Mon Sep 17 00:00:00 2001 From: minsu Date: Sat, 17 Feb 2024 16:42:36 +0900 Subject: [PATCH 05/23] =?UTF-8?q?feat:=20maven.yml=20github=20action=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maven.yml | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..2ee77a7 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,60 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Docker Image CI + +on: + push: + branches: [ "main", "dev" ] + pull_request: + branches: [ "main", "dev" ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + # jdk 11 세팅 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + cache: maven + + # 패키징 + - name: Build with Maven + run: mvn -B package --file pom.xml + + # 도커 로그인 + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + # 도커 이미지 빌드 + - name: Build the Docker image + run: docker build -t 10m24s/eureka . + + # 이미지 띄우기 + - name: push Docker image + run: docker push 10m24s/eureka + + # 쉘 스크립트 실행 + - name: execute shell script + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.SSH_IP }} + username: ${{ secrets.SSH_ID }} + key: ${{ secrets.SSH_KEY }} + port: ${{ secrets.SSH_PORT }} + script_stop: true + script: "./startup.sh" From 0580b1288fd3a3a48326c1f0b0e3c4ae248bdbc4 Mon Sep 17 00:00:00 2001 From: minsu Date: Sat, 17 Feb 2024 19:37:21 +0900 Subject: [PATCH 06/23] =?UTF-8?q?refactor:=20applicartion.properties=20url?= =?UTF-8?q?.defaultZone=20url=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e0dc191..8131f1d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -6,5 +6,5 @@ spring.security.user.name=admin spring.security.user.password=1234 server.port=5050 eureka.client.service-url.defaultZone=\ - http://${spring.security.user.name}:${spring.security.user.password}@localhost:${server.port}/eureka/ + http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/eureka/ From ee91ba38b7cc3cf30dce0c0b79824cded4503eea Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 14:45:13 +0900 Subject: [PATCH 07/23] =?UTF-8?q?docs:=20application.properties=20dev=20pr?= =?UTF-8?q?od=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 6 ++++++ src/main/resources/application-prod.properties | 7 +++++++ src/main/resources/application.properties | 4 +--- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/application-dev.properties create mode 100644 src/main/resources/application-prod.properties diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties new file mode 100644 index 0000000..d32ac23 --- /dev/null +++ b/src/main/resources/application-dev.properties @@ -0,0 +1,6 @@ +spring.security.user.name=admin +spring.security.user.password=1234 +server.port=5050 +eureka.server.my-url=eureka +eureka.client.service-url.defaultZone=\ + http://${spring.security.user.name}:${spring.security.user.password}@localhost:${server.port}/${eureka.server.my-url}/ diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 0000000..8aa88cb --- /dev/null +++ b/src/main/resources/application-prod.properties @@ -0,0 +1,7 @@ +spring.security.user.name=admin +spring.security.user.password=1234 +server.port=5050 +server.address=180.210.82.248 +eureka.server.my-url=eureka +eureka.client.service-url.defaultZone=\ + http://${spring.security.user.name}:${spring.security.user.password}@${server.address}:${server.port}/${eureka.server.my-url}/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8131f1d..db0bb69 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,9 +2,7 @@ server.shutdown=graceful spring.lifecycle.timeout-per-shutdown-phase=10s eureka.client.register-with-eureka=false eureka.client.fetch-registry=false -spring.security.user.name=admin -spring.security.user.password=1234 -server.port=5050 +spring.profiles.active=dev eureka.client.service-url.defaultZone=\ http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/eureka/ From b493a5d88290ddc75dcde81e2c7887bf6563cbfc Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 14:48:26 +0900 Subject: [PATCH 08/23] =?UTF-8?q?docs:=20Dockerfile=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index e136347..760cca0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM eclipse-temurin:11 ARG JAR_FILE=./target/*.jar COPY ${JAR_FILE} app.jar +COPY src/main/resources/application-prod.properties application-prod.properties ENTRYPOINT ["java", "-jar", "app.jar"] \ No newline at end of file From 958dd3624f9d0affbee438631fb7c9f88a53f7e3 Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 14:52:08 +0900 Subject: [PATCH 09/23] =?UTF-8?q?docs:=20application.properties=20active,?= =?UTF-8?q?=20url=20=EC=84=A4=EC=A0=95=20=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 | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index db0bb69..d5ab1fa 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,4 @@ server.shutdown=graceful spring.lifecycle.timeout-per-shutdown-phase=10s eureka.client.register-with-eureka=false eureka.client.fetch-registry=false -spring.profiles.active=dev -eureka.client.service-url.defaultZone=\ - http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/eureka/ From 091a53480449bd9f1622dbbd3817299740e23727 Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 15:11:10 +0900 Subject: [PATCH 10/23] =?UTF-8?q?docs:=20application.properties=20url.defa?= =?UTF-8?q?ultZone=20=ED=99=98=EA=B2=BD=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 2 +- src/main/resources/application-prod.properties | 2 +- src/main/resources/application.properties | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index d32ac23..f1e92c9 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -3,4 +3,4 @@ spring.security.user.password=1234 server.port=5050 eureka.server.my-url=eureka eureka.client.service-url.defaultZone=\ - http://${spring.security.user.name}:${spring.security.user.password}@localhost:${server.port}/${eureka.server.my-url}/ + http://${spring.security.user.name}:${spring.security.user.password}@localhost:${server.port}/${eureka.server.my-url} diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 8aa88cb..5db4b72 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -4,4 +4,4 @@ server.port=5050 server.address=180.210.82.248 eureka.server.my-url=eureka eureka.client.service-url.defaultZone=\ - http://${spring.security.user.name}:${spring.security.user.password}@${server.address}:${server.port}/${eureka.server.my-url}/ + http://${spring.security.user.name}:${spring.security.user.password}@${server.address}:${server.port}/${eureka.server.my-url} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d5ab1fa..ce064d2 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,4 +2,10 @@ server.shutdown=graceful spring.lifecycle.timeout-per-shutdown-phase=10s eureka.client.register-with-eureka=false eureka.client.fetch-registry=false - +spring.security.user.name=admin +spring.security.user.password=1234 +server.port=5050 +server.address=180.210.82.248 +eureka.server.my-url=eureka +eureka.client.service-url.defaultZone=\ + http://${spring.security.user.name}:${spring.security.user.password}@${server.address}:${server.port}/${eureka.server.my-url} From a7fd7c7fdfcc95333f726a78c37c2722e4b6cba4 Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 15:25:07 +0900 Subject: [PATCH 11/23] =?UTF-8?q?docs:=20eureka=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=B4=20yml=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EC=97=90=20branches=20=EB=AA=85=20=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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2ee77a7..b2b9746 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,9 +10,9 @@ name: Docker Image CI on: push: - branches: [ "main", "dev" ] + branches: [ "main", "dev", "eureka-test" ] pull_request: - branches: [ "main", "dev" ] + branches: [ "main", "dev", "eureka-test" ] jobs: build: From c23ea9748b64b51ab630f9cf0f9bd80e78813997 Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 15:28:37 +0900 Subject: [PATCH 12/23] =?UTF-8?q?docs:=20eureka=20test=EB=A5=BC=20?= =?UTF-8?q?=EC=9C=84=ED=95=9C=20properties=20=ED=99=98=EA=B2=BD=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ce064d2..2da8a0c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,4 +8,4 @@ server.port=5050 server.address=180.210.82.248 eureka.server.my-url=eureka eureka.client.service-url.defaultZone=\ - http://${spring.security.user.name}:${spring.security.user.password}@${server.address}:${server.port}/${eureka.server.my-url} + http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/eureka/ From d123b140b6871e7bd5e1df48b45ea69fc931feaa Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 15:35:58 +0900 Subject: [PATCH 13/23] =?UTF-8?q?docs:=20eureka=20test=EB=A5=BC=20?= =?UTF-8?q?=EC=9C=84=ED=95=9C=20properties=20=ED=99=98=EA=B2=BD=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.properties | 14 +++++++------- src/main/resources/application.properties | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 5db4b72..dcbd1d1 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,7 +1,7 @@ -spring.security.user.name=admin -spring.security.user.password=1234 -server.port=5050 -server.address=180.210.82.248 -eureka.server.my-url=eureka -eureka.client.service-url.defaultZone=\ - http://${spring.security.user.name}:${spring.security.user.password}@${server.address}:${server.port}/${eureka.server.my-url} +#spring.security.user.name=admin +#spring.security.user.password=1234 +#server.port=5050 +#server.address=180.210.82.248 +#eureka.server.my-url=eureka +#eureka.client.service-url.defaultZone=\ +# http://${spring.security.user.name}:${spring.security.user.password}@${server.address}:${server.port}/${eureka.server.my-url} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2da8a0c..8ccb194 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -7,5 +7,4 @@ spring.security.user.password=1234 server.port=5050 server.address=180.210.82.248 eureka.server.my-url=eureka -eureka.client.service-url.defaultZone=\ - http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/eureka/ +eureka.client.service-url.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/eureka/ From 00f68b3fc75d134429dafe718c394312920b7b51 Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 15:42:05 +0900 Subject: [PATCH 14/23] =?UTF-8?q?docs:=20properties=20server=20address=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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8ccb194..4392293 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,6 +5,4 @@ eureka.client.fetch-registry=false spring.security.user.name=admin spring.security.user.password=1234 server.port=5050 -server.address=180.210.82.248 -eureka.server.my-url=eureka eureka.client.service-url.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/eureka/ From 6fec86b69446b883530035e862f4824fc41a0894 Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 15:46:30 +0900 Subject: [PATCH 15/23] =?UTF-8?q?docs:=20eureka=20test=EB=A5=BC=20?= =?UTF-8?q?=EC=9C=84=ED=95=9C=20application.properties,=20prod=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.properties | 12 +++++------- src/main/resources/application.properties | 4 ---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index dcbd1d1..bacf8c9 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,7 +1,5 @@ -#spring.security.user.name=admin -#spring.security.user.password=1234 -#server.port=5050 -#server.address=180.210.82.248 -#eureka.server.my-url=eureka -#eureka.client.service-url.defaultZone=\ -# http://${spring.security.user.name}:${spring.security.user.password}@${server.address}:${server.port}/${eureka.server.my-url} +spring.security.user.name=admin +spring.security.user.password=1234 +server.port=5050 +eureka.server.my-url=eureka +eureka.client.service-url.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/${eureka.server.my-url}/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4392293..82a3b81 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,3 @@ server.shutdown=graceful spring.lifecycle.timeout-per-shutdown-phase=10s eureka.client.register-with-eureka=false eureka.client.fetch-registry=false -spring.security.user.name=admin -spring.security.user.password=1234 -server.port=5050 -eureka.client.service-url.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/eureka/ From 4f29a034ef6452cf9ecc1bcb8bc4be72a6557f92 Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 17:31:21 +0900 Subject: [PATCH 16/23] =?UTF-8?q?docs:=20eureka=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=ED=9B=84=20gateway=EC=99=80=20resource=20=EC=97=B0=EB=8F=99=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=9C=20pro?= =?UTF-8?q?perites=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index bacf8c9..8099a98 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -2,4 +2,5 @@ spring.security.user.name=admin spring.security.user.password=1234 server.port=5050 eureka.server.my-url=eureka +eureka.instance.hostname=180.210.83.223,125.6.39.33 eureka.client.service-url.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/${eureka.server.my-url}/ From 15e5045fec6248d87bb8e39031f4517a95cf454e Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 17:52:58 +0900 Subject: [PATCH 17/23] =?UTF-8?q?docs:=20eureka=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=ED=9B=84=20gateway=EC=99=80=20resource=20=EC=97=B0=EB=8F=99=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=9C=20pro?= =?UTF-8?q?perites=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 8099a98..246e447 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -2,5 +2,5 @@ spring.security.user.name=admin spring.security.user.password=1234 server.port=5050 eureka.server.my-url=eureka -eureka.instance.hostname=180.210.83.223,125.6.39.33 +eureka.instance.hostname=180.210.82.248 eureka.client.service-url.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/${eureka.server.my-url}/ From f5e052d931874d4e919fc0b7c4fe91351863249e Mon Sep 17 00:00:00 2001 From: minsu Date: Sun, 18 Feb 2024 18:15:20 +0900 Subject: [PATCH 18/23] =?UTF-8?q?docs:=20eureka=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=ED=9B=84=20gateway=EC=99=80=20resource=20=EC=97=B0=EB=8F=99=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=9C=20pro?= =?UTF-8?q?perites=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 246e447..bacf8c9 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -2,5 +2,4 @@ spring.security.user.name=admin spring.security.user.password=1234 server.port=5050 eureka.server.my-url=eureka -eureka.instance.hostname=180.210.82.248 eureka.client.service-url.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/${eureka.server.my-url}/ From faaadfd9a11e0e71fc948af721824dae3a8fc910 Mon Sep 17 00:00:00 2001 From: minsu Date: Thu, 22 Feb 2024 00:03:06 +0900 Subject: [PATCH 19/23] =?UTF-8?q?docs:=20=EC=9C=A0=EB=A0=88=EC=B9=B4=20?= =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 2 +- src/main/resources/application-prod.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index f1e92c9..736ab38 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,5 +1,5 @@ spring.security.user.name=admin -spring.security.user.password=1234 +spring.security.user.password=chzhvkdlrkwhgdkdy@!12 server.port=5050 eureka.server.my-url=eureka eureka.client.service-url.defaultZone=\ diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index bacf8c9..d78f96e 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,5 +1,5 @@ spring.security.user.name=admin -spring.security.user.password=1234 +spring.security.user.password=chzhvkdlrkwhgdkdy@!12 server.port=5050 eureka.server.my-url=eureka eureka.client.service-url.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/${eureka.server.my-url}/ From 24bd818295d80e3cef2c011f984f12ef78c14743 Mon Sep 17 00:00:00 2001 From: minsu Date: Thu, 22 Feb 2024 00:04:19 +0900 Subject: [PATCH 20/23] =?UTF-8?q?docs:=20yml=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b2b9746..2ee77a7 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,9 +10,9 @@ name: Docker Image CI on: push: - branches: [ "main", "dev", "eureka-test" ] + branches: [ "main", "dev" ] pull_request: - branches: [ "main", "dev", "eureka-test" ] + branches: [ "main", "dev" ] jobs: build: From dfe8aa3e2ed41db6d057dc3d2e1cd4e7c6eada0a Mon Sep 17 00:00:00 2001 From: minsu Date: Thu, 22 Feb 2024 16:16:58 +0900 Subject: [PATCH 21/23] =?UTF-8?q?docs:=20eureka=20=EB=B9=84=EB=B0=80?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index d78f96e..f2d79d1 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,5 +1,5 @@ spring.security.user.name=admin -spring.security.user.password=chzhvkdlrkwhgdkdy@!12 +spring.security.user.password=chzhvkdlrkwhgdkdy!12 server.port=5050 eureka.server.my-url=eureka eureka.client.service-url.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@180.210.82.248:${server.port}/${eureka.server.my-url}/ From 6dde8975e622bcd0908dd5bf33c461f48ad826f8 Mon Sep 17 00:00:00 2001 From: minsu Date: Wed, 28 Feb 2024 16:50:56 +0900 Subject: [PATCH 22/23] =?UTF-8?q?docs:=20yml=ED=8C=8C=EC=9D=BC=20git=20bra?= =?UTF-8?q?nch=20dev=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20properties=20?= =?UTF-8?q?=EC=9C=A0=EB=A0=88=EC=B9=B4=20=EB=B9=84=EB=B2=88=20=EC=98=A4?= =?UTF-8?q?=ED=83=80=20=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 ++-- src/main/resources/application-dev.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2ee77a7..5b3a728 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,9 +10,9 @@ name: Docker Image CI on: push: - branches: [ "main", "dev" ] + branches: [ "main" ] pull_request: - branches: [ "main", "dev" ] + branches: [ "main" ] jobs: build: diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 736ab38..6fc4cc1 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,5 +1,5 @@ spring.security.user.name=admin -spring.security.user.password=chzhvkdlrkwhgdkdy@!12 +spring.security.user.password=chzhvkdlrkwhgdkdy!12 server.port=5050 eureka.server.my-url=eureka eureka.client.service-url.defaultZone=\ From 37d3bc7e39d06760a954620da4d22ee09775bbcf Mon Sep 17 00:00:00 2001 From: minsu Date: Thu, 29 Feb 2024 00:10:32 +0900 Subject: [PATCH 23/23] =?UTF-8?q?docs:=20=EC=9C=A0=EB=A0=88=EC=B9=B4=20app?= =?UTF-8?q?lication-dev.properties=20=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 2 +- src/main/resources/application.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 6fc4cc1..f1e92c9 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,5 +1,5 @@ spring.security.user.name=admin -spring.security.user.password=chzhvkdlrkwhgdkdy!12 +spring.security.user.password=1234 server.port=5050 eureka.server.my-url=eureka eureka.client.service-url.defaultZone=\ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 82a3b81..6442fd5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,3 +2,4 @@ server.shutdown=graceful spring.lifecycle.timeout-per-shutdown-phase=10s eureka.client.register-with-eureka=false eureka.client.fetch-registry=false +spring.profiles.active=dev