From 8150c92a709c6d9e2145c0ca5818a3847a77dd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 17 Dec 2024 12:57:45 +0800 Subject: [PATCH] 'commit' --- .../sso/Controller/WebLoginController.java | 13 +++++++------ .../sso/Controller/WebLoginController.class | Bin 7105 -> 7127 bytes .../com/dsideal/sso/Util/SsoLoginHelper.class | Bin 2903 -> 2903 bytes .../com/dsideal/sso/Util/SsoLoginStore.class | Bin 2864 -> 2790 bytes 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/dsideal/sso/Controller/WebLoginController.java b/src/main/java/com/dsideal/sso/Controller/WebLoginController.java index 3b80461..8e5f54e 100644 --- a/src/main/java/com/dsideal/sso/Controller/WebLoginController.java +++ b/src/main/java/com/dsideal/sso/Controller/WebLoginController.java @@ -36,17 +36,18 @@ public class WebLoginController extends Controller { /** * 接入统一认证的系统，跳转到统一认证的地址 */ - public void login(String redirect_url) { + public void login() { Map loginMap = SsoLoginHelper.loginCheck(getRequest()); + String redirectUrl = getRequest().getParameter("redirect_url"); if (loginMap != null) { - if (!redirect_url.contains("?")) { - redirect301(redirect_url + "?" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString()); + if (!redirectUrl.contains("?")) { + redirect301(redirectUrl + "?" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString()); } else { - redirect301(redirect_url + "&" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString()); + redirect301(redirectUrl + "&" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString()); } } else { - redirect_url = CommonUtil.handleRedirectUrlParas(redirect_url); - redirect("/html/login.html?redirect_url=" + redirect_url); + redirectUrl = CommonUtil.handleRedirectUrlParas(redirectUrl); + redirect("/html/login.html?redirect_url=" + redirectUrl); } } diff --git a/target/classes/com/dsideal/sso/Controller/WebLoginController.class b/target/classes/com/dsideal/sso/Controller/WebLoginController.class index 36aa3be85b3b6e49e2e1b642b7a1dc8b02b4c574..d3f349a7c5590984e28c09b2655d6d314999847e 100644 GIT binary patch delta 2847 zcmZ`*eNa@_75|<6dT$?(uLlB4TtL1Ac7Z4;@*#?XAIWZ{nn;jXU6(B`Ad9<;ni#V+ zCdQy`6R#oBm}qO1#H1mHbX|-|Khl~`KmO>LOsAbpJN?5%JJULyw$o{?vF9y|sIkNB zyZ4=Y-aY63&hK|FKd$?2o$`w>&wU7>g;t(Xf@D{NzHWce=M8Td3ic;qChQXOROF+8 zP$F8WB$c4{_`>a;pl6FO>C~pW4>@18j}{FUP6P4 zMl^|ohI&i0ibYr~eq-n}Em5&lEH-AQH!E0%uZgS1;*xe4^^_k}@erB_N#TGiu-zA2>IwOD1Ughaj85S-)#h{&B(G;M z?A`21!g_pN!Uh!^;Spn|t{g8fhK9UeKBEF3z9FGU#b)?Lp}AgbN1uv*Y#|s2hr)yf zWrB=$(Pzk2Wdzu|CDbEht9ZwpZwaXgV@P~zo}IKEJ0v`+;xPtNved}McwEIUJRz1? zifrE`Xje`jxIDJ|i{rbm96Ee?Z0zd!-7=mOPgv~qlsIa!r|iWu685QhR!3tdqcKB# zX31K;pODe(+2*P4_YCw@x9#xy2E$w!8Q&tLUK-oW8(up99a6dU zu5Qm@yC)Rd9td(Bm*JoafkUEIYIKbd z4Hc*Hrr0HK9G9(EsBk?#QSm8KIC#*vC9uuc5@vR88VdUq{0jA4xABZ5E77p9tMznf zyhA-r<#Ku!|0(rh%3eS)(;`|(GBxPa()hGVw5OM(G%LKaSfUo@BP|ho(l46YbZL#HmsliP zPRQeFo;abs6?qL75LsEBe}x%F9{VbyNR1)GrH`6z0{0l;c3i+Rr#35!q9Z7%aBAf- zI2_u&6PRm26m{pY5InYwqWW%&t%*g=8AF@9!g&t&=@#o5L;w>h9JLgB4rP#0&UjZK z2M)|)0XL%xU6{iHn2TQ2QWAR=Oy)@{CG(pMFJ(|Bh`;Ng8I%PBWwTvn%j8-PpU}pZ zWEiibSwfA3;+ZLI%q7v5nHh04nBGTw=UJ?7Fjq#groo~geFAHl`|Bp~hyfp?z-HDq z8Dr>k*=xZUmB4RVB|KHp%q$rrH5X1xHrO}1IJ7ZSDQq|2S! zi~lG4!?)}f!^=^8w?VO)Y>Leq!}s*qrfJAd*_2znxjLWVclZp$kpurM>ymL4(j8u8}SEt@Mmm7<3HfVf6$F<=pn*plHex?dZ`Y5)PjCm z&MkEXH_&zrQYW^O4?zkbL_-LR=dy}sWbs)*+c2VYFFxy{Eb;R!dnAhwvz}~J%qtS_ zJwzoulQ}{l&RHw(S&C7%DN~$Htg#;AoaOOLv`HA3(9X2|FUocD78UXRGn{uF)%?bU zo=LNHej6!|hY|jDaT=)*-Pvi5GS2SwO_i_b3^_;Gb;|P36~pWLG%j>;EITLi7?K#; zY&_1_(yqAP;-`W=p|@<_E0;6oTbRmk?t79osdtb1gpyp^Tihbt&I_AJ2} z7_Osi5+H@Ms+h`(T4CZjuuDIw_jc@VBE#{(V49_~??LW^ zhqzaaFa|Gj4|<8a(aTK2qiDh_Ou$!}cE^}v$C)}OFo;tK@x>9wN$kKVqxO0nvlWo| znED&wwc9P%E43T9Su%(!`FDrS$Ts60HZ$9#TWuB0f_TLzoBt9-()d{K za>d6P`S-XEKVbGnx#BUd_yqquc8>9SpT&C~Tk!#N<3p~^5Ah~`#Lu7Lr}!w2dc`C> z38peoac$}Mzy~yo3b_)=h{cs>oYLE*Wjp0C#(EJ_rpZ)ujU}xM%S>EZT~I(Sb1scJ wmfi*OQW@1G<{|blQZ0KJXdcbyF_YgH@@ifDSs#Bk(o$a0Ioe9gxTo0u2T+S-hX4Qo delta 2772 zcmZ`)eNa@_75|<6db@8QUk_#3zygAN?k*@FB8!5^ml#kJqlBbtR#*`g7IqhniFT_A zHce6uxrrv^LnTo(?KCB{xEM_*O`|iN+L?}aI+Rbv_{kOmIcJNv$OBs zckX%jp7T4u-?_i5{J2v7<=u-P0jQ%j<8pu!s8&Wg91=1VWFkw*x|)n^LR>KDFAn;G z!5)8KPnV3v$d!<%ARh%{hb~iGBWGF>L5{g>>*=z>1-FD^&8I|+>Z+|vQ7WNKK{+bK zA9PiwN(IYNCGz#V3#%2ZKs>=3@OAYBe4U}PB}-KhDrMASm4rG4t5HD66#a=Q;y3!d z#0Kr-0vR%z6f|RvkPItnt!OkXcD6vT<J9V&RwkiXTx&ljlo27Oj+z(W!qRfGtI;!$)+cuc|L_!c2UoHk^L+XheSR`v-Fc6KrfGM<1} z!gd9n=n`$lDsu~VDCovcanx8Z?;_}XgWYEA5uY0~O??Xd=zrOiZw(+QA*5iCku5cq znbWaP!IRi8dQCa>v=}zo=%6@na!^=YH94$@a9F}K3Z7+@Z<&heh{%vqtDYky+zf`?=m|*UY zEtw(MzaiMu<@2_d2P#6#_E!#?@v8W>^ zxx+R}u*3@9!pAJYy9&)?MDc z-jY4uzV4EZ?B3Tc?#5+_x_EC=Vw*3t)893FN^s&-d<{)}m9Uv?l>{Tz(n>N@l{U?b zPOHV%q}=$GGSyJ6M5~xyR40a$t{WOOo?K4K)l1YQUQ(}xPa+;Vvao1AhY@-nw-rqy zA%f&K*A+B5Rr@5;MvztHR2M~%<5CN!;M8FfOD#+onU@5kujI8XKH60fz6vuBIAO!L~{G+Iili?$%~ScH<;^$M5%Nn6!N) zyD5T!5yaVfHi^BAXKb7B+&)j;vkzl7@cOLNoX>%Kd|dy>=iBprzSA~_Y>)ZB!v1d5 zEj%4J@AW;8nNNMuW3ijBpw@1=0*Bpfx2P}0>diqHy408FML!qVEB724!SPAF>5=UQ zyKJ{a@RoMAVGgp>c6ru2+&j)?yMfQ}1%_h0_<)-&Py-WdJprqj7WGV$25z;DY;EFM zGtXME1#7t#J&32#%HOte!&rwG@el+aW>s&*c_z{O*n}UW9T&I{eu55M!(+J4z3>K; z>oatr`3q*#m)rpV2rvGI?f5r0!Q0qDgl>|slbq$Gd2hFd?BuLi*Pz2Xje<#VKG#4(#a+!(<-8f(?DDV*1Vg&NbSE~-%#2Hs^qOXMlo80mBz zh)Oa=OAwBjByF7Dv?PfNcuvuVa)za)HI%BDs9Mz@atG1cirqOwh_$|Ur}`t8#)mP) zvw22ZS{%#`mgj7*01mU{pW#%Vg~}Co;0W{LIh5gfzCK?N1F1PB415$W1-d&Zn8r%x zcnW8tq6W^$#QPrPtQ*BAsV-VC{*szuVS!)Q!KH2zHhXb+D0XfWlGt~cTcbc6US$l9 zV-Zepvl?MOzQGs$o6Ni3(IdBg>e@#u#fw;LCG{XRg~gK6A~CibH7& v>+-3TYo#eJ$h6Q?8GoRoa;o5Q0l%-{)n(D=^61k;t9eDEYdtk`x3T{RyuviY diff --git a/target/classes/com/dsideal/sso/Util/SsoLoginHelper.class b/target/classes/com/dsideal/sso/Util/SsoLoginHelper.class index d494d68a1248108ed73bc0e4ab7792af565a0fe5..eae5b44337ac0f98902e186ea10730527298e5da 100644 GIT binary patch delta 39 vcmcaEc3o`4S}s8Y237_`22KVe23`ge25|<{$@{o+S#23u80;n+aH|6Vu-*s4 delta 39 vcmcaEc3o`4S}s9D237`R22KVO23`g;25|=S$@{o+S?w8E7#t=WaH|6VvB3w= diff --git a/target/classes/com/dsideal/sso/Util/SsoLoginStore.class b/target/classes/com/dsideal/sso/Util/SsoLoginStore.class index 6c8721532cd70142fca8e6b2a0cc1b7512781eba..e8f9a024e98ff68c70b92eb3d457bacfff6c12c9 100644 GIT binary patch delta 453 zcmYjN*-AoD6kSK}^?Hw{h7)Sn5Y&ev3Zwy~Xfz4S+hp^gW|o=*4Ij`iobQkdAA%l& zpr<~f$Nr*d--PPn?7dlMt+m%V_r4D=fBSlR1~7xx0}n~!Mrwy*m9vLUM!=I62~dZ3eM~}N2MbvZYEtY#KfJVIWD7_ zMx%P&RM21u8;~ekrz2L((PldsRT=YGpspf;6wH(dxD~I~fruHiGzVd!%86$~4{3U- zhTwn(mvE|sF&o$?GzH@d`j8>2%&KEv$zkV+?F-~+_S z#7JUfBJl^rzPC-t$=Q2l?S0l-IUj*qkU#xAJOUWU)g6z>;zgd)Glg=gcs(*Ey5w5@ zQ!X;LCo<}QZ=XX)!NfW?yf|PO>PrdB6%ucX-}0z9EW$t>OQP2p&IL#{2p`%pNwW^PsQPJlhPsWGF-PhOxw(mxFi))Q z*O+Aq+46?u$S)IYSger6D%QlkF=&M8d4vK+#g`FdX<_ow?zm&u5b`wb{&IS`{duCw vd$PfQxilvOc|dFCve72CD3=S{#7o%0E_GYDL|hJe6j33D6H~=GE)n_#3YtC}