diff --git a/org_ccalm_weather.yml b/org_ccalm_weather.yml index d157b18..3484da5 100644 --- a/org_ccalm_weather.yml +++ b/org_ccalm_weather.yml @@ -1,5 +1,5 @@ server: - port: 8083 + port: 8085 ssl: key-store: classpath:keystore.jks key-store-password: QyKtWPZB @@ -22,16 +22,16 @@ custom: data_dir: /data/ db_all: #url: jdbc:postgresql://92.46.48.43:5444/weather?ApplicationName=kz_mcp_weather&sslmode=require - url: jdbc:postgresql://192.168.0.90:5432/weather?ApplicationName=kz_mcp_weather&sslmode=require - #url: jdbc:postgresql://127.0.0.1:5432/weather?ApplicationName=kz_mcp_weather&sslmode=require + #url: jdbc:postgresql://192.168.0.90:5432/weather?ApplicationName=kz_mcp_weather&sslmode=require + url: jdbc:postgresql://127.0.0.1:5432/weather?ApplicationName=kz_mcp_weather&sslmode=require login: postgres - password: PasSecrKey1 + password: 309A86FF65A78FB428F4E38DFE35F730 db_ru: #url: jdbc:postgresql://92.46.48.43:5444/weather_ru?ApplicationName=kz_mcp_weather&sslmode=require - url: jdbc:postgresql://192.168.0.90:5432/weather_ru?ApplicationName=kz_mcp_weather&sslmode=require - #url: jdbc:postgresql://127.0.0.1:5432/weather_ru?ApplicationName=kz_mcp_weather&sslmode=require + #url: jdbc:postgresql://192.168.0.90:5432/weather_ru?ApplicationName=kz_mcp_weather&sslmode=require + url: jdbc:postgresql://127.0.0.1:5432/weather_ru?ApplicationName=kz_mcp_weather&sslmode=require login: postgres - password: PasSecrKey1 + password: 309A86FF65A78FB428F4E38DFE35F730 springdoc: diff --git a/pom.xml b/pom.xml index 21a82d5..e2dffd8 100644 --- a/pom.xml +++ b/pom.xml @@ -40,11 +40,7 @@ spring-boot-starter-test test - - net.logstash.logback - logstash-logback-encoder - 6.6 - + + + + ${LOGS}/${appName}.log - - {"timestamp":"%d{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}","thread":"[%thread]","level":"%level","logger":"%logger{36}","marker":"%X{marker}","message":"%msg"}%n + + + + timestamp + level + message + exception + [ignore] + [ignore] + [ignore] + [ignore] + [ignore] + + + + yyyy-MM-dd'T'HH:mm:ss.SSS'Z' + UTC + + + true + + + false + false + + + + 1 + 1024 + 20 + $$FastClassByCGLIB$$ + $$EnhancerBySpringCGLIB$$ + - + ${LOGS}/${appName}.%d{yyyy-MM-dd}.%i.log + 100MB 30 - - 100MB - + 3GB - %d{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'} | %level | %logger{36} | %X{marker} | %msg%n + + %d{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'} | %level | %logger{36} | %marker | %msg%n + - - + - + \ No newline at end of file