From 8f9f0831c6d6a6c366829a53c422f0a0f7795d10 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Fri, 18 Mar 2022 11:23:57 +0400 Subject: [PATCH] #9 -- add config parameter --- data/db.mv.db | Bin 69632 -> 57344 bytes src/main/java/ru/ulstu/user/UserService.java | 4 +++- src/main/resources/application.properties | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/db.mv.db b/data/db.mv.db index 60c2a02c59086ff5d21a88e1721ec0fa4c810a01..52ce82b99f5670716827ca5ffb5182b47bb39a90 100644 GIT binary patch delta 3694 zcmcJSUu+ab9LIOsYnm3yaqZE61ZeqFyl`B0?{07RHegz+X^qf=NFdsXdponV&|XV> z*ART58lL=hmImck!3k*4d%0l3?+`p&tYU{ z4P|=6Q(>a)VU)85(YTS;Rj8|$HEYfU-(6n2?msSprykWb*{(V9=rAH%Mn}vsLs8(& z;YzTkL$iosvYe2UiD+(U1Q`iM)nz0nqmyWSVrZ0n5QjD%Y}<#w9IM%;NdQQJ&*vn` zI7ObFQvLOCOQbGqj-c337NR3DB_TfKD|A|-M`Z#R(&;HQRK|T>|gVC{}Z1-qBn=|B3{bdn8@%<*ioQ!CC zIVbbk`~-rY)6V)qh{W{~zCXUL@Z*D61!yan`Hi&^=pU$HhwWdYiS&f3rEENVcVCm| zA3c4QpT6T~M_E5b10X&8t8LY5x4udbzf+R*H|gO^Xj$|6P(>hAwMCMoOZD&I+ikO; zzwmy06#!L*vunE=KnMO+?ErO!n$!&d!uTg`H82W)YN254dM%I?DOB-1M7Eh9&Q%>G zi!`b?mjL0VLf(qYPkQsYOT+@Q;m)dl`o2}|*~1nIg!*3S-~R0Wu4i^U*GI-y zsss3JPiuT^FC7QPqb+L9K4&4}E!$|1n#Ff|UIc&OuHJCZ$(Kt`T5g;lpk{>FN2`o0 zuec{uyWu^0GE3LDHm`S1rFwqrY~f7r!)owB;ndEXOP0^?cc%s;-#Jt9YXb_nQn)y9 zEdZ_+#>`xxZxajhPAT+8BM+R z&PZlbB{O`{UWg`F3}(c=GQwU$a#_5h%)Ig+>LZ4;brv1T8Ht4!XfxB5|K#8@ zSmYqSH{MMWE?!ab(!Ij;!Fg~D)+IAES7g~trIDvpO_SrkvPtFgR2q?-7gVZf3?_v! zJ5i+4ddmCGl#wML^QA&6lb}rDLsLOX#T&Dgw61wdwV`TxidI`sr7gws*CZ}LU!^Tl zy6TQ`@6#5Plm3S=!|GbvW+oFC$saYDOmdZLF;~oDu9(G4af_Ma7CUM?S=9lAwD`&noJ(GrT>aMMcytZZ!;iZkK>>r1iR zo)Q68BDW(=tIFlJ<>xkZayu;MwreTEKilgbGreQQ(J!X=|Ce&X;!Q0)_uGnE|5hHC z#lZzE_E=eHn9SEi2uWEdq>I;#glmSTrlvGfdPes)lRk*|O-`fYqq6Npdk4McMJ+*b zpMqo$l@dkeWdb4xmCkbkDnFyB9A~K187fy&RLTsM5sJ!chRS=TQF*&0Du1V_JhKRu zN6Vtpq^R6c29?QjsN79a`87r5C*@FidI2hrQ&f@@p{OKJ5tVN_l`4M}nm36zZAnCYr;@FMLL_Qpg#} z6lbKXTt+g*8Oar?(xk?7#Te--myujC;4tMe(v>c8xMIZNiV=q?P8_BS$ zjsvK*ArD1G2$P8r0)#?%K;kNUkaz=&79OgqDwUg7DymSWN=2d#uce~mTxZVg1%((8 zYU2mb{^!i)>^a}}JOA(O;%dXL6=6 zPj9=b+jP>-q&;iiZy(jO1vytzH6^w@^Hlul#rUbVSpRx%Pc|PiOSBu=^rT(Z)$|c# zS_i;{#}m4$sdBn(pO}RmOHUhz?PEHy(nqJJW_6{MHDPA~C=|?GdUoQ7t>=IW@@g)h zK5id9HZfI3U!mk4mdD*yxpDC7L!u}|S5^g~_)BuMTQ?82N22Z0HG&|lbUg3=LtYm5 zdCvh!6g#~$*&Ust?EdYB5wYLfu=5Y17;!(|b-9@K{hHIwI=vAe{-yF13ac0G1)&5PRfmHoII z?c}B{`djzWk%Tt>f%kUusj?IAUie%9ed119E~8J-KI8=o4Z% z)-rISwBVy5!5GMZCj1|m?&!G}W2Q#K#BhJ}=#^s0P09nQtWp^PvZGkCBB$rdbH{AU zj|g{Qurp&Cd|+tl>51}nQ*-56U4C8kL*AgTaonZ(D{m%IXyz(|Fz3f$5%xfqbF#u> z5ca@URi#!B;^7_`?&pKoikjE-5Qs$X-RJ3#d?7BFn`mImvXR$pU#W$HoDGzt7G+;) zHtYhY@}V|M;o6*BNNL5qf1e@Sro0eH00);-26v+YYz6pj4$z7PU#X6za$f?CjNhi2 zzzm)Vzk(Gg%`Cuf_p@)WnQ$J18?91NUY_|_Je6!tam3&gJ)o3kt3b`>4R`rRW1CHj z&S(Mi1u(w2$>bHoa5O5W4Co5ZPvB zWFJ4>bv6h-ABFCF16!|I4+2rZkHCQn4Nws9uLbWk-KYL^wP>Q@NagTo@X^eO8pNmf}X9>xLD~lObzBRSJO2lS${PSUpc8^*hEr*@URyhbC(O z5Sb{1UVowzRS1%XdLu%j4uXO?D^<@~_bb8pF)jg_g6Ut6CcYV%DzKorGxOashzhbg z7Z8Z94M0Rz!HWY>1p*BYf!|pa#w((b50iHvdRUC~jB(^6`N+tJl}|pR82PaB$ww6> zA61lmL^1MFMahR%Kt3WF`KY4gql%IbE1!H=`Q*b2XAuGzRzCU2m5h9}4Uw-UxYTmL z{Q1e{#px)fU62=itOr@7IYmp&u`Hr)OxMD0%1tf}jO5T_Rc)BUw6kFr9URPHv*axj zvxJTnX6Z$2mi7~~)I-dYip|pH#4I&ovy>uc>94iT(uXz8(keDfD^+IcuDWJvH#SRV z9kZ0EXO@13&C(~>Ed8RMS$e0!EWL`&5*!h1mf(>$OJ|8$dYqW0PqA5omteExEn>6u zDltnRVY9TqNJzCPV6y}-?fCs#4O0Dh@0TG`@k>fTDyy1QU2g`Y3RV~Bpl)5y>Jm0L zWH}gtxaR`2#IfbuSZy*Dt4;04`)fUdCR@~kbmYqf81*$5wa~Y)d|G8A;^}}>IFo#b zMik=|Rg_aiF-|c>IK>p<6jhW{Oc72I<#UQk$|JhNY?n z1sRhAu>NIrGAdA+fwXXeYOvD4q2;N+Fy~Np8mbJSmn!5Pz-NiWEX(*-0)kayS-e$2 ze0#0G+OmAw`&*%(vn+K$5HP`Q9(ef@1XA^l{slnb)XDCMX}g~s@9k5Ztel>lIBxGD zn-NA(PAm=d;Z&%#z#_lg3d4>IH}Cx5Or%i|8v1%A2$uhf3nY+%R&RQ-%UGHE*DDV*G$ilhz4U z6C`P2X<4zUq_TRRtQE52`1L%>T1$4gsk3C9weKaRg?ODKe@eSd7_iXM*Z6?|rZA}n&<_Nu>o3YmaHK`K3Q6158p>GN`+RVkn8UuG y)TFJy92F65iBb$1v6t}`x+zZm&(e0L0n#?b0hA|SfLkMP8k*{;?o9GFG4>Ulpz?wM diff --git a/src/main/java/ru/ulstu/user/UserService.java b/src/main/java/ru/ulstu/user/UserService.java index 752f234..c8c9f43 100644 --- a/src/main/java/ru/ulstu/user/UserService.java +++ b/src/main/java/ru/ulstu/user/UserService.java @@ -2,6 +2,7 @@ package ru.ulstu.user; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -24,6 +25,8 @@ public class UserService implements UserDetailsService { private final PasswordEncoder passwordEncoder; private final UserRepository userRepository; private final UserRoleRepository userRoleRepository; + @Value("${admin-password}") + private String adminPassword; public UserService(PasswordEncoder passwordEncoder, UserRepository userRepository, @@ -63,7 +66,6 @@ public class UserService implements UserDetailsService { public void initDefaultAdmin() { String adminLogin = "admin"; - String adminPassword = "adminadmin"; if (getUserByLogin(adminLogin) == null) { UserRole adminRole = userRoleRepository.save(new UserRole(UserRoleConstants.ADMIN)); createUser(new User(adminLogin, adminPassword, Set.of(adminRole))); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 89e854d..be8bc18 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,6 +3,7 @@ # You may use, distribute and modify this code, please write to: romanov73@gmail.com. # # +admin-password=admin spring.main.banner-mode=off logging.level.tech.athene=DEBUG server.port=8080