diff --git a/.gitignore b/.gitignore index 91ae67b..ecbe0b6 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ target/ *.ipr ### NetBeans ### +/src/main/java/tctable/ /nbproject/private/ /nbbuild/ /dist/ diff --git a/com_geovizor_dbms.properties b/com_geovizor_dbms.properties deleted file mode 100644 index 5a82ee0..0000000 --- a/com_geovizor_dbms.properties +++ /dev/null @@ -1,51 +0,0 @@ -spring.application.name=dbms -server.port=8084 - -issuer.name=geovizor - -#??? ?????? ???????? ? ??????? -logging.level.com.zaxxer.hikari=DEBUG - -#spring.datasource.url=jdbc:postgresql://geovizor.com:5432/monitoring_new -#spring.datasource.username=postgres -#spring.datasource.password=y7HMHi0ATxx1VC3UU5WG -#spring.datasource.driver-class-name=org.postgresql.Driver - -#????????? ??? ?????????? ? ????? ?????? -spring.datasource.url=jdbc:postgresql://mcp.kz:5432/mcp -spring.datasource.username=igor -spring.datasource.password=VnzbUdcePSLtg22ktz13 -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=300000 -spring.datasource.hikari.connection-timeout=30000 -spring.datasource.hikari.connection-test-query=SELECT now() -spring.datasource.hikari.validation-timeout=60000 - - -access.key=yon8FWKppyvpSSUMyRt3tGKiOKfZk3LRkgh9ZA2+Zh8= -access.time=600 - -refresh.key=yon8FWKppyvpSSUMyRt3tGKiOKfZk3LRkgh9ZA2+Zh8= -refresh.time=43200 - - -captcha.key=PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= -captcha.time=600 - -mail.host=smtp.yandex.ru -mail.port=465 -mail.loginModel=info@ccalm.org -mail.password=fu2lpsoGPGiq1xlRm8ag - -url.reset=http://127.0.0.1:8088/reset -url.main=http://127.0.0.1:8088/ - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== - diff --git a/com_geovizor_dbms.yml b/com_geovizor_dbms.yml new file mode 100644 index 0000000..e7c845e --- /dev/null +++ b/com_geovizor_dbms.yml @@ -0,0 +1,59 @@ +server: + port: 8084 + ssl: + enabled: true + key-store: classpath:keystore.jks + key-store-password: MFNX344yh4 + key-store-type: PKCS12 + +issuer: + name: geovizor + +spring: + application: + name: dbms + datasource: + url: jdbc:postgresql://mcp.kz:5432/mcp + username: igor + password: VnzbUdcePSLtg22ktz13 + driver-class-name: org.postgresql.Driver + hikari: + maximum-pool-size: 10 + minimum-idle: 5 + max-lifetime: 1700000 + idle-timeout: 300000 + connection-timeout: 30000 + connection-test-query: SELECT now() + validation-timeout: 60000 + redis: + host: 127.0.0.1 + port: 6379 + password: 9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== + +access: + key: yon8FWKppyvpSSUMyRt3tGKiOKfZk3LRkgh9ZA2+Zh8= + time: 600 + +refresh: + key: yon8FWKppyvpSSUMyRt3tGKiOKfZk3LRkgh9ZA2+Zh8= + time: 43200 + +captcha: + key: PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= + time: 600 + +mail: + host: smtp.yandex.ru + port: 465 + loginModel: info@ccalm.org + password: fu2lpsoGPGiq1xlRm8ag + +url: + reset: http://127.0.0.1:8088/reset + main: http://127.0.0.1:8088/ + +logging: + level: + com: + zaxxer: + hikari: DEBUG diff --git a/kz_istransit_dbms.properties b/kz_istransit_dbms.yml similarity index 94% rename from kz_istransit_dbms.properties rename to kz_istransit_dbms.yml index 7830e63..fe15664 100644 --- a/kz_istransit_dbms.properties +++ b/kz_istransit_dbms.yml @@ -3,9 +3,8 @@ server.port=8084 issuer.name=istransit -logging.level.com.zaxxer.hikari=DEBUG -spring.datasource.url=jdbc:postgresql://10.101.1.6:5432/transit_2024_09_03?ApplicationName=kz_istransit_jwt +spring.datasource.url=jdbc:postgresql://10.101.1.6:5432/transit_2024_09_03?ApplicationName=kz_istransit_dbms spring.datasource.username=postgres spring.datasource.password=PasSecrKey1 spring.datasource.driver-class-name=org.postgresql.Driver @@ -34,3 +33,4 @@ spring.redis.host=10.101.1.6 spring.redis.port=6379 spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== +logging.level.com.zaxxer.hikari=DEBUG \ No newline at end of file diff --git a/kz_mcp_dbms.properties b/kz_mcp_dbms.properties deleted file mode 100644 index 603cd50..0000000 --- a/kz_mcp_dbms.properties +++ /dev/null @@ -1,36 +0,0 @@ -spring.application.name=kz_mcp_dbms -server.port=8084 - -issuer.name=geovizor - -logging.level.com.zaxxer.hikari=DEBUG - -spring.datasource.url=jdbc:postgresql://mcp.kz:5432/mcp -spring.datasource.username=igor -spring.datasource.password=VnzbUdcePSLtg22ktz13 -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 now() -spring.datasource.hikari.validation-timeout=60000 - -public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA30j+pSoKFHSdSulIGzdFtg+z+ANJPOSVFJ6jvehj1sonOqQsI2rz539+FgIrsDZE8iydFAlQNxS8vqYtWiQSksAUId7aOY/eq7mFkGW+U5xIA2OPgIvN0uhW1Edm85jS7aAg/P/c+lLHnPzQIFdsgVrAh4esFvVS10Pj6TjJVprDj0jOraIw84GVt0gYXZTudcvZavWcmGV1mQJf0jDIHQsCRcMJAE2lzBIKpJGPPZke9xs25lm8feTFR0NNjDNvCG4dYAimyAH36UslXa/zIfRB/7r4AB9KPBFxGe8szK1EcXbJY+paq+TazZJ8Lo8nEmpehCdHUNdD9iWtiYRjNQIDAQAB -captcha.key=PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= -captcha.time=600 - -mail.host=smtp.yandex.ru -mail.port=465 -mail.loginModel=info@ccalm.org -mail.password=fu2lpsoGPGiq1xlRm8ag - -url.reset=http://127.0.0.1:8088/reset -url.main=http://127.0.0.1:8088/ - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== - diff --git a/kz_mcp_dbms.yml b/kz_mcp_dbms.yml new file mode 100644 index 0000000..77cf91a --- /dev/null +++ b/kz_mcp_dbms.yml @@ -0,0 +1,53 @@ +server: + port: 8084 + ssl: + enabled: true + key-store: classpath:keystore.jks + key-store-password: MFNX344yh4 + key-store-type: PKCS12 + +issuer: + name: geovizor + +spring: + application: + name: kz_mcp_dbms + datasource: + url: jdbc:postgresql://mcp.kz:5432/mcp + username: igor + password: VnzbUdcePSLtg22ktz13 + driver-class-name: org.postgresql.Driver + hikari: + maximum-pool-size: 10 + minimum-idle: 5 + max-lifetime: 1700000 + idle-timeout: 600000 + connection-timeout: 30000 + connection-test-query: SELECT now() + validation-timeout: 60000 + redis: + host: 127.0.0.1 + port: 6379 + password: 9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== + +public: + key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA30j+pSoKFHSdSulIGzdFtg+z+ANJPOSVFJ6jvehj1sonOqQsI2rz539+FgIrsDZE8iydFAlQNxS8vqYtWiQSksAUId7aOY/eq7mFkGW+U5xIA2OPgIvN0uhW1Edm85jS7aAg/P/c+lLHnPzQIFdsgVrAh4esFvVS10Pj6TjJVprDj0jOraIw84GVt0gYXZTudcvZavWcmGV1mQJf0jDIHQsCRcMJAE2lzBIKpJGPPZke9xs25lm8feTFR0NNjDNvCG4dYAimyAH36UslXa/zIfRB/7r4AB9KPBFxGe8szK1EcXbJY+paq+TazZJ8Lo8nEmpehCdHUNdD9iWtiYRjNQIDAQAB +captcha: + key: PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= + time: 600 + +mail: + host: smtp.yandex.ru + port: 465 + loginModel: info@ccalm.org + password: fu2lpsoGPGiq1xlRm8ag + +url: + reset: http://127.0.0.1:8088/reset + main: http://127.0.0.1:8088/ + +logging: + level: + com: + zaxxer: + hikari: DEBUG diff --git a/org_ccalm_dbms.properties b/org_ccalm_dbms.properties deleted file mode 100644 index 6d27184..0000000 --- a/org_ccalm_dbms.properties +++ /dev/null @@ -1,39 +0,0 @@ -spring.application.name=dbms -server.port=8084 - -issuer.name=geovizor - -logging.level.com.zaxxer.hikari=DEBUG - -spring.datasource.url=jdbc:postgresql://91.201.214.156:5432/CCALM -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 now() -spring.datasource.hikari.validation-timeout=60000 - - -public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzYLWgn7uUJYVn1PGyQKKC6F/m6PwEbL6FlCX+TaHZBjor83uS6rbuXquqbU/oFSiviBLI6Zg7BTzAhNglu8S2X4G7a1pkz3fn4kW9mf3zLnXnaNeuh+VhIEt/kw1ire1pCwP95KryKnQaLbi+ARDcGY+giIxjXRtNUTbAmgwP78U5M8fZ48+pH4AHWv/sG3TiTcIzUYCG/QMnnUE+Tir6kV3qrs66zig/cK5tTuJ7/JQOlhYOWBDElu0+lkSHgK2bEK9Wh7+qpIruO2K3gKX3RSFh8XfUIpwPVqyz2HVlzja+/scr6kuDB0iYfWZgrzLHPx3Bd0RyYBMIIgvBOoYmQIDAQAB -captcha.key=PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= -access.time=600 -refresh.time=43200 -captcha.time=600 - -mail.host=smtp.yandex.ru -mail.port=465 -mail.loginModel=info@ccalm.org -mail.password=fu2lpsoGPGiq1xlRm8ag - -url.reset=http://127.0.0.1:8088/reset -url.main=http://127.0.0.1:8088/ - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== - diff --git a/org_ccalm_dbms.yml b/org_ccalm_dbms.yml new file mode 100644 index 0000000..0028f83 --- /dev/null +++ b/org_ccalm_dbms.yml @@ -0,0 +1,58 @@ +server: + port: 8084 + ssl: + enabled: true + key-store: classpath:keystore.jks + key-store-password: MFNX344yh4 + key-store-type: PKCS12 + +issuer: + name: geovizor + +spring: + application: + name: dbms + datasource: + url: jdbc:postgresql://91.201.214.156:5432/CCALM + username: postgres + password: PasSecrKey1 + driver-class-name: org.postgresql.Driver + hikari: + maximum-pool-size: 10 + minimum-idle: 5 + max-lifetime: 1700000 + idle-timeout: 600000 + connection-timeout: 30000 + connection-test-query: SELECT now() + validation-timeout: 60000 + redis: + host: 127.0.0.1 + port: 6379 + password: 9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== + +public: + key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzYLWgn7uUJYVn1PGyQKKC6F/m6PwEbL6FlCX+TaHZBjor83uS6rbuXquqbU/oFSiviBLI6Zg7BTzAhNglu8S2X4G7a1pkz3fn4kW9mf3zLnXnaNeuh+VhIEt/kw1ire1pCwP95KryKnQaLbi+ARDcGY+giIxjXRtNUTbAmgwP78U5M8fZ48+pH4AHWv/sG3TiTcIzUYCG/QMnnUE+Tir6kV3qrs66zig/cK5tTuJ7/JQOlhYOWBDElu0+lkSHgK2bEK9Wh7+qpIruO2K3gKX3RSFh8XfUIpwPVqyz2HVlzja+/scr6kuDB0iYfWZgrzLHPx3Bd0RyYBMIIgvBOoYmQIDAQAB +captcha: + key: PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= + time: 600 +access: + time: 600 +refresh: + time: 43200 + + +mail: + host: smtp.yandex.ru + port: 465 + loginModel: info@ccalm.org + password: fu2lpsoGPGiq1xlRm8ag + +url: + reset: http://127.0.0.1:8088/reset + main: http://127.0.0.1:8088/ + +logging: + level: + com: + zaxxer: + hikari: DEBUG diff --git a/src/main/resources/keystore.jks b/src/main/resources/keystore.jks new file mode 100644 index 0000000..658e3fc Binary files /dev/null and b/src/main/resources/keystore.jks differ