From 71b9becd41cabdd8e07d3147b130e56aacc2c8b3 Mon Sep 17 00:00:00 2001 From: igor Date: Mon, 30 Dec 2024 07:41:25 +0500 Subject: [PATCH] +HTTPS --- .gitignore | 1 + com_geovizor_dbms.properties | 51 --------------- com_geovizor_dbms.yml | 59 ++++++++++++++++++ ...t_dbms.properties => kz_istransit_dbms.yml | 4 +- kz_mcp_dbms.properties | 36 ----------- kz_mcp_dbms.yml | 53 ++++++++++++++++ org_ccalm_dbms.properties | 39 ------------ org_ccalm_dbms.yml | 58 +++++++++++++++++ src/main/resources/keystore.jks | Bin 0 -> 2714 bytes 9 files changed, 173 insertions(+), 128 deletions(-) delete mode 100644 com_geovizor_dbms.properties create mode 100644 com_geovizor_dbms.yml rename kz_istransit_dbms.properties => kz_istransit_dbms.yml (94%) delete mode 100644 kz_mcp_dbms.properties create mode 100644 kz_mcp_dbms.yml delete mode 100644 org_ccalm_dbms.properties create mode 100644 org_ccalm_dbms.yml create mode 100644 src/main/resources/keystore.jks 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 0000000000000000000000000000000000000000..658e3fc6c4f80a2d766a1d1812147d0996c1ab4e GIT binary patch literal 2714 zcma);X*d)L7sqGD7={dqv4mzS*=vT8U6wJCC6k?G%Qi@stQ7_mV;5pX_U!wbE&GxN zg)G@ByOf={y6*Gd=icZ2^u8a?InVk3&p97|&p{Cxl0ZNj6p=v*0u?5yllGZ_bifQE z0~$HS|*eUO8VdS z3`zvd<`a|IjNJqAITo8O-Xkq!v(j{*fItE)ARq#D215Uziy$a10L2S|T9VX(wlrX% zFqj1n5XBAt{?yfSmavpJFJ~ETbm`sZME{S=$&2SZ3hY(CLtM<(* zh6{#?HsV&k&FQPpAIAUM;bUn{RWYX~hKi~Q`wvcxJ2I)c8g+zU+aJcsOB!cDK2Im| zwxnIBUlS8dtGa@f68r>rPc^q{(2Spp1Dd3uzVHN(;gjkEhDL%ommUb4sFu2oN=@qf z)8dt}&+V}tN2!qWg)udhIK^~z+E$g9cU5O);S?0u~BiHt2sg;Z#F z$-<41{OHHWkfAC+hI3m7h-nLipSd4L*IjhKPWJ7ul@_bxoGTPkL(}WMl8c3EqHb#5 z%y~_+31uU#b-~MWR80w1AlRjtE3i>xI`{1KGYp4!Zo6h+#VVQKnJ; zKXP1b;h7l9;( zEeTV_PvlqrE+Ub?;&zgHwHyOeIQqi}yMw+Hf`h8zojPp{KQz! zWU=ZQ-|_p$4q94+mEvY!W=5!G)E@+|?ip%AT3EI$nj_w`yd|ZOi*deEfVQ&k4R?XSw29=psT(4Qm!5=5ELEgJJB}B@-!G z?}dG1CiQNTfc&a+!M?J=yL>4dD<4Q&M900?L{v*DVDw3NU2AO zuiV&H+?{s1M4v==1G|e{h|`QAA+AR&gw5P;K3EWHRSz%gp7f$gc1Ux_qjcnSk~Vhc^n%{ z^KNM>Ig;gILcB_u=vgIwEbFjKbgvvbNUJ4b-$lkMs}|c&zTy2KEAdMY6!25iDp>d_ zdg3_!=GTK%t+z>@VrTu?Jl_RDtlq14=U2(*N?$0j1{;UFY(6JEuHzN%daTMDTR3fG z({(=W^FUTJTIDb3{S8$p8=8d=255&C0RI=L7g*R|4c4qO(0}r69d(>gb0{5u z_y2$zQz%u=9v3$t_p@6{2$hEkB+|@La=0f{OkkfqvH_0G)2jJSy2qv}Wi#=3nt;aU zTI%a>Wo+7T-RHqFpe^;C^UPBjci29B#C5X3Lc5IH(8O7oO;>9!S70{yA{tjR<&H4M{6yJi64W3L9 z+S3&3Hd|0#B#$4J3gg%pP*kh^>>&383?Gx6Qoh2TbaXD~RXU9RTBOZF8eyR&bCNrB zOOlSv&U6m)r9=LqdGK(DU2FFTNHs@xjdMh)iYqlfpP^#VE5*F2z1e@s++seFzy#Yv zH(&&==&<63K*!s%skPWe8>F0 zxahk3;WnkKrYwzBQ7~YvMt_j^g6Hb94&_o2gKAI%Lr zDRSH!HcFJ=l*UAKq8Y3d86Raa3P=~uyP3s`T|E;9i1v06T;rcC3cbtNvZQ@fLtI{%?Cj$4{O+R`y^69Ns8C&` zruI&DOx5(oB%SrbsGiT8ot!rKbmXpvr~d4tw&lSSEc*!wj~gfCEjm$j95i?}b*weo z*f-qx26k*Zy^ZaI0OpPTHbSJ2I_WbHlJQnIy{5ZFjhYOmnwM*Z;JHoHpE|{OI4Cx; z@fZ(<3Ln{Y{|GXDOc8L$wG$_`zckp(gsf~Czm*hj9@$qZKvMe)|)ZHv8ey+C5_o*Go zv5m#`lA*}*}SI(a!lG4E#-{h4hJhw?afojYPZ@k?X*_c(1!OeTONNe z{O~oQsi#j2M$1#Pz*-*28x3km0b#Nbb<6pU*12MQy$g={3o(BJ+UMTm literal 0 HcmV?d00001