lbqms.git - Gitblit

			@@ -34,11 +34,9 @@
			import org.dromara.common.web.config.properties.CaptchaProperties;
			import org.dromara.system.domain.SysUser;
			import org.dromara.system.domain.bo.SocialUserBo;
			import org.dromara.system.domain.bo.SysUserBo;
			import org.dromara.system.domain.vo.SocialUserVo;
			import org.dromara.system.domain.vo.SysTenantVo;
			import org.dromara.system.domain.vo.SysUserVo;
			import org.dromara.system.mapper.SocialUserMapper;
			import org.dromara.system.mapper.SysUserMapper;
			import org.dromara.system.service.ISocialUserService;
			import org.dromara.system.service.ISysPermissionService;
			@@ -66,7 +64,6 @@

			private final SysUserMapper userMapper;
			private final ISocialUserService socialUserService;
			private final ISysUserService userService;
			private final CaptchaProperties captchaProperties;
			private final ISysPermissionService permissionService;
			private final ISysTenantService tenantService;
			@@ -176,22 +173,20 @@
			* @param request Http请求对象
			* @return 统一响应实体
			*/
			public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser, HttpServletRequest request) throws IOException {
			public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser, HttpServletRequest request) {
			// 判断授权响应是否成功
			if (!authUser.ok()) {
			return R.fail("对不起，授权信息验证不通过，请退出重试！");
			}
			AuthUser authUserData = authUser.getData();
			String authId = source + authUserData.getUuid();

			SocialUserVo user = socialUserService.selectSocialUserByAuthId(authId);
			SocialUserVo user = socialUserService.selectSocialUserByAuthId(authUserData.getSource() + authUserData.getUuid());
			if (ObjectUtil.isNotNull(user)) {
			//执行登录和记录登录信息操作
			return loginAndRecord(user.getTenantId(), user.getUserName(), authUserData);
			} else {
			// 判断是否已登录
			if (LoginHelper.getUserId() == null) {
			return R.fail("授权失败，请先登录再绑定");
			return R.fail("授权失败，请先登录才能绑定");
			}
			SocialUserBo socialUserBo = new SocialUserBo();
			socialUserBo.setUserId(LoginHelper.getUserId());
			@@ -201,7 +196,6 @@
			socialUserBo.setNickName(authUserData.getNickname());
			socialUserBo.setAvatar(authUserData.getAvatar());
			socialUserBo.setOpenId(authUserData.getUuid());
			BeanUtils.copyProperties(authUserData, socialUserBo);
			BeanUtils.copyProperties(authUserData.getToken(), socialUserBo);

			socialUserService.insertByBo(socialUserBo);
			@@ -345,7 +339,7 @@

			private SysUserVo loadUserByEmail(String tenantId, String email) {
			SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
			.select(SysUser::getPhonenumber, SysUser::getStatus)
			.select(SysUser::getEmail, SysUser::getStatus)
			.eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
			.eq(SysUser::getEmail, email));
			if (ObjectUtil.isNull(user)) {
			@@ -414,25 +408,24 @@
			String errorKey = GlobalConstants.PWD_ERR_CNT_KEY + username;
			String loginFail = Constants.LOGIN_FAIL;

			// 获取用户登录错误次数(可自定义限制策略例如: key + username + ip)
			Integer errorNumber = RedisUtils.getCacheObject(errorKey);
			// 获取用户登录错误次数，默认为0 (可自定义限制策略例如: key + username + ip)
			int errorNumber = ObjectUtil.defaultIfNull(RedisUtils.getCacheObject(errorKey), 0);
			// 锁定时间内登录则踢出
			if (ObjectUtil.isNotNull(errorNumber) && errorNumber.equals(maxRetryCount)) {
			if (errorNumber >= maxRetryCount) {
			recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
			throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
			}

			if (supplier.get()) {
			// 是否第一次
			errorNumber = ObjectUtil.isNull(errorNumber) ? 1 : errorNumber + 1;
			// 错误次数递增
			errorNumber++;
			RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime));
			// 达到规定错误次数则锁定登录
			if (errorNumber.equals(maxRetryCount)) {
			RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime));
			if (errorNumber >= maxRetryCount) {
			recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
			throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
			} else {
			// 未达到规定错误次数则递增
			RedisUtils.setCacheObject(errorKey, errorNumber);
			// 未达到规定错误次数
			recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber));
			throw new UserException(loginType.getRetryLimitCount(), errorNumber);
			}