diff --git a/kz_istransit_jwt.yml b/kz_istransit_jwt.yml
new file mode 100644
index 0000000..e69de29
diff --git a/org_ccalm_jwt.properties b/org_ccalm_jwt.properties
deleted file mode 100644
index 87460cf..0000000
--- a/org_ccalm_jwt.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-spring.application.name=org_ccalm_jwt
-server.port=8082
-issuer.name=ccalm
-
-#logging.level.com.zaxxer.hikari=DEBUG
-
-spring.datasource.url=jdbc:postgresql://91.201.214.156:5432/CCALM?ApplicationName=org_ccalm_jwt
-spring.datasource.username=postgres
-spring.datasource.password=PasSecrKey1
-spring.datasource.driver-class-name=org.postgresql.Driver
-
-spring.datasource.hikari.maximum-pool-size=10
-spring.datasource.hikari.minimum-idle=5
-spring.datasource.hikari.max-lifetime=1700000
-spring.datasource.hikari.idle-timeout=600000
-spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.connection-test-query=SELECT 1
-spring.datasource.hikari.validation-timeout=5000
-
-personal_data.key=8YxGFFOd
-private.key=MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDNgtaCfu5QlhWfU8bJAooLoX+bo/ARsvoWUJf5NodkGOivze5Lqtu5eq6ptT+gVKK+IEsjpmDsFPMCE2CW7xLZfgbtrWmTPd+fiRb2Z/fMudedo166H5WEgS3+TDWKt7WkLA/3kqvIqdBotuL4BENwZj6CIjGNdG01RNsCaDA/vxTkzx9njz6kfgAda/+wbdOJNwjNRgIb9AyedQT5OKvqRXequzrrOKD9wrm1O4nv8lA6WFg5YEMSW7T6WRIeArZsQr1aHv6qkiu47YreApfdFIWHxd9QinA9WrLPYdWXONr7+xyvqS4MHSJh9ZmCvMsc/HcF3RHJgEwgiC8E6hiZAgMBAAECggEAByZOICwaTmNqTSi0+blE5DKyJdAGQhdf6/bR0rG69BiJv9QCPk+rZUCHYxATLpjDMKoe8xaOuKfh7GiQK7AVj8t6ojouOhkk9n/mdJwZWt38Slesq/z9TqbP2tD769+ISjXeOFa58zk1Lu9t5gL/9aEY+54E607pnbjPhb3qL819/7absLbY1y3GKw2Cwd7RfP8nOWj0ViwnalFjfg6YZS1BL5c9NSg41FzZolwPruZ/bBGbc3nMW2khpuK7CtRk1pRJHUNYuVCsaBU4M4sf3tlZQPOdB6eYmQ3xmPtdnHYB13s588KialXKFlAuO4zG0CFa8DfIKsWDv6xTC1cMgQKBgQD6CjJuu715oKob7ohDTfrSppk4PY/kxWhUkKyKVW1Y1jXQOcd4BwVSyH6s7N8pCSWMwWmoF/t/l2kIcAWNZnsbzAQ8TYOhp1THstXMVb6c7JOL3SQC5RjbgW1RWCalh7/4QVE0xYeEL3qv5I2t9215zKR87Z6LIdJkxxAsHgMSbQKBgQDSaOp0kJZPkQH/75ltaI9exczyoaf+5U/OrnqT2lpRwa+5wqUTPWpTFTCDcJdu8OKCgrKPOQ6NACuX4PbIW/jR+70w7nbC46Tx3JdDYxBlm+6MuHUs5RXufFDJyGoN8lJzoPGax3uxY1kxWwSaSIB0sVXV/P3PIE31I5DbarWjXQKBgQCrRyLm4anYUCtWuN4UpK0lcUPR17Hi9ysRioz2sbAWw53XRk0SNlT6MSc9E4GGnaJgOflDUTJRY4lqYzoac1HvZ6CbIkoCCRq1NRbpQu8wlYo4q8JITWDqtE0LBMRsbYId77hN2uWKse9r37cBrVULsxgWD7uj+QYjTI0Se3iFPQJ/SSYwXFXn68F98Hxb2q1/KnOZzMBmpzcRh8kg1EYVIFc1wF7rBMVVMY0sUIXUH72fAcBuU1yCsoJcpXCQWxeeaWIbY+eDYj3CGlOWQtct3CVZyZJXKkR6W27cp0oFlNOp1okddbHkTsc7Ou1prDmIbwk3zi0mD9wrPg4fTijK/QKBgQDrYEWT77dQLPcN3RTVn3Ua2d9aj/IWwC330I4qZq2SFKOaB/olnPA6fLNYToTWO70A2ZlsMtVepdThIeYFidkA7Lj7lTVYFdQQzREsO5908A1YWE4sgMEEdMc7n5xKT85vpkPOjBOLZYQ6JjDeWBMDxnXR9/txwbau4bsq3/QFuQ==
-public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzYLWgn7uUJYVn1PGyQKKC6F/m6PwEbL6FlCX+TaHZBjor83uS6rbuXquqbU/oFSiviBLI6Zg7BTzAhNglu8S2X4G7a1pkz3fn4kW9mf3zLnXnaNeuh+VhIEt/kw1ire1pCwP95KryKnQaLbi+ARDcGY+giIxjXRtNUTbAmgwP78U5M8fZ48+pH4AHWv/sG3TiTcIzUYCG/QMnnUE+Tir6kV3qrs66zig/cK5tTuJ7/JQOlhYOWBDElu0+lkSHgK2bEK9Wh7+qpIruO2K3gKX3RSFh8XfUIpwPVqyz2HVlzja+/scr6kuDB0iYfWZgrzLHPx3Bd0RyYBMIIgvBOoYmQIDAQAB
-access.time=600
-refresh.time=43200
-
-captcha.key=PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M=
-captcha.time=600
-
-mail.host=smtp.yandex.ru
-mail.port=465
-mail.login=info@ccalm.org
-mail.password=fu2lpsoGPGiq1xlRm8ag
-
-url.reset=https://ccalm.org/api/authorization/v02/reset
-url.main=https://ccalm.org/
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw==
-
-
diff --git a/org_ccalm_jwt.yml b/org_ccalm_jwt.yml
index 3e2037a..1476713 100644
--- a/org_ccalm_jwt.yml
+++ b/org_ccalm_jwt.yml
@@ -14,11 +14,12 @@ spring:
hikari:
maximum-pool-size: 10
minimum-idle: 5
- max-lifetime: 1700000
- idle-timeout: 600000
+ max-lifetime: 600000
+ idle-timeout: 300000
connection-timeout: 30000
connection-test-query: SELECT 1
validation-timeout: 5000
+ validation-interval: 60000
redis:
host: 127.0.0.1
port: 6379
@@ -49,3 +50,11 @@ access:
time: 600
refresh:
time: 43200
+
+#logging:
+# level:
+# org.springframework: WARN
+# org.ccalm.jwt: ERROR
+# com:
+# zaxxer:
+# hikari: WARN
diff --git a/pom.xml b/pom.xml
index 3b01274..c970224 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
21
+
org.springframework.boot
@@ -134,7 +135,7 @@
2.22.2
- file:org_ccalm_jwt.properties
+ file:org_ccalm_jwt.yml
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 600f29d..08412b6 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -31,5 +31,4 @@
-