From 1f4e80cc2bea07717164ef5fbcf2c0b4e79f7cae Mon Sep 17 00:00:00 2001 From: Katerina881 Date: Mon, 15 May 2023 15:47:28 +0400 Subject: [PATCH] fix --- data.mv.db | Bin 417792 -> 417792 bytes .../configuration/WebConfiguration.java | 1 + .../controller/User/UserMvcController.java | 2 +- .../util/error/AdviceController.java | 2 +- src/main/resources/templates/default.html | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data.mv.db b/data.mv.db index 30104e143fad16cfad3a7ed2c9412f5df25f53c3..6d93cfad0416e5d465341fa89a7f89780b6004b3 100644 GIT binary patch delta 10376 zcmeI2TWlQF8OLX4z25QKA=f6hbF;m%L!6B>=bX82NU}i6P2j{Smlg@anK?5MCD>^$ zh*DZRm6{--(j=#1r4pc(5R|lqI7SFsDn+Gzfl8P@AXHTqeeOerstO(u>6tlmW@f!! zC$^}_Lo98+8GClmr*rxJzyG(HxY#vuv8!}j1(w}|W8Q&^$>X>7KjBw^rfFsGkz=C= zDkwNz8d#2ka&XW;>OJBgt{?;r&nr&i7Z;yCls~hi*tNj7Ug&AOX$8;*}5Khy5cJt9*EDjNR%iKTQjefy+ntKk8R>Yy`ere#}37 zWdGP`g?;AHF|Xnhjp9SQd)G>5rGhL=Qb$#i&>cMPd#|%=y(CE&q+yx9dH(#m&y+%! zw7#deue70mVB__h1~-?t3~ki_M7m*GRGxf@_MBeFUY%w3wvsZKQ^jXK`yT(yckk%z z&dVqNkW)(GCo3PfsGYQW+@~K*4vvSvUeEv9!$U6*eeBtbxi9i+w-mpbhYdXR^Dw}} zMjo!`VG|F7JZ$En%)=HQhIrU&^QiFvcz`@09&{cI9!wrAI(d3vNv{1;tF&5DqdhSM z0R2Z__YjG1p)M|5agqEfh<}5$sjZ~}nSz&IqCf9HOF#H=8+~i!XT|4azRjRcKe=la zeQ|ijxD%~CHsiIo;<}LHzE^?hoEX}Tcc2~Zz}iO>@|q$HH{#9iuUaAkD#zasbG|nItspS0V{Qe`&6wr-EhU(1?ci*%6F3KaM8=@(FOG%?}Jm zOn`2n0O5J0LZVbWY-Te-A`=A$^wh>Em9{t)SEH|OS~>1Ulb{hq;z`gA%hSAMWPS)| zE(FrjNeKA4)b;Gh)(i0*uqQc+aI_Gxd~p9`{#|Sp!l^j8zwkbI}Kx7YZuqPuC?>WH0S}F zesZpBRZJu3X`ns6wtWrJCBN>cUu^E!E#7Og_gb7>NOLqvk}pb9nPDl6A(q0pkD)|i zKzJs{V~CdU{$2L>@aI4G*G9gb|6`W|O$Az#q{=P-R2FnHeQ{QU?8$t3ON{*#%NeRB z8o*8`u?c2y*g8xndRpkEt%V2KIpgbRWKa$kcAUka>DdiYe*LGCFBN*FTuZ*SP;Bp5 zykzOJp6>WT> zfF7Nv2kdC4LfcJ<2R+008yN@EU4p=h&;|q9namm7<>uogr!-_zS-~egEizA>hs2qdYG(tU&F?g}8jsW}bn1p@lhk@d0_?$g?nJM$`StuC#7JRz^9 zYpP}s*OCfsvh_4NQeCm5Zh1pd7ZpW9qYO+Ef;m1yc7Smm!C0Bgcc_^m7;@*-;~?51 z89g?A+to6~C>K4V2aI6D`Ia|Ywn?>#yYri`Yh^MvgfI_oZSwAXY3iPDek#}Azc;^@ z-g4`@9P-!K-nlQoRzZI4vwQP@ntJ%Qirk5?f?URwe<|nX%cCC&rXVw3N+fWD{5rT? z4Mo{mQ40uGaa%xl94XRmgDb`t=nNW)l9XDhS;%Z8lO&16=7xC>=1=Hv&30Cxh2@B- zMs!|{#2gWh#f>>)aGDWLGuIIu(S6OErD{cHLJoErRjtI!OR~2{Z$05CI*zt|*X9GjMSNRFn7~YCNEbqzUo55m-)L;TV^1YnWB^KTXpRu^NL;}+OUX}D@_7YklWb|Pne_b0mlrYC^0OIIbk2${;H$$P z!x3!b)ru;*_}T(`QqgT}3R|hlD!P>sKIQLpPU2qWOi$~^3{?b)vVNKn6MB&N^(3m> zcET1fY?CE}COayurEXa(Jy&mw7frA_^v=${&=!9#<>W$Nb3bf5m2Ed{-?6irF~*@e z4qwa0*$0&5X{F8}hoAmLM`v7Gg$DVO+?!KN{|D1Mt_au5>$v%wUjDw=GdujQ!oxNm zZs1`%4?B3+$%9-CYs966|K>Ne%m>g&09qJoWLyJurkj%ip-Dtli%^z2n^-@q-ZlzO z$F4Dk5cBoSHQwVz;*AU=;WD!|fz?o_utAbj#49?WJ5DAaEva&mF6{F-oN-=78%u}+ zZ)ITH5Pq8Y*b@w{=#0ogV~LB>#s<5LB!ZRbX=4KfqTW`JL7&{TsUeM-+QdC6cGEe? z3|wiZR7N@@22TTLZ9NEHilv;sb@GJ}#(b_Jw8@+>=8vWJ`Z6%y*%Zd1olfjEt9--S z_PaOp_(TW0VLxwwOz*t4Gl!t4v*6TEZe5{tLR*0jE3s}W4k!(_O_Wbb-wSEt;3l;e z%pTlD!c?bFPj-`;Hde7~I1a=?RtO$y5Y@2vu}~>ZMoo2-4R-t9q9hd;7mrKIfTTi* z&A z8n6Thfr{B#a4qbq>>pw|7F1o^g_h~LDq*FR2F*Yv7O@S}GgTj$$kQ-ZeFp;5W|qar zuCGB$R|8$QG~Kb)z;cLXJDwW2cHlz{)Sy5D7ZFJ4qq{cD`Ks>PLU-RZF!kJxIXQYT z{zdJbz4J|ffVu8}!j7ivqzJK_fm%#yuvogrr}g3T?0Gpj`)V(XHuMX(jb z_HWz1R@RbOTif=^|kS5y@`ttD=*e)autvLsH^p6(M69Y$2AB zX(&P>YVuGHJyx2tALKZq>B1Vk4ip+xsdEfzs~vf%6fh+VTdI~8WD?M!;F5Jk#(1sgurqY+q*k zo&2lCg)Vn8YO<{T2aNXxOSqP6pa+!MEU5=zhbA}ng8%z*Yib3;3WX*)&Z?3gx%b3mA* zk$(xAG;C%PIwC~2^9gMfB>u(B@;Z|SPSapSWokimQb$H17OczpwW~#JVruW-*ZN{a z#Yhb<+fm|c5T%r8vV`2~{;kTt6Sc|w4^ ztN@t`3cpQ0*ZO^BrU04q5}?E{ObwMbre6tN1^?e8!TvRuaLpy88gzBLga-YIzn1qe z^Nj}Y>0PP*Tv=8A4F6^$_j{&8e=S5hlxj*w5mFuUY|R6jEp$jO{%HEdw0vS(IWe6( MG2Qa=bpF);0HWDaq5uE@ delta 3052 zcmc(hTWl0n7{||<-PxJ$T6TNyw)6tKEMm9q%S`#vy<=t`+wh@)O0X49Sp5dxTx0KuWwg)d+y%0+fZ1BVWRrhp}y@3Ya9qgDp(_$ z>@^1Ut;SA8jWZm_>T&O+dc=?J_=|)8Z)^HaLs4S@|8w^Fy+)tHp?fbbDtpz~xoca0 zAAWdruwPf$n8u^Y)|Eal0PdykTYv}v1czJ9Yn|lNRD#hZh7+g4UF0%|Ht!9iqf^c3 z$eHf+z+1bZ>FXhN(tQSOfM%+PY^d?Pq7JmMygdn|wc;|LF>|tq45i1<{sGY(y`Eqb zXo)?&d#*0s^X6UXXL*7Z0PxOoeMx|NfSS1w3Y;%Ox93VUozbg>O-^Z+3Z*e@R;rzHb;#K)M8->Us`+wlu_mS@0Y&3jzoP4*yyV zKX;Yll@;T~C3hKKU|j*#?fHNNHI}g9+N_{LHW0Icgu1v^G_mQPd8OMEO1~bS3%w_x z<5%9?Jcne^0YM;@7?Y6D*WofWu+~@2XR?vv$!Nc>4-Ke&`Wp(99D@g$DwAm>Y1BNl z7cGud6Rd$Imj}^6L_pt#eNaSSMH*lnU5$K#&TcpXkDEu^$%fHxSJ1rDP6|OK#&IeW z9qJp}Wh9miKAZKfXa<*&^+5@;KHetE8iME(GBFcRqM@daD$zpCV6b}J=fu3qt7y%| zd4v#0cbh5~IvZjPV*miBG4yXSX{^?&RRFkB0KANc8;?GK=V<_TwBZ0>gNM`WWzG|c zI~68I3&`fIAWI@Ib1Kd`X9ddqxSb4`Kem%fNp?%pR!@#wUMRP`uoBz^R8igwg(j%9 zOwb8VLfVT>5V1@^dDc<21gJ1?)RT(YyAcci>qtFHaZgRX)<6!r&A*nCADK5p8WbX`2?uVSR4H^H#`#-PG60*L)>B>wukwwhgF|w$9zIB^l<3k9{%3u_za${ zYscaAWqFc};7hA939A3-Ow`x5R%n4%r?$@qg& zT>Fm25P+eY^!v&!cO;J_M^VjF)VY|hX$kco6g7vUnxj}yhgyc9h8rR#IL9J*90UMW zc|U?RwX+K$CM<}b!k-~sg&_`SYO!b&eVzbyS&HHeQ9MLE0*ZP;E!wfbKVU8PIJLNE zEIqKW${oog$x+k_DDpy5OE9rQis;Y_0d#CZIeO`dg8I`l^mO|eL0j}rp9&-Hp-&OT`1^@s6 diff --git a/src/main/java/com/LabWork/app/MangaStore/configuration/WebConfiguration.java b/src/main/java/com/LabWork/app/MangaStore/configuration/WebConfiguration.java index 81cd971..cd689f1 100644 --- a/src/main/java/com/LabWork/app/MangaStore/configuration/WebConfiguration.java +++ b/src/main/java/com/LabWork/app/MangaStore/configuration/WebConfiguration.java @@ -3,6 +3,7 @@ package com.LabWork.app.MangaStore.configuration; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpStatus; import org.springframework.web.servlet.config.annotation.*; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; @Configuration public class WebConfiguration implements WebMvcConfigurer { diff --git a/src/main/java/com/LabWork/app/MangaStore/controller/User/UserMvcController.java b/src/main/java/com/LabWork/app/MangaStore/controller/User/UserMvcController.java index d1412a1..a6595f0 100644 --- a/src/main/java/com/LabWork/app/MangaStore/controller/User/UserMvcController.java +++ b/src/main/java/com/LabWork/app/MangaStore/controller/User/UserMvcController.java @@ -23,8 +23,8 @@ public class UserMvcController { this.userService = userService; } - @GetMapping @Secured({UserRole.AsString.ADMIN}) + @GetMapping public String getUsers(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "5") int size, Model model) { diff --git a/src/main/java/com/LabWork/app/MangaStore/util/error/AdviceController.java b/src/main/java/com/LabWork/app/MangaStore/util/error/AdviceController.java index 5c8ed19..b4afa17 100644 --- a/src/main/java/com/LabWork/app/MangaStore/util/error/AdviceController.java +++ b/src/main/java/com/LabWork/app/MangaStore/util/error/AdviceController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import java.util.stream.Collectors; -@ControllerAdvice +/*@ControllerAdvice*/ public class AdviceController { @ExceptionHandler({ CreatorNotFoundException.class, diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index 94a1b32..7150a6b 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -34,7 +34,7 @@ CreatorAction ReaderAction - Users + Users Catalog Документация REST API Консоль H2