From d295c915795b67f92792ea7fcb2e74ceaba1a9ea 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 11:57:16 +0800 Subject: [PATCH] 'commit' --- .../sso/Controller/WebLoginController.java | 4 ++-- .../com/dsideal/sso/Util/SsoLoginHelper.java | 4 ++-- .../com/dsideal/sso/Util/SsoLoginStore.java | 9 ++++----- .../sso/Controller/WebLoginController.class | Bin 7127 -> 7105 bytes .../com/dsideal/sso/Util/SsoLoginHelper.class | Bin 2903 -> 2903 bytes .../com/dsideal/sso/Util/SsoLoginStore.class | Bin 2948 -> 2864 bytes 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/dsideal/sso/Controller/WebLoginController.java b/src/main/java/com/dsideal/sso/Controller/WebLoginController.java index 6411c72..3b80461 100644 --- a/src/main/java/com/dsideal/sso/Controller/WebLoginController.java +++ b/src/main/java/com/dsideal/sso/Controller/WebLoginController.java @@ -37,7 +37,7 @@ public class WebLoginController extends Controller { * 接入统一认证的系统，跳转到统一认证的地址 */ public void login(String redirect_url) { - Map loginMap = SsoLoginHelper.loginCheck(getRequest()); + Map loginMap = SsoLoginHelper.loginCheck(getRequest()); if (loginMap != null) { if (!redirect_url.contains("?")) { redirect301(redirect_url + "?" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString()); @@ -175,7 +175,7 @@ public class WebLoginController extends Controller { @EmptyInterface({"sessionId"}) public void loginCheck(String sessionId) { JSONObject resultJson = new JSONObject(); - Map loginMap = SsoLoginHelper.loginCheck(sessionId); + Map loginMap = SsoLoginHelper.loginCheck(sessionId); if (loginMap == null) { resultJson.put("success", false); resultJson.put("msg", "sessionId 已失效！"); diff --git a/src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java b/src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java index 4409e8b..006ba93 100644 --- a/src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java +++ b/src/main/java/com/dsideal/sso/Util/SsoLoginHelper.java @@ -9,7 +9,7 @@ import com.jfinal.kit.PropKit; public class SsoLoginHelper { - public static Map loginCheck(HttpServletRequest request) { + public static Map loginCheck(HttpServletRequest request) { String cookieSessionId = getSessionIdByCookie(request); if (cookieSessionId != null && !cookieSessionId.trim().isEmpty()) { return loginCheck(cookieSessionId); @@ -17,7 +17,7 @@ public class SsoLoginHelper { return null; } - public static Map loginCheck(String sessionId) { + public static Map loginCheck(String sessionId) { if (sessionId != null && !sessionId.trim().isEmpty()) { return SsoLoginStore.get(sessionId); } diff --git a/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java b/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java index 59e2ea1..52a37bf 100644 --- a/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java +++ b/src/main/java/com/dsideal/sso/Util/SsoLoginStore.java @@ -7,13 +7,12 @@ import java.util.List; import java.util.Map; public class SsoLoginStore { - public static Map get(String sessionId) { + public static Map get(String sessionId) { String redisKey = redisKey(sessionId); - var x = Redis.use().hmget(redisKey); + Map x = Redis.use().hgetAll(redisKey); if (x != null) { - var q = (Map) x; - q.put("session_id", sessionId); - return q; + x.put("session_id", sessionId); + return x; } return null; } diff --git a/target/classes/com/dsideal/sso/Controller/WebLoginController.class b/target/classes/com/dsideal/sso/Controller/WebLoginController.class index 91cc2e55253e9be2e78b4ad8a30c01b77fed6176..36aa3be85b3b6e49e2e1b642b7a1dc8b02b4c574 100644 GIT binary patch delta 2780 zcmZ`)eNa@_75|<6db@8QUk_#3zygAN?k*@FB8!5^ml#kJqlBbtR#*`g7IqhniFT_A zCQVWexs5jDLnTo(?KCB{xEM_*O`|hy?Mz2IolG+M&uOQfj?MIITBGTC%K~EC+1YpR zJNLYM&-tC-@7&*2epD&{;_k%{0o2i&aXCNkdFefLzgM8ku$A`Aje#`^>kU`f?Gnd=2Id@b=B6TD3wsApd1zA z54tK-rGn+C68ZYwh1CjHAf8|i__}%mzRpnDlBFsLl`?9vNY?YdD>=z)amUHb?)?9@hCbZJf`4re1ni7P8%}BZG$IuEBgcoJ3AQ#8Bf3~ zVY`A(bcr@&mAM5w6m(;!IBKkycM^ zxx+R}u*3@9!pAJYI||O=tT<xKr6FPD>Y^%6CSm(^?GlZc0oEG(YS zV1%B>ZAFtvh#sSc_f2GOQl^#!aem4@%@j&zdr9rPHt>^Rg;4^41 zXWi&Ae1MjY3wY3DbWftyW743Q!g_+bX$tK+Tt$}MsBY0mux%2)cAodByR})7-8hNf z@%#N5CT$gq;INzR7WL&=y*cPYm-@=Q=;s3a?mdS_ zaC{PPcx1c5F54{;ys4dSn1k%JU7qz0_l|SfZs1dVj-ePY-sh$Z)WF1=PrxdsMLm+%(E73!CG!f58`RG^0#f=IM(4MJOqJg5qpS&O(io%p?pmJ9W|7W=a-cq&ULKoXi%o(_&tcc<({V<(ZjJ z@JAVJ;XU&($~Jk1%dxdQSfX6!@h%!AOh{;vkp2}4`I(-R(=1^q;|@yrO(S}g=W%+< zU<8NxznQ~GU<6s^M2Y-QdK}bA`5fsPam;29H%9Qb##(i33g>lTp~f_-i)vJbfp^)@ z5_t+XMmik_qLNI}5`-frNgJm(ElHvRo>R1;oMCBc4W%k3s#f&}+(ERqVt39EVy&;; zss7NV@nH<{Y@U&p76)^KE-p>o9?IKsSm9%XoeuhAF9Kx$4210RJ; zf$k0prm>Pap2C@^sDU#w@xBK+>qhZ$s*Bc(zoceZSm4)naH*Sw&0ZWHik;hpB=#NV z)+i8%R~dujScDVYtVWoRuk(ff26OREX5U-Pw3AGrQS|fu5yaaF;T^sf&*A{aqL{6L z#NVu-A|{oNzbq#gxf!8GIH{OQIIcG2&=Oh-W0*fSP&zrHFdvM;Y{Zk4Nm-nZ*4;SO zulXFE1es|8=F5l&X^2+ulNkPOtnWXsb6>>+t~s1t+`(>5!#~1i!?aAp z?Jo5+SHQ>Pmu~g1Gd+LW@^`oT&-s>rxz*eAEqC1N*YhmNL~j1yXVbGyf1l0hP7afF zud#>;5+%d*#jzTRoc}nJ;e9U31efT?Ow6A!87?pxBB;g`LwS*v{Q(AWi79iLOZFk( z+dt*sNBB8@7A;88G(5BS$|q3;YWK>j%e08H8T>dzq5{>=$TDWJF~(XE`0||Lnd>%= z&s;O3;!xVcx_m0-T4{<4GA;B}#vkaYoGN%+!0#(~by@VeJo@y|YF^RkT2GDKZS4O6 D8r3&f delta 2858 zcmZ`*dvH|c75|-m-Mcq8ubYtUMm7m~kz_ZCkU+?TKp^3v8%aTlAyQa2+mPpm-3_3K zTSO59ZIutBAPOx)6s-|smkpwQ*kY%TKRW1i+HuB9ftDyJK%s;p6?0K64p2jODIqZ! z^p^*H!C<$4pu1Cn3uO|@Ra78Xd_g%58S@BA++kC9X96lwC1HW?u~4`TbqR}5BcWDB z9qPp)Lye_D#S$zPzcKWhmZ?}SmKxJj8x*X-N(rk}tkzS`5o?qTvCCMLa=-4Kt3W}E ziU+VpoHZ_{uZe5Mg2Gl9^^_k}@et|>2_e7Rzrz<;?g{#I1lm+QjCSEQRoOZSlGigB z@^1AcU?aXRVUvo@@Q5)}ht122!6C1gtMZ%F7;u@&7S&s?LmqE|&9`U%Ftp%7tF zu^^*E^cu2M8Gg3*2fJi!6YrRFEI}0^42e(8a}#!8r-VmUJjOsumP)w*kE_^?C&V&K zzWtj7?dq9>SH|{yabnNa!$+=+ja|F2N5+%l35$cC62~l#qS)YnG-ip< zEE#JL5Yl=)+dUP1o`J54=AB;OV2BGN<6DH}%VYa^!^;<*yc~`4hB~C*QSqFL1^Kl)k89l5^PuA zJN^0obD!@YnT&KRbp^-piiB5H9LEXqOKCykG1MqX$4M2h;gm>}+cQTA);LR6bNF<; zq2dhQ6uafkiM^?p zOwGE=#!?F{60Ia;^E6wW)ZPle1`CL+EY!ck3?q-dr4b}Yk>=J%%|3y93}|s)#0r-- zCxZN=$SrkgB~dt?+PxE)Z$Jdq=dl<(Hjbj=Zi`LvMa>mOb4#h~Jnqvi*0Tr$CQ>+R z5%e62A)|z$FNF#_bVktA#`6JfP@k3B%@G97-s#Vf==(@^OBCCWBGJyX2zD`cU)d%c z2~Y3iWcMR?aoTfREXMGzK6_{SJl!&iyjuAy@ea;(`*y7y=BUrtTJ7>hEU{ZJ!eN)~ zR_%p&Z8_-@m-gcS$^OV~yG8MG1mCSy>?XTnw?^?jJ+^5YveS0uHgB%ZC-@yc!*DoG zfp@vw;9hFMQY51hv(UtZXhs#cf(ESQw^jUhAGgQ*;fEW$(1NGA;~u~o9K>4g73)~u z58@5(wqsb2ceuNrLpwgg2K<^ybP11e$W0v7$6+_)5Afj6*n+x$z>EK&6W7s2gsmi@ zo1EyOYV=Yg`e-G0*Hzq0TQNxO*hW4C$d4cmAtav5$e)$LX8~=;h|ay(tb;Pd&odn1 z3_i?8vQq)CNWAwD74l5x2>uvnt-NOuM%kuJaW=ljdWdnB$1l+=VO&Bh)Aqk8(aD>i z&sWiK_6=0<8xwjq&DHsBq--8W_}9T{Btvv&rZ|f^yEC^`zL7KJ9O2L@%RhG%uj|v8 z(8cjgTlg^~FtnL?oNuVzF}=l31xH+OnY>pPXUrEemE79*6l+rN9yM_#xwW^rMYOms z!tR`Afm3_irE_2uNo<{xQ>jze5PxjsR!|7!v2KCA{Co;YTw)FT;J`CXhG+TiK7d6y zC^~HU6}r-OU8^wMK=C9%3TIV1l@&F?#B*S`ep2y$n~Ty|?B(I% zSYR;CQrY(q_rb&5D@GWD7r6($#NFs+CgCyE;}s_0t4zD&OtBM8os$^EX$1KW3E>oW zVw6#PJ%-sTNc>GbImyL%*K_A8qjE;58BVI8dpWNbM7`(j?Ljy-E)&pKMpD>_G;Xa)Ba G`~Lv!{b%d| diff --git a/target/classes/com/dsideal/sso/Util/SsoLoginHelper.class b/target/classes/com/dsideal/sso/Util/SsoLoginHelper.class index 15d61c6f7947d574e878f6c6c112222fa50459f0..d494d68a1248108ed73bc0e4ab7792af565a0fe5 100644 GIT binary patch delta 28 ecmcaEc3o_P1ncB`Y(kT@SlysB_vT*KQ>*}$vk9XB delta 34 hcmcaEc3o_P1S^|=QdVkm$z(a!AOurwrm+^yw5Ua!K0_ZQr*kh*Ht*c`p8K5VJkL4jzD>3h_K%a#Uw{HHj_izbtlgbT zt5B~i#`J-ao_g7;*7K$E{!Eax!fsZY&FWrby}Io%%!tMLFj+*yjKlF zC(Q9^wD?~_&zaNuwLhj0&6NIXF1T@L%>O}|>xv0+%$}RytW~yJGtmHLn;@HER=GFG zwmu15jXbg0Vb`J>rpD7w!HO%hp%~Xct)zZuMSK?f`XIQWLi$%Q`{odz9LP={V-=4X zxcHHHDfgXdE|!}7M8?NzuC3ZaF}WspntjMIYWdDQAQ-XE}7A;95=WrUw+{` z63O_)nB^7*bApF^NPd>0KqXI7{dV^?ZOPtlyR}M0U|t@B1wyjMJNjGb%Gz0xO%Nw} z%5bP>2tzE2jS^1Ov;Jq;%`HjJl@A%7{Ni7WWwE%+ie9lVT~14RMtUChEE3WHGG~9L zP;aJwm-@(_x{&p#?qG;>m)a-5pzZ!7?Kl%liBoM`o|05x_1bo$`#caw9}fjLc*J9Q VyTTR0*4SW+x*)b7&)DNRsXs@>VuJtx delta 788 zcmYjOT~ks~6kX?X@xb9*E;vA-Q^+_ZQ8~qfFMXE^YFS#D8X_Wye0agvdhj2d>7n1y zLp02kHIq{>J@jAdAJnw(1(Jt*_MLUsUTf`rI>F;H@$>JOQvf${^g%>e)Vg<2Dz+Fh zQ`t)XD4(w8Yo+wkcBNQo&92KUEOs?p)?2e2VFs7UXt&DMbS~ep;T(g|i@IK}*S5+# z4ulYMVjL6Q*Q}-}tSNn}CVyKdz22U-*=fkh^J+%EVIg^_j%pka8Qf>mCgE6JHVEBc z>RYB37!vX_3rB~;c}7qauwmDUb-eImPktY{=B^0rqsnpML=E+>%Kc0|WSEridDN}P zv-SFZyTL&N#|%goY&TwU+@^&%!RWN&4(?L5V+QwNp)~>TsH#+_k|*HV6Syu~zC!s3 ze{T8*wCQgMEv7~z$r|m(>}AQk!k>b1WoG+(@*RB0UA~*10#;dbUyRz-L27`A#Ybq`PKgxPs!pLo=Zif zE`_Mwm@#5n1StS$+QCTn{z!wAazk8?$A%uj)29vyfL9m~EI*0FN?<59HVl+YkV5YmK>HbVaZidcAT