From cf222133b5d99dace6a5f6802abe0c892ccbdb84 Mon Sep 17 00:00:00 2001 From: yoondgu Date: Wed, 6 Sep 2023 12:44:18 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=9A=B4=EC=98=81=20=EC=84=9C=EB=B2=84?= =?UTF-8?q?=20500=20=EC=97=90=EB=9F=AC=20=EC=8A=AC=EB=9E=99=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EC=A0=81=EC=9A=A9,=20=EB=A1=9C=EC=BB=AC=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20=EC=84=9C=EB=B8=8C?= =?UTF-8?q?=EB=AA=A8=EB=93=88=EC=97=90=20=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/application.yml | 36 ------------------- backend/src/main/resources/config | 2 +- backend/src/main/resources/logback-spring.xml | 5 ++- .../main/resources/slack-error-appender.xml | 17 +++++++++ 4 files changed, 20 insertions(+), 40 deletions(-) delete mode 100644 backend/src/main/resources/application.yml create mode 100644 backend/src/main/resources/slack-error-appender.xml diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml deleted file mode 100644 index 3a75b6ddf..000000000 --- a/backend/src/main/resources/application.yml +++ /dev/null @@ -1,36 +0,0 @@ -spring: - datasource: - username: sa - url: jdbc:h2:mem:mapbefine;MODE=MySQL - h2: - console: - enabled: true - path: /h2-console - jpa: - properties: - hibernate: - format_sql: true - show-sql: true - hibernate: - ddl-auto: create -logging: - level: - org: - hibernate: - type: - descriptor: - sql: - BasicBinder: TRACE - -oauth: - kakao: - client_id: ${OAUTH_KAKAO_CLIENT_ID} - redirect_uri: ${OAUTH_KAKAO_REDIRECT_URI} - client_secret: ${OAUTH_KAKAO_CLIENT_SECRET} - scope: ${OAUTH_KAKAO_SCOPE} - -security: - jwt: - token: - secret-key: ${JWT_TOKEN_SECRET_KEY} - expire-length: ${JWT_TOKEN_EXPIRE_LENGTH} diff --git a/backend/src/main/resources/config b/backend/src/main/resources/config index 304eb085d..6bcc4157c 160000 --- a/backend/src/main/resources/config +++ b/backend/src/main/resources/config @@ -1 +1 @@ -Subproject commit 304eb085dbabd64f669cc49bfd75e464d0488753 +Subproject commit 6bcc4157c1375c7b3688d1cfd77074d6b0ada624 diff --git a/backend/src/main/resources/logback-spring.xml b/backend/src/main/resources/logback-spring.xml index 3a6ab8599..1bfbf1777 100644 --- a/backend/src/main/resources/logback-spring.xml +++ b/backend/src/main/resources/logback-spring.xml @@ -34,18 +34,17 @@ - - + - + diff --git a/backend/src/main/resources/slack-error-appender.xml b/backend/src/main/resources/slack-error-appender.xml new file mode 100644 index 000000000..a16bd5978 --- /dev/null +++ b/backend/src/main/resources/slack-error-appender.xml @@ -0,0 +1,17 @@ + + + + + ERROR + ACCEPT + DENY + + ${SLACK_INCOMING_WEBHOOK_URI} + ERROR-ALARM + :rotating_light: + true + + ${LOG_PATTERN} + + +