解锁

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -334,6 +334,8 @@ public class UserController implements IBaseController {
 
         // TODO  加渠道号
         log.info("修改密码成功, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        //修改密码成功也要清除一下
+        lockIpv4Service.unLockPhone(phoneNo);
         return JsonResult.buildSuccessResult(null, null);
     }
 

src/main/java/cn/quantgroup/xyqb/service/user/impl/LockIpv4ServiceImpl.java

@@ -150,7 +150,15 @@ public class LockIpv4ServiceImpl implements ILockIpv4Service {
 
     @Override
     public void unLockPhone(String phone) {
-        stringRedisTemplate.delete(Constants.PASSWORD_LOCK_PRE.concat(phone));
+        try {
+            stringRedisTemplate.delete(Constants.PASSWORD_LOCK_PRE.concat(phone));
+            String key = Constants.REDIS_PASSWORD_ERROR_COUNT + phone;
+            stringRedisTemplate.delete(key);
+            log.info("解锁成功phone:{}", phone);
+        } catch (Exception e) {
+            log.error("解锁异常phone:{}", phone);
+        }
+
     }
 
     private static String getErrorIpKey(String ipv4) {

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -22,11 +22,7 @@ import cn.quantgroup.xyqb.repository.IUserHashPhoneNoIdNoMappingRepository;
 import cn.quantgroup.xyqb.repository.IUserRepository;
 import cn.quantgroup.xyqb.service.register.IUserRegisterService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
-import cn.quantgroup.xyqb.service.user.IAddressService;
-import cn.quantgroup.xyqb.service.user.IContactService;
-import cn.quantgroup.xyqb.service.user.IUserDetailService;
-import cn.quantgroup.xyqb.service.user.IUserExtInfoService;
-import cn.quantgroup.xyqb.service.user.IUserService;
+import cn.quantgroup.xyqb.service.user.*;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
 import cn.quantgroup.xyqb.util.HashUtil;
 import cn.quantgroup.xyqb.util.IpUtil;
@@ -94,7 +90,8 @@ public class UserServiceImpl implements IUserService, IBaseController {
     private IAddressService addressService;
     @Resource
     private IContactService contactService;
-
+    @Resource
+    private ILockIpv4Service lockIpv4Service;
     @Override
 //    @Cacheable(value = "usercache", key = "'xyqbuser' + #phone", unless = "#result == null", cacheManager = "cacheManager")
     public User findByPhoneInDb(String phone) {
@@ -345,6 +342,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
         LoginProperties loginProperties = new LoginProperties("", 3, channelId, createdFrom, appChannel, merchant.getId(), merchant.getName());
         AuthBean session = sessionService.createSession(user, loginProperties);
         session.setRegister(register);
+        lockIpv4Service.unLockPhone(phoneNo);
         return new JsonResult(session);
     }