From f266e2fa1931428fb7e8dafe684a264772a5e6ce Mon Sep 17 00:00:00 2001 From: Le Deng Date: Sat, 11 Mar 2017 11:13:35 -0500 Subject: [PATCH] latest --- bookstore-api/.idea/workspace.xml | 36 +++++++---- .../com/bookstore/resource/LoginResource.java | 60 +++++++++++------- .../bookstore/resource/LoginResource.class | Bin 3772 -> 3319 bytes 3 files changed, 59 insertions(+), 37 deletions(-) diff --git a/bookstore-api/.idea/workspace.xml b/bookstore-api/.idea/workspace.xml index d3c9c70..2926fe3 100644 --- a/bookstore-api/.idea/workspace.xml +++ b/bookstore-api/.idea/workspace.xml @@ -80,7 +80,7 @@ - + @@ -90,6 +90,16 @@ + + + + + + + + + + @@ -156,7 +166,6 @@ @@ -1007,12 +1017,12 @@ - + - @@ -1059,7 +1069,7 @@ - @@ -1227,14 +1237,6 @@ - - - - - - - - @@ -1545,5 +1547,13 @@ + + + + + + + + \ No newline at end of file diff --git a/bookstore-api/src/main/java/com/bookstore/resource/LoginResource.java b/bookstore-api/src/main/java/com/bookstore/resource/LoginResource.java index 23fb735..7769d7b 100644 --- a/bookstore-api/src/main/java/com/bookstore/resource/LoginResource.java +++ b/bookstore-api/src/main/java/com/bookstore/resource/LoginResource.java @@ -41,29 +41,33 @@ public class LoginResource { return new ResponseEntity("Logout success.",HttpStatus.OK); } - @RequestMapping(value="login", method = RequestMethod.POST) - public String loginPost(@RequestBody Map json) throws - ServletException { - if(json.get("username") == null || json.get("password") ==null) { - throw new ServletException("Please fill in username and password"); - } - - String username = json.get("username"); - String password = json.get("password"); - - User user= userService.findByUsername(username); - if (user==null) { - throw new ServletException("User name not found."); - } - - String pwd = user.getPassword(); - - if(!password.equals(pwd)) { - throw new ServletException("Invalid login. Please check your name and password"); - } - - return "login success"; - } +// @RequestMapping(value="login", method = RequestMethod.POST) +// public String loginPost( +// @RequestBody Map json, +// HttpServletRequest request +// ) throws +// ServletException { +// if(json.get("username") == null || json.get("password") ==null) { +// throw new ServletException("Please fill in username and password"); +// } +// +// String username = json.get("username"); +// String password = json.get("password"); +// +// User user= userService.findByUsername(username); +// if (user==null) { +// throw new ServletException("User name not found."); +// } +// +// String pwd = user.getPassword(); +// +// if(!password.equals(pwd)) { +// throw new ServletException("Invalid login. Please check your name and password"); +// } +// +// +// return "login success"; +// } @RequestMapping(value = "/user/logout", method = RequestMethod.POST) public String logout() { @@ -90,7 +94,15 @@ public class LoginResource { @RequestMapping("/token") @ResponseBody - public Map token(HttpSession session) { + public Map token(HttpSession session, HttpServletRequest request) { + System.out.println(request.getRemoteHost()); + + String remoteHost = request.getRemoteHost(); + int portNumber = request.getRemotePort(); + + System.out.println(remoteHost+":"+portNumber); + System.out.println(request.getRemoteAddr()); + return Collections.singletonMap("token", session.getId()); } } diff --git a/bookstore-api/target/classes/com/bookstore/resource/LoginResource.class b/bookstore-api/target/classes/com/bookstore/resource/LoginResource.class index 86ab1dbce14089dd23e4346239561e5c1f8ba07a..8b93f9834d2a042faece82c86e57c24de6686662 100644 GIT binary patch literal 3319 zcmcInX;%|h7=A8B~1`jZoLN$e&K-PDqQ;^PrS&{-r^Ci2c7j1ja^=wD#JW~hy&HAN5fqm1y<(V}( zW4dOsDu*r0_6*OoEmz=N-gYXwJMWlQ<-TLo=pd(PqM%HEI6D zx&R#M+P=dG@^;0vrlXZIR<$d(?+IM&&Oa~~483Yt6}{jozXyAo1~Kb-^Ey?`Gf;Vj z8Ss{{g zXzJ_>Yz1m)X;*hoGv75`K|){6Pm&gA?Xtkxt=hRB2+~kua-wiUKyzfpbm_iA6LZwP z?ybsp%`mM1YkYx5AjZ$AP5c0)&z_Uqza2vAQBXcr>FEJ-MhTxtbTG(!({pEm0ud;fg#enqXI6D0gbtj>Oamz@w?0+Ck;R27lC7qW!ju>1$NdAO%xx<60vo3)64{g!iM6L&s!$02^?=)z4f9B z?h+8^<5V8n8GI>G)ov~|^T(AX-yzTICDjc}d|vs;(+knAdTy>qZIv_fTd67yC)yM^ z+?X0N*7{aTesPTjmQpM|g(Wg1`*Lg0oH|3~o3=j5#^kX*Nu$O{kE?wCCx4KkDvC_% z1>F(6L!&zKgzDB_mCV%{&){k^WOC|yCdmjvhb9{&*|em^*3j2XY(vpT;G+8nyT>-R zp89dxvqRf)!^7n=b9`viz#~p>W5i>0sWXT)V9pU$kt~Pc_lf4R&5~kmi-gL?5chl) zGJ$BoKhe&59>!t*8au#WZ3L*QKhB4^N^*XUbBZ&opW_j(bk2fvTki_Q@BC=NQI6^| zup7rXYT*SO#|f^;8t6uAAUuo&?*rSOqvcMn^$8LyX#0&DaV0&0lHK9ONC`!#riaRu zXWKdV^6%tb2p6Z&$30ECby{t@ys3=p)Sx`>=Sn%3e2Qc)Rkx;okOCjjwS3I&WMom< z*-N=z-U{u!fj4PS;w`+*{eGN@g1W>TN>jG?52Q~%LwgJAM#8*I#X`!ig_Okr&QjGz zQ|Dr)RB$O3!8`mQE3C!U$CZk!HJ4d$?^Z0J)>uG|i5sN&g(m8<>($+RDRmdAZU~p6 ztgLWuqjytJpq+Y#Z34^K9)65-+95EI;L&sJyt9H=`j(N)b#UlREMwO)I(a!1+#Lw! z_As$~1)gGG-MRfl9Z)3R%IJV3gey$aEUxfB0)@l=(1EplPvKn*2PvDvWsLCAI_U6w mgjFkL2Pk)y_4RTxn literal 3772 zcmb7H`BM{D9RF-cNJtj6sZy!ct~ZFX){0tC6!8EBp+xa&ZI{gw7Q$}a-Ei3ZzOP^V zSG1juM?2H@r*@`)Q^)D&Z8pg!L1qH8!A!&x+SL&Ba>-Cj_qZF}DJY{yV}Coa_MRib_g z9g{`NGZ&00(>15_#-L@{p5~dhmJnOi@wTwXeum`w7oW_D}{1gduw%_T5Zn*>w{wknb**v7j8e;@ zXu8L=W;&~-Rn}(>eLiEjF8c(-qt<@MJbT{Y`AelZEc=}&Z+NO-bi=H?fVG^Mq2!CZ zWvPmv3u`b-xUo?M>&yg(TMc~JNI{mGNf54N#_v@Z&7jMLI#!RUxQ+D{*Bi1e&$07) z!|9i?8+#-iXw;k=^fgiAet%TlqOKF(o;co;@iyKOg5HheJsI!g0|`5YT~)v{oEMB* zrOG7ioyZ%SYbY~jKChUTQf?HAW@VLfs}Mpzl(4zJ<;d8H7vuOy#>e=C=`0dd5p71{ z#8GDKqLrm#_ho#FOENyg=Ms*NSZttXR`H9lM+wyX*`}-z-x7aVJG0RzF8dnC7c#yS zaBV7;Nco~i##gv3p)JToWl;CbMRu02WqgB6aeOP|JA6;4Yo}=AAynh<`1G8ivs^lA zIYX_IJ^HD^^Xr2nxX1|@8NVW7U&Dq`ttFq94Wch-d;ah%+0ef(RxzMkYo-7@dCs5* z`x}T1ccDOwgsox1^5CV|U9}J}PwMqq|x^xTTbhtkwh8wp#pSEXp}L}gSpa|~;F z!dGKeU~AWH31=FC?;3j1;WI$h#bZflxf#oznh8!t`SE+$&Synmm33Bv6CAQXy4oTK zPhA03Lsaf*G1@u8A+oiK_K>J)rk?-cl3l(VSaY_;VaHJs2BI9%YF(8*s-3F+*u}Tx z4n9JeKceQiD*S5Zx{GUqEBgn3_wq~SDshb+dqe#)LE==(oVvbo}afqcj4*CBHC5{U@;gp6)_cb=yw z_!Xs;cD%x~82SVzq^IBH?C0(j_w9(bw>-hoI8OWj2L3|_H#oz)C}~=7mb(aTP`GaM z^+f`l&tZso8`O5eM?5YNzeq9>;Y(x^=^;!MN}C^HOL}WHwBnB$kh%%Op&V%r+*5d0 zt86%=j1M$i4l?KrJckx3!HMk{_D z4*Y6LKUc3W6LP32fmZ`m&IYK+=?-G@yo5*CUN84< n2o|{li;PL8pA>}snjiKwrB%!8I;IFp1ULNOn?8jA`WEm%P1n*n