From 74c813ff8b6b5a03165882771696b5384c5e01a9 Mon Sep 17 00:00:00 2001 From: limju Date: Wed, 18 Oct 2023 10:51:43 +0900 Subject: [PATCH] fix: spring boot config fix --- .../main/resources/config/application-dev.yml | 34 +++++++++---- .../resources/config/application-local.yml | 16 ++---- .../resources/config/application-prod.yml | 50 ++++++------------- 3 files changed, 43 insertions(+), 57 deletions(-) diff --git a/mens-api/src/main/resources/config/application-dev.yml b/mens-api/src/main/resources/config/application-dev.yml index d472b07..f62393f 100644 --- a/mens-api/src/main/resources/config/application-dev.yml +++ b/mens-api/src/main/resources/config/application-dev.yml @@ -1,7 +1,23 @@ #----------------------------------------------------------------------- -# local 설정 +# dev 설정 #----------------------------------------------------------------------- spring: + datasource: + hikari: + # 9 server + maria: + driver-class-name: org.mariadb.jdbc.Driver + jdbc-url: jdbc:mariadb://211.119.124.9:4407/mens?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&autoReconnect=true + username: root + password: xit1807 + read-only: false + # 115 server + oracle: + driver-class-name: oracle.jdbc.OracleDriver + jdbc-url: jdbc:oracle:thin:@211.119.124.115:1521:XITSMS + username: xit_sms_lg + password: xit_sms_lg + read-only: false devtools: livereload: @@ -17,10 +33,13 @@ logging: level: root: debug org.apache.http: warn - reactor.netty: warn io.netty: warn - org.springframework.web.reactive.function.client.ExchangeFunctions: debug + reactor.netty: WARN + # webclient logging + reactor.netty.http.client: DEBUG + #org.springframework.web.reactive.function.client.ExchangeFunctions: TRACE org.springframework: warn + org.hibernate.validator.internal: WARN file: # 로그파일 위치 path: ${app.data.root.path}/mens/logs @@ -28,7 +47,7 @@ logging: # Spring Security cors 설정 :: CorsConfiguration 설정 값 cors: - allowed-origins: http://211.119.124.9:8080 + allowed-origins: http://211.119.124.9:8080, http://localhost:8082 # ================================================================================================================== # SQL logging lib setting @@ -39,13 +58,6 @@ decorator: enable-logging: true app: - license: - path: ${app.data.root.path}/mens/.pem/ - key: 'mxLAM1fAEDPWkFz8' - data1: 'WEcpGVH9g01hS8L0ke6sL9g8Hmsy4yngfEwH5L/ax62IzmdjIU6mE6GoGnC3iuRN1ENCYlVz2b8BYtAKDltMYZWx+qBjY+KscgfFoMDLIVHMGAUSDF+PyE6KV2DsKoAhc2ZdNnqbFJDgDP/qyFSRjwD1dvzeXTuCcz4mnQxOovXqiMkXwnBKhUBzq9dFeLlsk1e/YoR9SZTrpt0x0T8IeyzqI568FFqNAznmbJ+1kpi9yRaJ5c8MXXEIrfPJVONrLfeVezg1Z9jDj56zPL6gqrKhKtHJwkxpESx+5ik8O01GDcmytsLAeoIz0BiZVLJXUc/T6mZBVP6FfZnDC0dWfA==' - data2: 'YBF68uN720dTzblufB/AkZTxZnDIt6G29UkjIkJL9TDH2UkTB9FPNgtk4TqSTCFr1C4SsSU9Z/XQ957+c6K1JZe20JzDlhRWr6Zty0lCORI6erdpRq0zUsKANeJoB2hgqgeLcDxuOUN2S19MacD2VA4H0+7zKATiT8P7OEWXrAU9M2YmbEMMxHQsc6SZIa3EoGrJdNZrgeVXxL2+aJN28gmMm3CgoxLEEtuSZXK3LEZLlLEZvZtDxuxqx7Os4CtNwvHsDyFcIot6Ghbr+G3EsT+jghvvei0Cg4Qgm4n11yj0hsWR8CwmV7FTTqo03s0zBDRhYhgML81KkE/AtZSVvA==' - data3: 'IWPfGH1nDoOsevS4eyw4fItEqNymamycYa+rN+3v/iQxwy5mohdYNgm/+HcOGua2FJ6VxgGC/9i5b0jKB5L2p8bSBrEQBmluh+DsEMzeUxP8mfD2hTIUfeA9osmXW0al6BfcoJKZyiUGzxoSDY1MMdbAB9FQSBWY9yniGBaEXt3CgJmloXsVoRRolalmO6oqRJq4t1kV0fRijGGMQ5/0nu0Z5fuhCukGmEAsIW0abRXARDzoXYfAZKbKW0L70X8htpFAkk9t2IukeZemHGBBinDBWsh0ZlysHJfcXlFnFh83hXrsYcpUAn34PSd3TfLPeymdoduTF8wX7sOVMuPUVg==' - # swagger url url: 'http://211.119.124.9:${server.port}${server.servlet.context-path:}/' data: diff --git a/mens-api/src/main/resources/config/application-local.yml b/mens-api/src/main/resources/config/application-local.yml index b4a2338..220deaf 100644 --- a/mens-api/src/main/resources/config/application-local.yml +++ b/mens-api/src/main/resources/config/application-local.yml @@ -3,10 +3,6 @@ #----------------------------------------------------------------------- spring: datasource: - # =============== p6spy =============================== - #driver-class-name: org.mariadb.jdbc.Driver - #url: jdbc:mariadb://211.119.124.9:4407/ens?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&autoReconnect=true - # root / xit1807 hikari: # 9 server maria: @@ -17,8 +13,6 @@ spring: read-only: false # 115 server - # jdbc:oracle:thin:@211.119.124.115:1521:XITSMS - # xit_sms_lg / xit_sms_lg oracle: driver-class-name: oracle.jdbc.OracleDriver jdbc-url: jdbc:oracle:thin:@211.119.124.115:1521:XITSMS @@ -40,10 +34,13 @@ logging: level: root: debug org.apache.http: warn - reactor.netty: warn io.netty: warn - org.springframework.web.reactive.function.client.ExchangeFunctions: debug + reactor.netty: WARN + # webclient logging + reactor.netty.http.client: DEBUG + #org.springframework.web.reactive.function.client.ExchangeFunctions: TRACE org.springframework: warn + org.hibernate.validator.internal: WARN file: # 로그파일 위치 path: ${app.data.root.path}/mens/logs @@ -108,6 +105,3 @@ app: rcv: /rcv backup: /backup err: /err - - -logging.level.reactor.netty.http.client: DEBUG diff --git a/mens-api/src/main/resources/config/application-prod.yml b/mens-api/src/main/resources/config/application-prod.yml index 2579191..f44ce08 100644 --- a/mens-api/src/main/resources/config/application-prod.yml +++ b/mens-api/src/main/resources/config/application-prod.yml @@ -3,38 +3,14 @@ #----------------------------------------------------------------------- spring: datasource: - # ================ log4jdbc =========================== - #driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - # mysql에서 batchUpdate 사용하기 위해 rewriteBatchedStatements 필요 - #url: jdbc:log4jdbc:mariadb://211.119.124.117:53306/ens?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true - # ===================================================== - # =============== p6spy =============================== - #driver-class-name: org.mariadb.jdbc.Driver - #url: jdbc:mariadb://211.119.124.9:4407/ens?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&autoReconnect=true - - # r2dbc 설정 : 추후 진행 여부 결정 - #driver-class-name: org.mariadb.jdbc.Driver - #url: r2dbc:pool:mariadb://211.119.124.9:4407/ens?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true - # ===================================================== - #username: root - #password: xit1807 hikari: - # 9 server - maria: - driver-class-name: org.mariadb.jdbc.Driver - # jdbc:mariadb://127.0.0.1:4407/ens?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&autoReconnect=true - jdbc-url: ENC(QrsIhXG/ZgD5a1SYaf+1CaZYkLxuMP4s7//+NXV1SlLHKXRFm7FFA8iP10Dlak3VOFjFSaWEkchSWcNQ4+4m94fSWW7uy+/4nW3jBq4aHuvVVCqy2rfgInqYbYMlno91vUmWkMbKuX8T5nF7UltaAuQOXH/ImCT8whPxAE+VOM1onyuIr0fbVg==) - username: ENC(L8Xp+ZuLxlXahupxYDWzgA==) - password: ENC(eDCxblnWkDHhJEEXMdkzww==) - read-only: false - - # 115 server - oracle: - driver-class-name: oracle.jdbc.OracleDriver - jdbc-url: ENC(zWLLN8fkbayeHrlyXlG8sHIA9J1OdCZcDy3Snj/5hdDr9GfBIkMsboW3Z9KTRrCV7b7LU5+FIFY=) - username: ENC(wiNWcgb1ADyNwabf+S6KwDX/ou2aV6Z8) - password: ENC(5ejKeOJ/t7YEn/ikHKmNHdejhHHWOBuC) - read-only: false + # 9 server + maria: + driver-class-name: org.mariadb.jdbc.Driver + jdbc-url: jdbc:mariadb://211.119.124.9:4407/mens?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&autoReconnect=true + username: root + password: xit1807 + read-only: false devtools: livereload: @@ -50,10 +26,13 @@ logging: level: root: debug org.apache.http: warn - reactor.netty: warn io.netty: warn - org.springframework.web.reactive.function.client.ExchangeFunctions: debug + reactor.netty: WARN + # webclient logging + reactor.netty.http.client: DEBUG + #org.springframework.web.reactive.function.client.ExchangeFunctions: TRACE org.springframework: warn + org.hibernate.validator.internal: WARN file: # 로그파일 위치 path: ${app.data.root.path}/mens/logs @@ -61,7 +40,7 @@ logging: # Spring Security cors 설정 :: CorsConfiguration 설정 값 cors: - allowed-origins: http://localhost:8080 + allowed-origins: http://localhost:8080, http://localhost:8082 # ================================================================================================================== # SQL logging lib setting @@ -76,7 +55,7 @@ app: url: 'http://localhost:${server.port}${server.servlet.context-path:}/' data: root: - path: d:/data + path: /data #--------------------------------------------------------------- # log 설정 # request: @@ -89,6 +68,7 @@ app: log: request: common-enabled: true + response-enabled: true # MDC logging trace 활성 mdc: enabled: true