From 721291481cd1fb7c13d0738c32df3857e419ab08 Mon Sep 17 00:00:00 2001 From: Hyunseok Ko Date: Fri, 10 May 2024 16:40:25 +0900 Subject: [PATCH] =?UTF-8?q?Chore=20|=20#17=20|=20@lcomment=20|=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=B3=80=EC=88=98=20=EA=B4=80=EB=A6=AC=EB=A5=BC=20?= =?UTF-8?q?=EC=9C=84=ED=95=9C=20=EC=84=9C=EB=B8=8C=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EA=B5=AC=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 +++ .../src/main/resources/application-local.yml | 20 ++++++++++++++++++- cakk-api/src/main/resources/application.yml | 18 ----------------- server-secret | 1 + 4 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 .gitmodules create mode 160000 server-secret diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..e54235e0 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "server-secret"] + path = server-secret + url = https://github.com/CAKK-DEV/cakk-server-secret diff --git a/cakk-api/src/main/resources/application-local.yml b/cakk-api/src/main/resources/application-local.yml index d7fb344d..f04eac5f 100644 --- a/cakk-api/src/main/resources/application-local.yml +++ b/cakk-api/src/main/resources/application-local.yml @@ -1,3 +1,21 @@ +storage: + datasource: + core: + jdbc-url: jdbc:mysql://localhost:3306/cakk + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + driver-class-name: com.mysql.cj.jdbc.Driver + data-source-properties: + rewriteBatchedStatements: true + +oauth: + kakao: + public-key-info: https://kauth.kakao.com/.well-known/jwks.json + apple: + public-key-url: https://appleid.apple.com/auth/keys + google: + client-id: ${GOOGLE_CLIENT_ID} + jwt: secret: localocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocalocal expiration: @@ -23,4 +41,4 @@ cloud: ap-northeast-2 stack: auto: - false \ No newline at end of file + false diff --git a/cakk-api/src/main/resources/application.yml b/cakk-api/src/main/resources/application.yml index 469144d8..550cc53b 100644 --- a/cakk-api/src/main/resources/application.yml +++ b/cakk-api/src/main/resources/application.yml @@ -21,29 +21,11 @@ spring: enabled: true baseline-on-migrate: true -storage: - datasource: - core: - jdbc-url: jdbc:mysql://localhost:3306/cakk - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - driver-class-name: com.mysql.cj.jdbc.Driver - data-source-properties: - rewriteBatchedStatements: true - decorator: datasource: p6spy: enable-logging: true -oauth: - kakao: - public-key-info: https://kauth.kakao.com/.well-known/jwks.json - apple: - public-key-url: https://appleid.apple.com/auth/keys - google: - client-id: ${GOOGLE_CLIENT_ID} - jwt: access-header: Authorization refresh-header: Refresh diff --git a/server-secret b/server-secret new file mode 160000 index 00000000..b0590132 --- /dev/null +++ b/server-secret @@ -0,0 +1 @@ +Subproject commit b0590132534bf54b5ae310d1b023606be0897b01