From ca94463861c6bc9fd074658552a5dc702552139d Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Fri, 22 Mar 2024 22:00:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=AA=8C=E8=AF=81=E7=A0=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/atguigu/exception/EnumException.java  |   3 +++
 .../com/atguigu/exception/EnumException.class | Bin 1127 -> 1331 bytes
 .../service/impl/SysUserServiceImpl.java      |  15 ++++++++++++++-
 .../manger/service/ValidateCodeService.class  | Bin 0 -> 236 bytes
 .../service/impl/SysUserServiceImpl.class     | Bin 3221 -> 4009 bytes
 .../impl/ValidateCodeServiceImpl.class        | Bin 0 -> 2578 bytes
 .../spzx/model/dto/system/LoginDto.java       |  16 ++++++++++------
 ...ValidateCodeVo$ValidateCodeVoBuilder.class | Bin 0 -> 1655 bytes
 8 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 spzx-manager/target/classes/com/atguigu/spzx/manger/service/ValidateCodeService.class
 create mode 100644 spzx-manager/target/classes/com/atguigu/spzx/manger/service/impl/ValidateCodeServiceImpl.class
 create mode 100644 spzx-model/target/classes/com/atguigu/spzx/model/vo/system/ValidateCodeVo$ValidateCodeVoBuilder.class

diff --git a/spzx-common/common-service/src/main/java/com/atguigu/exception/EnumException.java b/spzx-common/common-service/src/main/java/com/atguigu/exception/EnumException.java
index f101c43..cb09563 100644
--- a/spzx-common/common-service/src/main/java/com/atguigu/exception/EnumException.java
+++ b/spzx-common/common-service/src/main/java/com/atguigu/exception/EnumException.java
@@ -9,4 +9,7 @@ public class EnumException {
     public static final String USERNAME_IS_EMPTY = "用户名不能为空";
     public static final String PASSWORD_ERROR = "密码错误";
     public static final String PASSWORD_IS_EMPTY = "密码不能为空";
+    public static final String CAPTCHA_IS_EMPTY = "提交验证码不能为空";
+    public static final String KEY_IS_EMPTY = "验证码key不能为空";
+    public static final String VERIFICATION_CODE_DOES_NOT_MATCH = "验证码不匹配";
 }
diff --git a/spzx-common/common-service/target/classes/com/atguigu/exception/EnumException.class b/spzx-common/common-service/target/classes/com/atguigu/exception/EnumException.class
index 25dca6c4a35446da07b62b88b66c3ebd79b2817f..c69e99a98d5bd1f80e212cb77523770b0d869fab 100644
GIT binary patch
delta 594
zcmZ{gO-lk%6o%h>XQmOeFhNPA(mu4Ztn5pv7K2VC;Rh*!t68~<en2Y`X{QwU2U@f#
zf(kb#6tr#ApRm;b5YZVO#H2Qdd(M5{_r3QtO;xk`?YsU0U=QI(bB^V$5haz094J~W
zt*P-;CTqeJgX{C+vQfWo-<DeUh2~YEQ7gBK&y8BWc~fVw9IDwqewtytN1o))e#7o#
z^(eL<izt~`GNDD1QB{j3)wGsKX0*8CqHGi97;HTUl7Ez*+UMo!DYG*sSBhNOabf~i
zFpSaDIVRzRyRY|9KhxLGLLyee5LIvGojZI!(&?RE=c!scX9){fq>jN)6Hcr}2<8V_
zHw0ol2CJWzuuK{|X#%9@SfP6}1ljb3Q5iB;sh1dGR)`qxTGJ>@BCcQgUm@SofnzYs
z0iM^1UYJA?dYEAu==^dGK^l1p3>lW9xGVnaNStUGa>`uC2B{b}v1PdE0s3wP+sFg0
R;*WQA_a*f9wM{ff=m%v4VSNAq

delta 389
zcmZvYJ8l9&5Jaoz!=l9?WMneTE?=`|4I*-2Ba!(8j-B`%9D-{&01+S&Z~#ug4Y&kC
z)UYFhHA(e!ch!@6*5R=j?$6sDfKQB9;jgSqswQF<O+EXv5Lgtb4H`zQ!fKNZWW|TV
zGu5q~HmMJp0TE($f)*zVjm1GvzVqG)nx5Eu-K&ibGf&KP*(vn6521tN36%f=`s}UH
zR)s;yqkl|&o=4XiruBxl1Uj?_bO{i=U_f<;y|cQ2F(2lS_5WQN(0HJtBf%?Ef+12&
YGfa9N0Q#}Kyi3V`M|+Ck?dlp`0B5EdM*si-

diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.java
index 65cc597..ec6fcda 100644
--- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.java
+++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.java
@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -35,9 +36,21 @@ public class SysUserServiceImpl implements SysUserService {
     public LoginVo login(LoginDto loginDto) {
         String password = loginDto.getPassword();
         String userName = loginDto.getUserName();
+        String captcha = loginDto.getCaptcha();
+        String key = loginDto.getCodeKey();
         stringEmptyUtil.isEmpty(userName, EnumException.USERNAME_IS_EMPTY);
         stringEmptyUtil.isEmpty(password, EnumException.PASSWORD_IS_EMPTY);
-
+        stringEmptyUtil.isEmpty(captcha, EnumException.CAPTCHA_IS_EMPTY);
+        stringEmptyUtil.isEmpty(key, EnumException.KEY_IS_EMPTY);
+        // 得到Redis中验证码
+        String code = (String) redisTemplate.opsForValue().get(key);
+        // 验证码不匹配
+        assert code != null;
+        if ((!Objects.equals(code.toLowerCase(), captcha.toLowerCase()))) {
+            throw new BunnyException(EnumException.VERIFICATION_CODE_DOES_NOT_MATCH);
+        }
+        // 比较完成后删除验证码
+        redisTemplate.delete(key);
         // 根据username查询用户信息
         SysUser sysUser = sysUserMapper.selectByUsername(userName);
         if (sysUser == null) {
diff --git a/spzx-manager/target/classes/com/atguigu/spzx/manger/service/ValidateCodeService.class b/spzx-manager/target/classes/com/atguigu/spzx/manger/service/ValidateCodeService.class
new file mode 100644
index 0000000000000000000000000000000000000000..ad846fba404fcce4de48dbadbfc680874cfefc76
GIT binary patch
literal 236
zcmZXPy$ZrW5QJy_Nz}^1!bi}?EiA=Kuo5f+>Ca?25|W%Gm!LkHg%99Ei5Ikp*euI3
zJM+!+b$<ZZV(g<wSVtyjWp$nCnyd5e!nrE6lw3*KB$05avLsekb|#kKbMrAEOjFe;
z&YYN!r&J<Km}x1bblUEZi&!iV|0&Kc<Hm4xt*qofF`?NICV{ETNcKr4gn8HTOR;JJ
UJOZKb`T*phhVa@AzMDOa-ZQ^OasU7T

literal 0
HcmV?d00001

diff --git a/spzx-manager/target/classes/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.class b/spzx-manager/target/classes/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.class
index da3b3d3785a5e4798b4441962a2e7eb9aeafda69..9ce603ec7f8d2021d367d11c1c1871aa1c40061b 100644
GIT binary patch
delta 1728
zcmZWpXLJ-*6#m}s%)Hsz2Zl{Z7!XJ>Kq?T5z@|_V1gT1-1r?WM3=3-(c4t8>EQlf^
z2=Rp$kfL;jP~xN@Mf4ob@t1mz|NP~lgdhI#r*hOgX`pPmbKiZpe)rzlYn~ly{P1`C
zbpWOKzTP-hY(PgpfdB-9QES=dp|y7Ps*o#A6X@S7j@DRntc^ZoU;u|HFc5?4ui0#{
z9LsXpP`R89^k-oh$1?)i7%n%nsud#{0(YCX-9NVFPV26Yt=I0fw%<S7t|OOW(7oMz
z?zEqHaBgQu)0QU`@)-v7Uahe<K5p)2P$)18qvemvtiDAU%P~%1JSH#{$-Y{)oUJbE
z<Htly;+QNDM6vX1lQk-hVT8QIQj@uJSBKVzMn^(*wWAlTTy0g`#T=y!DUZaJb}U?1
z>&BWQFcs4nQnN$xxD~U*(Ykm=I38LVv1%At6-PN``^a)ykJgM>EE+Q~9bN+^curuZ
zi>2R=j+-0ZV8zNqam&E-n9VUqU@qn{^y~DJu)~q=wBih!wJs5g#N`E+CAxFXrI-uk
z&z{`u7YX2AoCu`5JKG+7u*<-FR0^ngiJ^avJg%gsEjCbu#R5yPlw8(W5zDs7W%`iE
zp_m?xMyya>v0HVOz;e7S|77L<SFwWQHGvRT%01rxGSf3qZtyG}ri1E#>VCtSd)r&w
z*yj)2J$%N%>!{^eB@o7HS?ZmqMd0IjgDi{uC5XC}uBEixK4j%q>4-6it{HjIaImAP
z$$*Un$9jPccvB8lCgj<8OW<u6JKc_U^+m_K1bv~7Bm-P@w+Ot4t#Xqx%T#H!-4FNS
zLu}{xNMHv(W*98jX@li2YQ8=Zy97SLZaGa`=&#4898#bGd*u-=;opw~90vs&aYzo~
z4f=k3CU68tWjmi(Vc<AE=lDY41Wr=%kGftSq3K{qud(9cm{rp|1eJEkPSAxn$L-o_
zhEer5Gp}Um$60E1*P_uKO*n&69j%egzJyONsg8u}!giS)X(W;v@POeI6e@{Uj`%ag
zY4kixPmkNBCuFo6|COZ-aA%nGy(CvVt<TZP)gl0)=Cy!b>U8%dQP(+W^S>gR6kQrP
zj|+5UXu?H`O4jTzQZz{RN4^6-k4T^SL{fqZ(bS-t*NpVSzz_$SE>{p3(ao7kAg6~_
z19@F+frBxo+J<L6xQUXWb{S=jNHMkBN%*f~`mz>O+%Po<Gfag@D`qvK&sEG{7I>ir
z3vW<>0#kLcXbEx43fu6C2SIM~+ucglu2MlOte|e{CU>yLL0ylBb?#*=;tn<j-U)1S
zusP^+9a2VxrZ1U>_b+2x8+K}F#U9h=V4s7-7pZP9T(GK;PINe-I)cy`i4^3JBo~>;
zqi;SYpn$L+g-VQ})hNPxjKyY>?w}XcK1{+POvXtRldn<=P=;I7r=RGhaSs)41CnIa
z337J>2yR@$Wom?q-*E-a)C>b1_?kE`1^*2WaSEmID_V$CDezHp+)T~dN2Ah)c5n(d
z6IV&5Q>ZK&^=A0+4V94(<sS;jIWjnOjuM`vf6osvA0nG0@(@px5ZA~;Wt0xc(e>V`
z8s9lFK)*nSgJX^0%4sOxD=7Q_gr#-HRN)a*X$f$H{J8D!neT7ue5)@JgB<QhJ-&nQ
EUmSL#tpET3

delta 1045
zcmZXTZ*vqy5XOIVce}H<nZ$5}3Kuy8ntxpGk{~28rx6vAhz3*?A)<IHMq)e+IZ!bs
zAR1AOf)i9MtJF6ZywD(6n<G~6rB!|aKLIiD6)dIf<tWQ4wsw1Zx@Vs5r@QxT{i&q?
z`?a}CKrdgM^uMo;vxJ0ZsiB5tif-HCEVt+UdfTXSs@6WQTAGrIWsB2i{ya9jaAN9m
zY3j<+`OBrb#j|rhx3WT$GTcVJ{ZS39T%|}X%uFtRd*uJ;!WefL8fdgDoDEgYv}jfv
z(zGfv5-?*=J3FG9tS!b?r`i>_l*0+e!Vh0Ae0|0z!y1FbopwG}SFw&xO_!mYyX;c8
zKb|A5xjV!f_iF87x3;;Ldo}9~_i?|XdMJM|-#(l#47P78?%!J&RJeOa4&;YN?Kf^+
zYJ<X*bG|x#`pV3V&qf~7Y%=umu>HgBOmE~7!=o65SKL>I@YteIS&zpQ_)^R#4BL3p
zcIrMqq`TelG&}5Iq_1LtXEeJE&+?p|i;N{5DSr6qI4|&`<|V@(URI>+C7rStbZgZs
z?9~hzUS(LZ*3L&7>`*jeuj;K;1@>uPH;k}f(IR|XY{A=HRpfx?py3VP40|~4b=!Zu
z0k6m*!`qD6-SKW$Gp=a6(O>VvU-9phJzp_m+sx?15+W$xAu4&v9Ed(4nk(yJStDWV
zZn6o#n`}yY6y7=_x7uZu;^3rbQ9oUWc~@lU4uc#OY03wfc#rpGtC-{ii6*yImmJh$
zn`{lx{UR#2q<^M5n^+!D7iyWr%CdHQ_99IYa<OFWH!6Q2vop~)OUJL75^Hl#(n-bw
zdIIkG>W1@y&{^WafX#{i#MXeva}%y0J{7Ptn{;c~eV+V923<<LmUII~1Kv6(sYD6$
z@1jy<gAi?$#y1I*W*Pr<IL$&iLl14Nr$gpt4cl2Kz3t?XjB3cYuS|(DT_MLYJ`~zx
zj&S~n<HFr%jE_Z&3g9lL_=K3iZQ@h0IRdsydVE}Jb3)*1h+Lyb(|i5R{T=>{y_^(}
cqXaq3_%o3a?0@Z?mi;ODe2H45z~{vO1&)Q+3;+NC

diff --git a/spzx-manager/target/classes/com/atguigu/spzx/manger/service/impl/ValidateCodeServiceImpl.class b/spzx-manager/target/classes/com/atguigu/spzx/manger/service/impl/ValidateCodeServiceImpl.class
new file mode 100644
index 0000000000000000000000000000000000000000..9f9270620958c9fd45d155e5254339ed8b110dfd
GIT binary patch
literal 2578
zcmb_eYj+bx7=ETryKTDAQa~)XS}Bm0%Ya;M0HvXYK-y|^LB-o-GbBScJ8^eXtUtu#
zfAEWXJQexi5Aa8Md?y>r*5-hCXwS~<?7Z(g&phuffByCS4*)muO&S9jbdYi}gkgq>
zCt^czUj%i&R(&Ep!!Ue91<KrF7|hI7(ip+0gS3k=xD3a<fHyiuYoB|fZM=ryxp*!c
z<umN}LMe>QsnGLfZ-?P@CQpBJg+9tj!E73PG45c(#Xd|jOus^&!Kq7=(>2L(ATw8Z
zah0M8RZ#ERJK*A=HMW;T^DR-Aiz1R&FHaI1hg`gkDTYHW(UdtIc)~nXra^C!5rK&q
zPGxo*?R(A<9CdKa#c@p2QC%P%B7~RA`8y2hPy{vIiWigrAl()qoJTO@;$4e##ON6P
zC}wfe!6_G~kzu&u=@u8J-cj`qkJ{gT%Uk3$8S+Sm8_JVhwc0+f2w&B#1BjGjypgBx
z40}RZQ&CCMg0>kh6?9l9JC>)%p=imcI&5-M6}&6SJsnEEo>U^3^El(+tc!Cv&v5az
zEijDfcC@TRg4rPu*NBS$Vx%j+)|R0#iky=j#RXh+@SclHxJ*I$f^Uz!*a<@!7+z8>
zS*AdyC|Sv`mP<=Tim2F~UFQ3UX2)<9*Bo4T@je!ar2heq(k7C0=-p)K#Hp1{1XJ(J
z{Z|0833vlH9o%y90X}3Pzx+E4$kjgI&^+3VjBM=)fr_TvS3AnD$&evWbibzhY%-uK
zdNDRdk+6uIgF7yku*|UZMywK4kM8n7ZZbSdve(PzHwpfpi@ZfXYESHjm%Y*h7X_>^
z40S0Z|Gz$ASqE#RxSNoj$(p3Km!}L<>z%+*)K*las=mA(1lq(A&v3nOqEw{_BK}x-
zMu(eRY%B2FRHL6N%H%9VDz1>@1r^BEPOB=zk|6U8lLhSwzam0q*S(J^(@<3TZuN<j
zomY5Sy`fVN)Ma23*0Q@@lB|p4cEK?7%634|t$QrcU8S8$Nwr(ZyEUDXu4%(2UDTb>
zlgr9p?`ZPmL@_*XjWJ~UGD;~FN^LgVlJ`{TE)$Ddo5+Nsy&_FR*P`)Zcxlui9Xz&8
zq|Pw=0-_2wbd&VEO(^aw%dv|Xen<v(PcSxmk9veJquGMi%}zU6D|+#tAYq4MiNN*|
zf0U5#Rhwk%>Y2z1-!Cd7vm;Q{32g&dP_|9-HZ{<g;<Jpw%?ISpoG+qCQg|Fpa=Tp@
z9JClt?joY!{TxtfI{tD|`Y95Vff?$B17KLCXTbJDnm?irK1}n+G}}G;IYZ+*tvJn$
z=ArrDz<%y-7iqNHz&J`Yy0HMtsL+bxAy#O#%0H6a5Y0>b@cqOEXXqK6!kI1XS)pP7
zbG!wtKEvTHyt9y+{}m^;FgKMtoBjp-cU&39Gi0YyTey903wO70|0gmu0DJghG7D<+
zV>pTl9HaF#_4^rIq0s`m93R>PG=>Fyf=>z31W9~`M`YzN&fs%;8zhYr_=4V2^#5h|
jgs-;Q_?p&&o)OZm($l~bT1}GvA~ljGM&Tns8&iJ+M&I@e

literal 0
HcmV?d00001

diff --git a/spzx-model/src/main/java/com/atguigu/spzx/model/dto/system/LoginDto.java b/spzx-model/src/main/java/com/atguigu/spzx/model/dto/system/LoginDto.java
index 2db92bf..e3ee746 100644
--- a/spzx-model/src/main/java/com/atguigu/spzx/model/dto/system/LoginDto.java
+++ b/spzx-model/src/main/java/com/atguigu/spzx/model/dto/system/LoginDto.java
@@ -1,22 +1,26 @@
 package com.atguigu.spzx.model.dto.system;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @Schema(description = "用户登录请求参数")
 public class LoginDto {
-
     @Schema(description = "用户名")
-    private String userName ;
+    private String userName;
 
     @Schema(description = "密码")
-    private String password ;
+    private String password;
 
     @Schema(description = "提交验证码")
-    private String captcha ;
+    private String captcha;
 
     @Schema(description = "验证码key")
-    private String codeKey ;
-
+    private String codeKey;
 }
diff --git a/spzx-model/target/classes/com/atguigu/spzx/model/vo/system/ValidateCodeVo$ValidateCodeVoBuilder.class b/spzx-model/target/classes/com/atguigu/spzx/model/vo/system/ValidateCodeVo$ValidateCodeVoBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..fcdeed61a99854629e638b68c27c5be07309fb25
GIT binary patch
literal 1655
zcmb_cZBG+H5Pr6_Tw4o0%bWO$TBI$=srW)H_yHnftY`wMF?`y#n{sfyZSJ;2{3ZSj
zO)w;w_yhb=#@XHpt!)S-=5o6;vop`U?9Bf9ef$%^GM*(7!GM8i3NZ{an7e$RTMl>Y
z*1O8Cs49lRCEK;t3x<JQzMMcD2?NO#E+NJ6vML)ESM`=%Z&`lx^CznzYr?VirR5*^
zN;Ir8ckCKhVwL1&neAp*TDDUY9)nS(<2T}fAyYbyU{iUvTQ6##!zrY-!-Q5Okd`oT
znZdfC|0GO|=u}4;W^%o*dL{XCh6**F!UV1`Of>i&rQ%k(`e3UaqI|_&<ufdv53Sb$
zLsZv>AziXvvC(Q&gtx^j4oNa4S>;Zdd$#67VN~td<nLAKf~of}eUV|iPvrUkhHkzU
zYDd=IbB{NK5*~#ftLSTISjb)24TT$5GUyA2Q3B}c7KY@eY<X3&X6qV`ba&jm)+dk+
z;j4A&Q+t~$QYv40yctC5rw5TwqJUWgbNbrvGh|P_*zUgE6IKvH&<Sh2s-#D~`=zsz
zp<)2K&fS_L{A@|ey;if>8+C`I%W&(UDf*~ycjyOmTI?)E2(ii?XVX@q7>C8M^iL(a
z*>Dtd;UF%vxv7&;TV{EN)N9uj-m1fWU(h9v^))xJz%boYt$sx?@Py&!*{byT1Qo+=
zdIKUfh!Ohe<!Mv&AkZFb|ASzdB+8<lX-VM->>CjgT%}bX14&$?H5Dk}I&Kih2<|3n
zY2#uW9xw{C-)Z?uqF(cHl95Vit|=W4!!44=G@40Fx<BU7xiNKaCz$Cr<`fknNb)(N
zL;>axm>&y=6zU;{j*#geaFDNglJ6bd4RIDJ6^%3e7vmUXz*#86AxackvWs9E_u9LO
c8QSB7mZN_j4~Waqd7L7Dhy)(tF`i=b4?FLhj{pDw

literal 0
HcmV?d00001