From 12880e8b5fbf1124245d850982402b7db8f82728 Mon Sep 17 00:00:00 2001 From: jangwonseokicom Date: Fri, 2 Jun 2023 17:41:54 +0900 Subject: [PATCH] thymeleaf ssr complate --- .../executionHistory/executionHistory.bin | Bin 6432710 -> 6432710 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/7.5.1/fileHashes/fileHashes.bin | Bin 439882 -> 439882 bytes .../.gradle/7.5.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../7.5.1/fileHashes/resourceHashesCache.bin | Bin 121011 -> 121113 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../login/controller/LoginController.class | Bin 8703 -> 8703 bytes .../common/login/service/LoginService.class | Bin 26375 -> 26372 bytes .../compileJava/previous-compilation-data.bin | Bin 390940 -> 390940 bytes .../login/controller/LoginController.java | 1 + .../common/login/service/LoginService.java | 6 ++++-- 11 files changed, 5 insertions(+), 2 deletions(-) diff --git a/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin b/main_vm/.gradle/7.5.1/executionHistory/executionHistory.bin index a115aef4ed33e21dc61a055429c5ed4ca17cdbc2..24811c6ed7a53243243d7a6192b43d195c7b1740 100644 GIT binary patch delta 2263 zcmbW&dr(x@9S3mlJ!hAAS72G#LP3MOyxGNdc`1q^Dh-Pu>!xvy7y%IxHU3n{kyBTWJhgVu`Oradn?y$ih6JT%558RS4~jUzt}FAVs~B}?K*qBXzHv{iBMD2J-(05sCb4z%>UWp?W=@@SLRtIZqJX`$ zUSr6dwdLFU7wfll_O&}un&ob*d%VuGHaK%@)!Sp0Pgv`aXrrgF#3l`kk2$24kG+v=YsY##pJFN9(5+p^7=CSbSMwBbFYa z$kvXC4%))k&y0u`I>6J=h!~@)SGF^nj4_g|Y~PQ?BkS9VKPw&;b@Vddt{KJTkTN;x zsL?|A)RcC~nup?dp4#x&uzroq65T*+eTk4mv^2@cEe zi#M{mR--rVK#_gyMv|lfrCk;#9IPzY2UNP_m?5Q9wMJ-U`4#$5mWU$VRf}7vyORV; z5AfyBJjqO{T$$`J3H5Avqrs159oDPZm?zFSu5|9M6uw{`8(hsS$&0*B?<$L4V%9MYK1I)MLFG{UYnG6ucMpNA58fRxZ<{LnuH5GQToX;L6LK~M6XmOyerpr?3oZ!noBeS=hF{V4@6(Bqa6 zz_fk1HVMIV&ncZlX~JRF(J2M7L|#0v6n|L2i&vx|`NI(Mj-a`tRNE>A;TYSwftpxI z818rvRe4Sr38T^@W#GI6Z6m$Hc~xHizhnOWnN`2_ly>~Jf8H3+Umx_ zCu^%V4qh!wPWp1oqiyo81QKFW^(u26-T~8D&#y?Fs$cm(!6(2fFU%!c&*U?{=jOeW z{`UvlyVu-lNp92N`UKRdtIYO=cJGuLLAJ3*$@wN;1x)KS79#9gZYpMzkt^u32cxI z3m^qjVIib}9TtHDUWZ@88?YFhums+OrH~HG;4Rr!u)MARfBpzf{uA3-GIw@SZf*u- z%DK5&*ZlwgpCf(IfB7YfWA8t3*3ywHC0%Ulkkd@>@U&>i8LYbbeF;9t!<+49^>H4p z_!3Cr>gMrmb&<@f-zg&}%j{w5e~p(*T_lsbeLUyO!C~rW<9XOcN>)9`*+p!{7Q2mp z&mYs0lMzmLV}K3jWQ5YIJe7_(P4qNRtvn6#^kBqkRo5Wl4i1mhd8%)DX4*=7C>`Mg zhSeE~^h2I*j5@<<8&B>Jofi6lr;es{i&{p)dg(;TtZo?3hH4T;Z}N-$$Y*=_Y`r0S zy86+0|7EvT)r1~)uuCStpnCLN#vbwi3Le)Lv)qH*Gmn?6GJ(JxD%+`9>kMY_10f7n= X$SLvm)3OUkI{C}T)8*Kp>=N-mZQb0S delta 2196 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 U#ZZT2I~cSY>1Wb{R`X2kKLAvt4FCWD delta 1329 zcmXw3e@q)?80PM4i%^j**D0Rz%LTC`Ygdt&Y^W`R#|;8|BWx2?5^36#-tsT>-X3>E$sIt#&{~Z7)~qXeO4jb_?Hh)HT}`d?RkF zaYtzOYWZy{iu<_c5Gwk((ueB#SsLbkVyRCz4(pcpq}$MS)-E&u%z{ze&nl&y@=s#&&W3@J))zZJa1Gv>=Ud@V zK5v|kvz<(f4Ot%}nJaAT#q?G_XD-|EwVz)@#sKr!j^FO+#V&!)_~03nRjq!QB5p^j zwU%KkAkwOh4SOCYFejWIi()0t6m4x-A@<{~f_?ltB$rLmc3iaB_65P_q!28k#!n7f zEhb+UZ1p}ZeDP`WKJyN~8??GhHsHTOUQgsRc!va9(Em<9E!TjbUC@dy%`ZPO8 zr#u{)wj|~gh)*+(KoMG=q4Wo5*mjAI&tb&Pvzoi{lUq`8H);I@%=INN#?b~^M)x)v zb;xg4A+U|i518y<(jG!%iO@D7M#wNytboy!d)~l`N8E&vb%Phsf{GjLTT-Ix!&9Pdmo-Q~`h4L(R6GHV(W)iQXaNgQ)GcG>Oqr5Pqah}C!im5te-?GxA z=8V8CHd;hQ=;i1?>rjz(pHQlTmHuJq1k%B*i#=pS5kuSJ!g?`eOOd*#20i lV{>*zSZww8Z}WKjD#9`PXSmicx!QwSHhS$wFw61x@c#k#!(#vd diff --git a/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock b/main_vm/.gradle/7.5.1/fileHashes/fileHashes.lock index e1c4e334df30d6d88757572831a44512b4e08ab2..efe2f55fcb49fad87aefa3679fec828cf404d513 100644 GIT binary patch literal 17 VcmZS9J)F?AJ&jw00Sp3G001ew1PTBE literal 17 UcmZS9J)F?AJ&jw00Sp2}0Vya0cK`qY diff --git a/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin b/main_vm/.gradle/7.5.1/fileHashes/resourceHashesCache.bin index 77e986466efd67f966c34eee7d5384a25ba51c79..e2f3671f968827623e5116169eadceb405d3dcab 100644 GIT binary patch delta 212 zcmdnIk$vVS_J%Et@3k3cZvUXoIFXrupHNiyzteRLAi#Lz`}PWb#=}aCnHv>XaBlw- z&3KEOv2OeIbVf@Seyfuavvw9tfvUW^ojr$9QG(w`{kVb0#WhgT&D-T$7?arKbjCvt4#q$Ql0Ym7!U8Uj6X%`p`OYLfX#)U0mPzyg delta 77 zcmV-T0J8s?vIn!V2Y|Ez?<)bAx9}?gkps7xF9EtD0a39bzzMhfTLIb&0erXDX8}0` jw{0S>qEmjS{+y!Rf& diff --git a/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/main_vm/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 9574328f3bff1049beb978f2c321a9f4971b9bd7..61fd8909ae93073dad0250289c0c883aa11324cf 100644 GIT binary patch literal 17 VcmZR+=e_ammCbjaGJpZoAplEE2G;-p literal 17 VcmZR+=e_ammCbjaGJpZoCICx32FCyZ diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/controller/LoginController.class index 7e7e192117527745ef555a2f0f20343145d56632..0e90d695f1ae9b0d04a6300aeb2dd96e9ad1b3e2 100644 GIT binary patch delta 204 zcmezG{NH)QFGs@1d1jx2r;Bg z{-B^X*;6`(Hxnq51r*6)kY>o8yh(Z`Z#7V)1}IX;Aj42UIYZ_qZy!*kA1E>rC^BiX zpX_tlSqwZ3vl+w~<}k=J%wy1Gn9pF$uzRH2}&ajq2 wpJCnPA98(+TPC;5Co%4t{7OE8@!;eMlH!x26nZ(21J#}Ysy(&&g91Mz0NXG&yZ`_I delta 204 zcmezG{NH)QFGs@0E#9u2r(p2 z{-B^X*;6`(Hv=e=2^7g@kY>o4yh(Z`Zxv9a8YoiBAj42MIYZ_qZ!b`!4=6GLC^B)f zpX_tlnG8G(vlzq}W;4h$%w^DIn8#quFrUGOVIhMX!=lMSa#ICY0QIZ{>RHX8&aj3- wpJDCfA98(+nlH!x26nZ(20o5J{sy(^+g91Mz0Lr*FlK=n! diff --git a/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/service/LoginService.class b/main_vm/build/classes/java/main/com/icomsys/main_vm/biz/common/login/service/LoginService.class index f0a87b1a2da564b7e0b2f98f3b9f7ac1113c6a92..384a499c200e9a291ebb46808651d3a70370eb82 100644 GIT binary patch delta 900 zcmWlXZA{f=7{-6s2D77*9uX|%IL-zYtvZl01&&Ed(;19|gGf`)Ie2gsFNcXXNRVYz z2Abq^SVKo;=3ISn<=<>-Vp&@D;+D0U*^80AZLAkdtE~^+eR+1j{O;?1_B_{)1?_7pt70tQIEH z%1qjrN0KG96QRTFuIg1yr?oaQjc&4xzk^;Xc$774vFtIn(#If=GsF|@vFrp-@h$y~ zGr+HG=PHAm#50=0PE8}Fn;CMI)nggM+`umK*-a56t}OCU`W~z7bFV~J=w+8ybFU7# zNX-lWgSOpc28YPwbz=`ZEpN^^LN=c;n{yO!#OqofQ}KCnZRu_NLa{Bri{E&d-|aG2 zc#%KY$DcNSl~JzoA%F21fAcf{de_%ZmeSm;x|k-r?z(dUKk0VQY-N(K>CCmbL|H6V zHnp1Jn(y0|k;4=PjF`<#<+`-`XMK50Rle~zc`wyRRdPGmDa0%lQmnaDXr7JEC#h1p zRK`|?*{%f)Yax48&Ouc$swI4?WiGtpqQ9CO6(LtOHeE}p>f9|W+jYMiUfJkdZL8Oi zr>HmKfil%33~eN+brh({@CR9-W+G}~mD*@ml8tJoN1gPkivc}i@4tx=b+cbR9MEPC zsh2mbe_UHQsXpgcT@Lh{>VTg-(jxp?%ygBzE77pZTqqXSeAg1I^cNaYWW=3D%rT}u z%5r7#urgg|yi)(TQ}HT|yUd2gcGfq9HSVPv0=nmO^T`Er_`?4FA|-rDoUdr)Yu59P zdGeCE^Mbi^j1=Fom&?4z_k7F`R{hbcKUp^BU0YkIs-yTgMvym|!*O%|s9F02wY)_q sZ=1wPcJPi_^j)5_{_~vXH4{6=`<&v8`RD`A+j)tPY|&}2qcNrb00koRTmS$7 delta 911 zcmW-gZA{f=7{-6sk_w5*As|ywSg?j;9LW$5l9ZaIag}9#$mKMFCR%=vN_O`XP?)Bx_wfp|v*L{Duo}N?Ma!N0B z=VVX4JJ#M2X>Ta?M;coEEs>^He6 zk!@UH2Y=9~B>FXh0j1(}ErV|1lC#N=Fp=Hlv4vnV9X^syvSA8tffVmEO1GO(Ip*Ll`I^C4I{Di2f z`2T9LsV=uMJkwXsINeB+Zo;Rzq^aCps4G*cD+rgV#5IL0e10RQ8&PD$bw>D&NOvRQ zY07k$Mv9c?W<|=B>efao^tT(11U2ST>gU;8RbQqtZ=gO)H=nk=oFS9XECZhtV1x)? zSf;S>U!fR_B)PD>t_Hh6J diff --git a/main_vm/build/tmp/compileJava/previous-compilation-data.bin b/main_vm/build/tmp/compileJava/previous-compilation-data.bin index b2d0fd790d48967edec0bb6f201b6bd86ada1805..d4da2414f7306fe1bccf243918fb7ea8983335aa 100644 GIT binary patch delta 73 zcmbR9PJGTg@eT781R^&_L<{V5IZ&3C7hZ3>fNS%51uixLv&OrhZyj8>YSJyGiP4*r bRyUtiYd@*R2*gZ4%nZaV+fS;o244UG)pj7# delta 73 zcmbR9PJGTg@eT781ZpQ58$XtBEU|yKM}l3&?9k@*3S4XgHk0NvS>-HU-Qd$(DYESL a<>r%W?I+b3ftU%1nSq#P`$;v{;0pkO5+1Ao diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java index 382ce26..3ad4835 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/controller/LoginController.java @@ -73,6 +73,7 @@ public class LoginController { @RequestMapping(value = "/adm/main/actionMain.do") public String actionMain(ModelMap model) { return loginService.actionMain(model); +// return new ModelAndView(loginService.actionMain(model)); } @GetMapping("/adm/main/actionLogout.do") diff --git a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java index b203596..9743fb4 100644 --- a/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java +++ b/main_vm/src/main/java/com/icomsys/main_vm/biz/common/login/service/LoginService.java @@ -74,7 +74,8 @@ public class LoginService { @Transactional public String LoginValidService(LoginReq dto, ModelMap model) { //기본 리턴은 로그인페이지 - String result = "adm/signin/signin"; +// String result = "adm/signin/signin"; + String result = "/layout/signin"; TbBotUser userSelect = null; TbBotUser user = tbBotUserRepo.findByUserIdAndUseYn(dto.getUserId(), "Y") @@ -96,7 +97,8 @@ public class LoginService { sessionSetting(user); LoginVO userResult = user.toLoginVO(); - return "forward:/adm/main/actionMain.do"; +// return "forward:/adm/main/actionMain.do"; + return "/layout/adm/common/dashboard"; } else { log.info("Fail!"); }