From 4fde1cb6d698e27d96a50947aff2eecc7a8a99e6 Mon Sep 17 00:00:00 2001 From: snacktime Date: Thu, 11 Jul 2024 14:24:32 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20TT-228=20data.sql=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=EC=9D=84=20=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cicd_dev.yml | 1 + src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cicd_dev.yml b/.github/workflows/cicd_dev.yml index 074ced0a..e8b0cae9 100644 --- a/.github/workflows/cicd_dev.yml +++ b/.github/workflows/cicd_dev.yml @@ -41,6 +41,7 @@ jobs: spring.data.redis.password: ${{secrets.REDIS_PASSWORD}} gpt.api.key: ${{secrets.GPT_API_KEY}} jwt.secret.key: ${{secrets.JWT_SECRET_KEY}} + sql.init.mode: ${{ secrets.DATA_SQL_OPTION }} # application.yml 파일 내용 확인 - name: Display modified application.yml diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c38b6e09..a91cd751 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -24,7 +24,7 @@ spring: default_batch_fetch_size: 100 sql: init: - mode: always + mode: ${DATA_SQL_OPTION} data: redis: host: ${REDIS_HOST} From 33ddbd23161edc5186c052a07221fadf2f559a14 Mon Sep 17 00:00:00 2001 From: snacktime Date: Thu, 11 Jul 2024 14:32:50 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20TT-228=20data.sql=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=EC=95=88=EB=90=98=EA=B2=8C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cicd_dev.yml | 3 ++- src/main/resources/application.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cicd_dev.yml b/.github/workflows/cicd_dev.yml index e8b0cae9..5574d59d 100644 --- a/.github/workflows/cicd_dev.yml +++ b/.github/workflows/cicd_dev.yml @@ -41,7 +41,8 @@ jobs: spring.data.redis.password: ${{secrets.REDIS_PASSWORD}} gpt.api.key: ${{secrets.GPT_API_KEY}} jwt.secret.key: ${{secrets.JWT_SECRET_KEY}} - sql.init.mode: ${{ secrets.DATA_SQL_OPTION }} + spring.sql.init.mode: ${{ secrets.DATA_SQL_OPTION }} + spring.jpa.defer-datasource-initialization: ${{ secrets.DATA_INITALIZATION_OPTION }} # application.yml 파일 내용 확인 - name: Display modified application.yml diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a91cd751..fc9c3862 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -13,7 +13,7 @@ spring: password: ${DB_PASSWORD} driver-class-name: com.mysql.cj.jdbc.Driver jpa: - defer-datasource-initialization: true # data.sql? ???? ?? + defer-datasource-initialization: ${DATA_INITALIZATION_OPTION} # data.sql? ???? ?? hibernate: ddl-auto: ${DDL_ENV} open-in-view: true