添加登录功能，支持通过邮箱和手机号进行登录验证
This commit is contained in:
Dftre
parent
0c12c12b65
commit
2a63e301a3
@ -1,6 +1,6 @@
|
||||
<mxfile host="65bd71144e">
|
||||
<diagram id="IyeDk-cAWrKOq7F3gyWb" name="第 1 页">
|
||||
<mxGraphModel dx="573" dy="322" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" background="#FFFFFF" math="0" shadow="0">
|
||||
<mxGraphModel dx="344" dy="766" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" background="#FFFFFF" math="0" shadow="0">
|
||||
<root>
|
||||
<mxCell id="0"/>
|
||||
<mxCell id="1" parent="0"/>
|
||||
@ -8,131 +8,122 @@
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="5" value="访问/login" style="html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="304" y="60" width="110" height="50" as="geometry"/>
|
||||
<mxGeometry x="300" y="30" width="110" height="50" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="9" value="" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="6" target="20" edge="1">
|
||||
<mxCell id="9" value="" style="edgeStyle=none;html=1;" parent="1" source="6" target="20" edge="1">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="359.0000000000001" y="240" as="targetPoint"/>
|
||||
<mxPoint x="359.0000000000001" y="200" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="6" value="被SysLoginController.login()捕获" style="html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="265.5" y="130" width="187" height="40" as="geometry"/>
|
||||
<mxGeometry x="261.5" y="100" width="187" height="30" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="20" value="<span style="font-weight: 400;">调用方法SysLoginService.login()执行登录逻辑</span>" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="110" y="195" width="500" height="1075" as="geometry">
|
||||
<mxGeometry x="110" y="155" width="490" height="935" as="geometry">
|
||||
<mxRectangle x="109" y="195" width="290" height="30" as="alternateBounds"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="22" value="" style="edgeStyle=none;html=1;" parent="20" source="10" target="21" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="10" value="调用方法SysLoginService.validateCaptcha()<br>1. <font color="#00ffff">从redis里拿到验证码对应的验证信息</font><br>2. <font color="#00ffff">删除redis中验证码对应的验证信息</font><br>3. 如果验证信息为空，<font color="#ff0000">抛出验证码过期的异常</font><br>4. 如果code与验证信息的值不同，<font color="#ff0000">抛出验证码错误的异常</font>" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="104.85" y="45" width="312.25" height="100" as="geometry"/>
|
||||
<mxCell id="10" value="<div style="text-align: center;"><span style="background-color: transparent;">调用方法SysLoginService.validateCaptcha()</span></div><div style=""><span style="background-color: transparent;">1. </span><font style="background-color: transparent; color: rgb(0, 0, 204);">从redis里拿到验证码对应的验证信息</font></div><div style=""><span style="background-color: transparent;">2. </span><font style="background-color: transparent; color: rgb(0, 0, 204);">删除redis中验证码对应的验证信息</font></div><div style=""><span style="background-color: transparent;">3. 如果验证信息为空，</span><font style="background-color: transparent;">抛出验证码过期的异常</font></div><div style=""><span style="background-color: transparent;">4. 如果code与验证信息的值不同，</span><font style="background-color: transparent;">抛出验证码错误的异常</font></div>" style="html=1;align=left;" parent="20" vertex="1">
|
||||
<mxGeometry x="87.42999999999999" y="35" width="315.15" height="100" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="24" value="" style="edgeStyle=none;html=1;" parent="20" source="21" target="23" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="21" value="调用方法SysLoginService.loginPreCheck()<br>1. <font color="#ff0000">用户名或密码为空 -&gt; 错误 抛出异常</font><br>2. <font color="#ff0000">密码不在指定范围内 -&gt; 错误 抛出异常</font><br>3. <font color="#ff0000">用户名不在指定范围内 -&gt; 错误 抛出异常</font><br>4. <font color="#ff0000">IP黑名单校验 -&gt; 错误 抛出异常</font>" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="104.85" y="170" width="312.25" height="100" as="geometry"/>
|
||||
<mxCell id="21" value="调用方法SysLoginService.loginPreCheck()<br><div style="text-align: left;"><span style="background-color: transparent;">1. </span><font style="background-color: transparent;">用户名或密码为空 -&gt; 错误 <font style="color: rgb(255, 0, 0);">抛出异常</font></font></div><div style="text-align: left;"><span style="background-color: transparent;">2. </span><font style="background-color: transparent;">密码不在指定范围内 -&gt; 错误 <font style="color: rgb(255, 0, 0);">抛出异常</font></font></div><div style="text-align: left;"><span style="background-color: transparent;">3. </span><font style="background-color: transparent;">用户名不在指定范围内 -&gt; 错误 <font style="color: rgb(255, 0, 0);">抛出异常</font></font></div><div style="text-align: left;"><span style="background-color: transparent;">4. </span><font style="background-color: transparent;">IP黑名单校验 -&gt; 错误 <font style="color: rgb(255, 0, 0);">抛出异常</font></font></div>" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="112.91" y="170" width="267.1" height="100" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="26" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="20" source="23" target="25" edge="1">
|
||||
<mxCell id="26" style="edgeStyle=none;html=1;" parent="20" source="23" target="25" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="23" value="<font color="#00ff00">通过new UsernamePasswordAuthenticationToken生成一个认证信息<br>通过AuthenticationContextHolder.setContext将认证信息设置到上下文</font><br>通过AuthenticationManager.authenticate()对认证信息进行认证，这个方法<br>会去调用UserDetailsServiceImpl.loadUserByUsername()方法进行认证" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="57.91" y="300" width="406.13" height="70" as="geometry"/>
|
||||
<mxCell id="23" value="<font style="color: rgb(0, 204, 0);">通过new UsernamePasswordAuthenticationToken生成一个认证信息<br>通过AuthenticationContextHolder.setContext将认证信息设置到上下文</font><br>通过AuthenticationManager.authenticate()对认证信息进行认证，这个方法<br>会去调用UserDetailsServiceImpl.loadUserByUsername()方法进行认证" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="43.39" y="295" width="406.13" height="70" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="39" value="" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="20" source="25" target="40" edge="1">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="261" y="785" as="sourcePoint"/>
|
||||
<mxPoint x="245.01" y="805" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
<mxCell id="68" style="edgeStyle=none;html=1;" edge="1" parent="20" source="25" target="40">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="25" value="<span style="font-weight: 400;">loadUserByUsername</span>" style="swimlane;whiteSpace=wrap;html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="41.94" y="385" width="438.06" height="390" as="geometry">
|
||||
<mxGeometry x="27.43" y="385" width="438.06" height="355" as="geometry">
|
||||
<mxRectangle x="25.97999999999999" y="380" width="160" height="30" as="alternateBounds"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="29" value="" style="edgeStyle=none;html=1;" parent="25" source="27" target="28" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="27" value="调用ISysUserService.selectUserByUserName()获取用户信息<br>校验是否为空 -&gt; <font color="#ff0000">抛出用户不存在的异常</font><br>校验是否已被删除 -&gt; <font color="#ff0000">抛出用户已被删除的异常</font><br>校验是否已被停用 -&gt; <font color="#ff0000">抛出用户已被停用的异常</font>" style="whiteSpace=wrap;html=1;" parent="25" vertex="1">
|
||||
<mxGeometry x="30.04" y="30" width="379.96" height="60" as="geometry"/>
|
||||
<mxCell id="27" value="调用ISysUserService.selectUserByUserName()获取用户信息<br><div style="text-align: left;"><span style="background-color: transparent;">校验是否为空 -&gt; </span><font style="background-color: transparent; color: rgb(255, 0, 0);">抛出用户不存在的异常</font></div><div style="text-align: left;"><span style="background-color: transparent;">校验是否已被删除 -&gt; </span><font style="background-color: transparent; color: rgb(255, 0, 0);">抛出用户已被删除的异常</font></div><div style="text-align: left;"><span style="background-color: transparent;">校验是否已被停用 -&gt; </span><font style="background-color: transparent; color: rgb(255, 0, 0);">抛出用户已被停用的异常</font></div>" style="whiteSpace=wrap;html=1;" parent="25" vertex="1">
|
||||
<mxGeometry x="48.55" y="40" width="340.95" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="28" value="调用SysPasswordService.validate()进行认证<br>1. 获取上下文的认证信息，并获取认证信息中携带的用户名和密码<br>2. <font color="#00ffff">从redis中获取该用户名密码错误次数</font><br>3. 校验该用户名密码错误次数是否过多<br>若次数过多，则<font color="#ff0000">抛出密码错误次数过多的异常</font><br>4. 调用SecurityUtils.matchesPassword方法校验用户名密码是否匹配<br>5. 若不匹配，则密码错误次数加一，且<font color="#ff0000">抛出密码错误的异常</font><br>否则清楚密码错误次数，校验结束即校验通过" style="whiteSpace=wrap;html=1;" parent="25" vertex="1">
|
||||
<mxGeometry x="29.05" y="120" width="379.96" height="120" as="geometry"/>
|
||||
<mxCell id="28" value="调用SysPasswordService.validate()进行认证<br><div style="text-align: left;"><span style="background-color: transparent;">1. 获取上下文的认证信息，并获取认证信息中携带的用户名和密码</span></div><div style="text-align: left;"><span style="background-color: transparent;">2. </span><font style="background-color: transparent; color: rgb(0, 0, 255);">从redis中获取该用户名密码错误次数</font></div><div style="text-align: left;"><span style="background-color: transparent;">3. 校验该用户名密码错误次数是否过多</span><span style="background-color: transparent;">若次数过多，则</span><font style="background-color: transparent; color: rgb(255, 0, 0);">抛出密码错误次数过多的异常</font></div><div style="text-align: left;"><span style="background-color: transparent;">4. 调用SecurityUtils.matchesPassword方法校验用户名密码是否匹配</span></div><div style="text-align: left;"><span style="background-color: transparent;">5. 若不匹配，<font style="color: rgb(0, 0, 255);">则密码错误次数加一</font>，且</span><font style="background-color: transparent;">抛<font style="color: rgb(255, 0, 0);">出密码错误的异常</font></font></div><div style="text-align: left;"><span style="background-color: transparent;">6. 若匹配，<font style="color: rgb(0, 0, 255);">则清除密码错误次数</font>，校验结束即校验通过</span></div>" style="whiteSpace=wrap;html=1;" parent="25" vertex="1">
|
||||
<mxGeometry x="33.56" y="135" width="370.95" height="120" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="36" value="调用createLoginUser方法new&nbsp;LoginUser()创建一个UserDetails凭证<br>调用SysPermissionService.getMenuPermission()方法获取用户角色权限" style="html=1;" parent="25" vertex="1">
|
||||
<mxGeometry x="15.960000000000008" y="275" width="406.13" height="70" as="geometry"/>
|
||||
<mxGeometry x="27.98" y="290" width="382.09" height="50" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="37" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="25" source="28" target="36" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
<mxCell id="37" style="edgeStyle=none;html=1;" parent="25" source="28" target="36" edge="1">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="324.02" y="280" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="44" value="" style="edgeStyle=none;html=1;" parent="20" source="40" target="43" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="40" value="1. <font color="#ff0000">若上述环节抛出异常则处理异常并抛出对应的新的异常，校验环节结束</font><br>2. 无论校验结果如何，清除上下文" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="57.91" y="805" width="406.13" height="70" as="geometry"/>
|
||||
<mxCell id="40" value="1. <font color="#ff0000">若上述环节抛出异常则处理异常并抛出对应的新的异常</font><div><font style="color: rgb(0, 0, 0);">2. 若上述环节正常运行，则校验环节结束</font><br>3. 无论校验结果如何，清除上下文</div>" style="html=1;align=left;" parent="20" vertex="1">
|
||||
<mxGeometry x="90.98" y="765" width="308.06" height="55" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="43" value="1. 调用createToken()记录并更新用户信息<br>2. 调用TokenService.createToken()生成token，<br>设置用户代理信息LoginUser，将<font color="#00ffff">LoginUser存入redis</font>" style="html=1;" parent="20" vertex="1">
|
||||
<mxGeometry x="57.91" y="925" width="406.13" height="70" as="geometry"/>
|
||||
<mxCell id="43" value="1. 调用createToken()记录并更新用户信息<br>2. 调用TokenService.createToken()生成token，<br>3. 设置用户代理信息LoginUser，将<font style="color: rgb(0, 0, 255);">LoginUser存入redis</font>" style="html=1;align=left;" parent="20" vertex="1">
|
||||
<mxGeometry x="92.42999999999999" y="845" width="308.06" height="70" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="45" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="40" target="46" edge="1">
|
||||
<mxCell id="47" style="edgeStyle=none;html=1;" parent="1" source="43" target="48" edge="1">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="660" y="1055" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="46" value="认证失败" style="html=1;fontColor=#FF0000;labelBorderColor=none;strokeColor=#FF0000;" parent="1" vertex="1">
|
||||
<mxGeometry x="660" y="1010" width="100" height="50" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="47" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="43" target="48" edge="1">
|
||||
<mxGeometry relative="1" as="geometry">
|
||||
<mxPoint x="333.06500000000005" y="1330.0000000000002" as="targetPoint"/>
|
||||
<mxPoint x="333.06500000000005" y="1290.0000000000002" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="65" value="" style="edgeStyle=none;html=1;fontColor=#00FFFF;" parent="1" source="48" target="64" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="48" value="认证成功<br>将Token返回给前端" style="html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="302.51" y="1300" width="136.93" height="80" as="geometry"/>
|
||||
<mxCell id="48" value="认证成功，将Token返回给前端" style="html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="254.73000000000002" y="1110" width="203.46" height="31" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="51" value="" style="edgeStyle=none;html=1;" parent="1" source="49" target="50" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="49" value="Token认证" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="310.98" y="1570" width="120" height="60" as="geometry"/>
|
||||
<mxGeometry x="765" y="1010" width="120" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="53" value="" style="edgeStyle=none;html=1;" parent="1" source="50" target="52" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="50" value="触发JwtAuthenticationTokenFilter拦截器<br>调用doFilterInternal方法进行处理" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="235.98" y="1680" width="270" height="60" as="geometry"/>
|
||||
<mxGeometry x="690" y="920" width="270" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="55" value="" style="edgeStyle=none;html=1;" parent="1" source="52" target="54" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="52" value="调用TokenService.getLoginUser()方法<br>1. 调用方法getToken从request的请求头中获取token<br><font color="#00ffff">2. 通过token在redis中获取用户代理信息LoginUser</font>" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="185.98" y="1780" width="370" height="60" as="geometry"/>
|
||||
<mxCell id="52" value="调用TokenService.getLoginUser()方法<br>1. 调用方法getToken从request的请求头中获取token<br><font style="color: rgb(0, 0, 204);">2. 通过token在redis中获取用户代理信息LoginUser</font>" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="675" y="830" width="300" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="57" value="" style="edgeStyle=none;html=1;" parent="1" source="54" target="56" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="54" value="判断用户凭证是非空并且判断上下文认证信息为空<br>调用TokenService.verifyToken()校验token并判断最小时间刷新token" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="175.98" y="1860" width="390" height="60" as="geometry"/>
|
||||
<mxGeometry x="630" y="750" width="390" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="59" value="" style="edgeStyle=none;html=1;" parent="1" source="56" target="58" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="56" value="<font color="#00ff00">1. 通过UsernamePasswordAuthenticationToken创建一个认证信息<br>2. 通过WebAuthenticationDetailsSource构建一个用户凭证并通过UsernamePasswordAuthenticationToken.setDetails设置到认证信息里<br>3. 将认证信息通过SecurityContextHolder.getContext().setAuthentication<br>拿到上下文并设置到上下文</font>" style="whiteSpace=wrap;html=1;strokeColor=#00FF00;" parent="1" vertex="1">
|
||||
<mxGeometry x="161.45999999999998" y="1950" width="419.02" height="80" as="geometry"/>
|
||||
<mxCell id="56" value="<font style="color: rgb(0, 153, 0);">1. 通过UsernamePasswordAuthenticationToken创建一个认证信息<br>2. 通过WebAuthenticationDetailsSource构建一个用户凭证并通过UsernamePasswordAuthenticationToken.setDetails设置到认证信息里<br>3. 将认证信息通过SecurityContextHolder.getContext().setAuthentication拿到上下文并设置到上下文</font>" style="whiteSpace=wrap;html=1;strokeColor=#00CC00;align=left;" parent="1" vertex="1">
|
||||
<mxGeometry x="632.75" y="640" width="384.51" height="80" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="58" value="继续过滤<br>在鉴权系统中会用到上述设置的上下文" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="300.98" y="2060" width="140" height="60" as="geometry"/>
|
||||
<mxGeometry x="755" y="555" width="140" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="66" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontColor=#00FFFF;" parent="1" source="64" target="49" edge="1">
|
||||
<mxCell id="66" style="edgeStyle=none;html=1;fontColor=#00FFFF;" parent="1" source="64" target="49" edge="1">
|
||||
<mxGeometry relative="1" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="64" value="前端拿到token后存到浏览器中<br>后续发送请求在浏览器中拿到token<br>并将token设置到请求头里" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
||||
<mxGeometry x="251.46" y="1430" width="239.02" height="90" as="geometry"/>
|
||||
<mxGeometry x="705.49" y="1090" width="239.02" height="70" as="geometry"/>
|
||||
</mxCell>
|
||||
</root>
|
||||
</mxGraphModel>
|
||||
|
||||
@ -11,4 +11,8 @@ public interface TfaService {
|
||||
public void doRegister(RegisterBody registerBody);
|
||||
|
||||
public void doRegisterVerify(RegisterBody registerBody);
|
||||
|
||||
public void doLogin(LoginBody loginBody);
|
||||
|
||||
public String doLoginVerify(LoginBody loginBody);
|
||||
}
|
||||
|
||||
@ -67,4 +67,19 @@ public class TfaController extends BaseController {
|
||||
tfaService.doRegisterVerify(registerBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/send/login")
|
||||
@Anonymous
|
||||
public AjaxResult sendLogin(@PathVariable String channel, @RequestBody LoginBody loginBody) {
|
||||
TfaService tfaService = tfaServiceMap.get(channel + "AuthService");
|
||||
tfaService.doLogin(loginBody);
|
||||
return success();
|
||||
}
|
||||
|
||||
@PostMapping("/verify/login")
|
||||
@Anonymous
|
||||
public AjaxResult verifyLogin(@PathVariable String channel, @RequestBody LoginBody loginBody) {
|
||||
TfaService tfaService = tfaServiceMap.get(channel + "AuthService");
|
||||
return success(tfaService.doLoginVerify(loginBody));
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,14 +10,19 @@ import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.auth.common.enums.OauthVerificationUse;
|
||||
import com.ruoyi.auth.common.utils.RandomCodeUtil;
|
||||
import com.ruoyi.common.constant.CacheConstants;
|
||||
import com.ruoyi.common.constant.Constants;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.common.core.domain.model.LoginBody;
|
||||
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||
import com.ruoyi.common.core.domain.model.RegisterBody;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.utils.CacheUtils;
|
||||
import com.ruoyi.common.utils.MessageUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.framework.manager.AsyncManager;
|
||||
import com.ruoyi.framework.manager.factory.AsyncFactory;
|
||||
import com.ruoyi.framework.web.service.SysLoginService;
|
||||
import com.ruoyi.framework.web.service.TokenService;
|
||||
import com.ruoyi.framework.web.service.UserDetailsServiceImpl;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
@ -33,6 +38,8 @@ public class MailServiceImpl implements IMailService {
|
||||
private TokenService tokenService;
|
||||
@Autowired
|
||||
private UserDetailsServiceImpl userDetailsServiceImpl;
|
||||
@Autowired
|
||||
private SysLoginService sysLoginService;
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(MailServiceImpl.class);
|
||||
|
||||
@ -65,30 +72,25 @@ public class MailServiceImpl implements IMailService {
|
||||
return isValid;
|
||||
}
|
||||
|
||||
public void doLogin(LoginBody loginBody, boolean isRegister) {
|
||||
public void doLogin(LoginBody loginBody) {
|
||||
SysUser sysUser = userService.selectUserByEmail(loginBody.getEmail());
|
||||
if (sysUser == null && !isRegister) {
|
||||
if (sysUser == null) {
|
||||
throw new ServiceException("该邮箱未绑定用户");
|
||||
} else {
|
||||
sendCode(loginBody.getEmail(), RandomCodeUtil.numberCode(6), OauthVerificationUse.LOGIN);
|
||||
}
|
||||
}
|
||||
|
||||
public String doLoginVerify(LoginBody loginBody, boolean isRegister) {
|
||||
public String doLoginVerify(LoginBody loginBody) {
|
||||
if (checkCode(loginBody.getEmail(), loginBody.getCode(), OauthVerificationUse.LOGIN)) {
|
||||
SysUser sysUser = userService.selectUserByEmail(loginBody.getEmail());
|
||||
if (sysUser == null) {
|
||||
if (isRegister) {
|
||||
sysUser = new SysUser();
|
||||
sysUser.setUserName(loginBody.getEmail());
|
||||
sysUser.setPassword(SecurityUtils.encryptPassword(RandomCodeUtil.code(16)));
|
||||
sysUser.setEmail(loginBody.getEmail());
|
||||
userService.registerUser(sysUser);
|
||||
} else {
|
||||
throw new ServiceException("该邮箱未绑定用户");
|
||||
}
|
||||
throw new ServiceException("该邮箱未绑定用户");
|
||||
}
|
||||
AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_SUCCESS,
|
||||
MessageUtils.message("user.login.success")));
|
||||
LoginUser loginUser = (LoginUser) userDetailsServiceImpl.createLoginUser(sysUser);
|
||||
sysLoginService.recordLoginInfo(loginUser.getUserId());
|
||||
return tokenService.createToken(loginUser);
|
||||
} else {
|
||||
throw new ServiceException("验证码错误");
|
||||
@ -112,6 +114,8 @@ public class MailServiceImpl implements IMailService {
|
||||
sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword()));
|
||||
sysUser.setEmail(registerBody.getEmail());
|
||||
userService.registerUser(sysUser);
|
||||
AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.REGISTER,
|
||||
MessageUtils.message("user.register.success")));
|
||||
} else {
|
||||
throw new ServiceException("验证码错误");
|
||||
}
|
||||
|
||||
@ -11,14 +11,19 @@ import com.alibaba.fastjson2.JSONObject;
|
||||
import com.ruoyi.auth.common.enums.OauthVerificationUse;
|
||||
import com.ruoyi.auth.common.utils.RandomCodeUtil;
|
||||
import com.ruoyi.common.constant.CacheConstants;
|
||||
import com.ruoyi.common.constant.Constants;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.common.core.domain.model.LoginBody;
|
||||
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||
import com.ruoyi.common.core.domain.model.RegisterBody;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.utils.CacheUtils;
|
||||
import com.ruoyi.common.utils.MessageUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.framework.manager.AsyncManager;
|
||||
import com.ruoyi.framework.manager.factory.AsyncFactory;
|
||||
import com.ruoyi.framework.web.service.SysLoginService;
|
||||
import com.ruoyi.framework.web.service.TokenService;
|
||||
import com.ruoyi.framework.web.service.UserDetailsServiceImpl;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
@ -41,6 +46,8 @@ public class DySmsServiceImpl implements DySmsService {
|
||||
private UserDetailsServiceImpl userDetailsServiceImpl;
|
||||
@Autowired
|
||||
private TokenService tokenService;
|
||||
@Autowired
|
||||
private SysLoginService sysLoginService;
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(DySmsServiceImpl.class);
|
||||
|
||||
@ -75,30 +82,25 @@ public class DySmsServiceImpl implements DySmsService {
|
||||
return isValid;
|
||||
}
|
||||
|
||||
public void doLogin(LoginBody loginBody, boolean isRegister) {
|
||||
public void doLogin(LoginBody loginBody) {
|
||||
SysUser sysUser = userService.selectUserByPhone(loginBody.getPhonenumber());
|
||||
if (sysUser == null && !isRegister) {
|
||||
if (sysUser == null) {
|
||||
throw new ServiceException("该手机号未绑定用户");
|
||||
} else {
|
||||
sendCode(loginBody.getPhonenumber(), RandomCodeUtil.numberCode(6), OauthVerificationUse.LOGIN);
|
||||
}
|
||||
}
|
||||
|
||||
public String doLoginVerify(LoginBody loginBody, boolean isRegister) {
|
||||
public String doLoginVerify(LoginBody loginBody) {
|
||||
if (checkCode(loginBody.getPhonenumber(), loginBody.getCode(), OauthVerificationUse.LOGIN)) {
|
||||
SysUser sysUser = userService.selectUserByPhone(loginBody.getPhonenumber());
|
||||
if (sysUser == null) {
|
||||
if (isRegister) {
|
||||
sysUser = new SysUser();
|
||||
sysUser.setUserName(loginBody.getPhonenumber());
|
||||
sysUser.setPassword(SecurityUtils.encryptPassword(RandomCodeUtil.code(16)));
|
||||
sysUser.setPhonenumber(loginBody.getPhonenumber());
|
||||
userService.registerUser(sysUser);
|
||||
} else {
|
||||
throw new ServiceException("该手机号未绑定用户");
|
||||
}
|
||||
throw new ServiceException("该手机号未绑定用户");
|
||||
}
|
||||
AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_SUCCESS,
|
||||
MessageUtils.message("user.login.success")));
|
||||
LoginUser loginUser = (LoginUser) userDetailsServiceImpl.createLoginUser(sysUser);
|
||||
sysLoginService.recordLoginInfo(loginUser.getUserId());
|
||||
return tokenService.createToken(loginUser);
|
||||
} else {
|
||||
throw new ServiceException("验证码错误");
|
||||
@ -122,6 +124,8 @@ public class DySmsServiceImpl implements DySmsService {
|
||||
sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword()));
|
||||
sysUser.setPhonenumber(registerBody.getPhonenumber());
|
||||
userService.registerUser(sysUser);
|
||||
AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.REGISTER,
|
||||
MessageUtils.message("user.register.success")));
|
||||
} else {
|
||||
throw new ServiceException("验证码错误");
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user