Merge remote-tracking branch 'cloud-schoolapi/ywx'

suser/src/main/java/com/xhkjedu/suser/controller/system/UserController.java

@@ -499,4 +499,20 @@ public class UserController {
         N_Utils.validation(new Object[]{userphone, "手机号", 2});
         return userService.bindCode(userphone);
     }
+
+    /**
+     * 校验用户密保答案
+     * @param [user]
+     * @return com.xhkjedu.vo.ResultVo
+     * @author ywx
+     * @date 2022/4/7 16:16
+     */
+    @PostMapping("/check_usecret")
+    public ResultVo checkUsecret(@RequestBody TUserUsecret user) {
+        Integer userid = user.getUserid();
+        Integer usid = user.getUsid();
+        String usanswer = user.getUsanswer();
+        N_Utils.validation(new Object[]{userid, "用户id", 1, usid, "密保id", 1, usanswer, "密保答案", 2});
+        return userService.checkUsecret(userid, usid, usanswer);
+    }
 }

suser/src/main/java/com/xhkjedu/suser/mapper/system/MsgMapper.java

@@ -5,11 +5,12 @@ import com.xhkjedu.suser.model.system.TMsg;
 
 public interface MsgMapper extends TkMapper<TMsg> {
     /**
-     * 5分钟内发送短信次数
+     * 1分钟内发送短信次数
+     *
+     * @return java.lang.Integer
      * @Param [userphone]
      * @Author ywx
      * @Date 2020/10/15 16:55
-     * @return java.lang.Integer
      **/
     Integer getMsgNumByUserPhone(String userphone);
 

suser/src/main/java/com/xhkjedu/suser/mapper/system/UserUsecretMapper.java

@@ -17,4 +17,7 @@ public interface UserUsecretMapper extends TkMapper<TUserUsecret> {
 
     //根据用户id获取关联密保
     List<Map> listUsecret(Integer userid);
+
+    //获取用户密保答案
+    String getAnswerById(Integer userid, Integer usid);
 }

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -628,7 +628,7 @@ public class UserService extends JedisUtil {
      **/
     public ResultVo updateCode(String userphone) {
         String templateCode = "xgmm";
-        if (generateCode(userphone, templateCode)) return new ResultVo(1, "请输入验证码或者在5分钟之后重新点击");
+        if (generateCode(userphone, templateCode)) return new ResultVo(1, "请输入验证码或者在1分钟之后重新点击");
         return new ResultVo(0, "生成修改码成功");
     }
 
@@ -641,7 +641,7 @@ public class UserService extends JedisUtil {
      * @Date 2020/5/8 10:04
      **/
     private boolean generateCode(String userphone, String templateCode) {
-        Integer msgNum = msgMapper.getMsgNumByUserPhone(userphone);//5分钟内发送短信次数
+        Integer msgNum = msgMapper.getMsgNumByUserPhone(userphone);//1分钟内发送短信次数
         if (msgNum != 0) return true;
 
         Integer messageCode = N_Utils.messageCode();
@@ -718,7 +718,7 @@ public class UserService extends JedisUtil {
     public ResultVo loginCode(String userphone) {
         N_Utils.validation(new Object[]{userphone, "手机号", 2});
         String templateCode = "dlqr";
-        if (generateCode(userphone, templateCode)) return new ResultVo(1, "请输入验证码或者在5分钟之后重新点击");
+        if (generateCode(userphone, templateCode)) return new ResultVo(1, "请输入验证码或者在1分钟之后重新点击");
         return new ResultVo(0, "生成登录确认码成功");
     }
 
@@ -926,7 +926,22 @@ public class UserService extends JedisUtil {
      */
     public ResultVo bindCode(String userphone) {
         String templateCode = "bdsj";
-        if (generateCode(userphone, templateCode)) return new ResultVo(1, "请输入验证码或者在5分钟之后重新点击");
+        if (generateCode(userphone, templateCode)) return new ResultVo(1, "请输入验证码或者在1分钟之后重新点击");
         return new ResultVo(0, "生成绑定手机码成功");
     }
+
+    /**
+     * 校验用户密保答案
+     *
+     * @param [userid, usid, usanswer]
+     * @return com.xhkjedu.vo.ResultVo
+     * @author ywx
+     * @date 2022/4/7 16:15
+     */
+    public ResultVo checkUsecret(Integer userid, Integer usid, String usanswer) {
+        //获取用户密保答案
+        String answer = userUsecretMapper.getAnswerById(userid, usid);
+        if (!usanswer.equals(answer)) return new ResultVo(1, "输入答案有误");
+        return new ResultVo(0, "校验密保答案成功");
+    }
 }

suser/src/main/resources/mapper/system/MsgMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.suser.mapper.system.MsgMapper">
-    <!-- 5分钟内发送短信次数 -->
+    <!-- 1分钟内发送短信次数 -->
     <select id="getMsgNumByUserPhone" resultType="java.lang.Integer">
-        select count(*) from t_msg where userphone=#{userphone} and createtime>=UNIX_TIMESTAMP(now())-300
+        select count(*) from t_msg where userphone=#{userphone} and createtime>=UNIX_TIMESTAMP(now())-60
     </select>
     <!--根据手机号和验证码获取短信信息-->
     <select id="findByUserPhoneAndCode" resultType="com.xhkjedu.suser.model.system.TMsg">

suser/src/main/resources/mapper/system/UserUsecertMapper.xml

@@ -11,8 +11,12 @@
     </delete>
     <!--根据用户id获取关联密保-->
     <select id="listUsecret" resultType="java.util.Map">
-        select uu.usid,uu.usanswer
+        select uu.usid
         ,(select u.sname from t_usecret u where u.usid=uu.usid)sname
         from t_user_usecret uu where uu.userid=#{userid}
     </select>
+    <!--获取用户密保答案-->
+    <select id="getAnswerById" resultType="java.lang.String">
+        select uu.usanswer from t_user_usecret uu where uu.userid=#{userid} and uu.usid=#{usid} limit 1
+    </select>
 </mapper>