From cd93ec684a3a58a00dfe81c7fbc2eb2c59274f3c Mon Sep 17 00:00:00 2001 From: igor Date: Mon, 30 Dec 2024 07:38:22 +0500 Subject: [PATCH] +HTTPS --- org_ccalm_main.properties | 35 ----------- org_ccalm_main.yml | 55 ++++++++++++++++++ pom.xml | 3 +- .../java/org/ccalm/main/MainController.java | 12 +++- src/main/resources/keystore.jks | Bin 0 -> 2714 bytes src/main/resources/logback-spring.xml | 3 +- 6 files changed, 68 insertions(+), 40 deletions(-) delete mode 100644 org_ccalm_main.properties create mode 100644 org_ccalm_main.yml create mode 100644 src/main/resources/keystore.jks diff --git a/org_ccalm_main.properties b/org_ccalm_main.properties deleted file mode 100644 index be669b4..0000000 --- a/org_ccalm_main.properties +++ /dev/null @@ -1,35 +0,0 @@ -spring.application.name=org.ccalm.main -server.port=8081 - -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 -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 - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== - -data.dir=logs/ diff --git a/org_ccalm_main.yml b/org_ccalm_main.yml new file mode 100644 index 0000000..f741d62 --- /dev/null +++ b/org_ccalm_main.yml @@ -0,0 +1,55 @@ +server: + port: 8081 + ssl: + enabled: true + key-store: classpath:keystore.jks + key-store-password: MFNX344yh4 + key-store-type: PKCS12 + +spring: + application: + name: org.ccalm.main + 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: 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 + password: 9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== + +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= + time: 600 + +mail: + host: smtp.yandex.ru + port: 465 + login: info@ccalm.org + password: fu2lpsoGPGiq1xlRm8ag + +data: + dir: logs/ + +#logging: +# level: +# com: +# zaxxer: +# hikari: DEBUG \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6816c9f..3f9ead9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.4 + 3.3.3 org.ccalm @@ -60,6 +60,7 @@ org.postgresql postgresql + 42.7.4 runtime diff --git a/src/main/java/org/ccalm/main/MainController.java b/src/main/java/org/ccalm/main/MainController.java index b86b4bf..ef74638 100644 --- a/src/main/java/org/ccalm/main/MainController.java +++ b/src/main/java/org/ccalm/main/MainController.java @@ -127,7 +127,7 @@ public class MainController implements ServletContextAware { //Returns data for building a map on the first index page @RequestMapping(value = "/dataindex",method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json; charset=utf-8") @ResponseBody - public Object ajaxIndexData(HttpServletResponse response,@ModelAttribute User user,@RequestParam(required=false,name="date_start",defaultValue = "null") String date_start,@RequestParam(required=false,name="date_end",defaultValue = "null") String date_end, @RequestParam(required=false,name="lng") String language_id) { + public Object ajaxIndexData(HttpServletResponse response,@ModelAttribute User user,@RequestParam(required=false,name="date_start") String date_start,@RequestParam(required=false,name="date_end") String date_end, @RequestParam(required=false,name="lng") String language_id) { String headerValue = CacheControl.maxAge(60, TimeUnit.SECONDS).getHeaderValue(); response.addHeader("Cache-Control", headerValue); @@ -145,8 +145,14 @@ public class MainController implements ServletContextAware { from main.p_dataindex(to_timestamp(:date_start)::timestamp without time zone,to_timestamp(:date_end)::timestamp without time zone); """; MapSqlParameterSource parameters = new MapSqlParameterSource(); - parameters.addValue("date_start", date_start, Types.INTEGER); - parameters.addValue("date_end", date_end, Types.INTEGER); + if (date_start!=null) + parameters.addValue("date_start", Double.valueOf(date_start), Types.INTEGER); + else + parameters.addValue("date_start", null, Types.INTEGER); + if (date_end!=null) + parameters.addValue("date_end", Double.valueOf(date_end), Types.INTEGER); + else + parameters.addValue("date_end", null, Types.INTEGER); List ret = jdbcTemplate.query(sql, parameters, new DBTools.JsonRowMapper()); for (int i = 0; i < ret.size(); i++) { JSONObject rsRez = new JSONObject(ret.get(i)); 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 diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 921b29c..e8b1b8e 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -23,7 +23,8 @@ - + +