From 69efc3261e6f6e4dca268fb2de9866d8f2a14952 Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期一, 21 四月 2025 09:44:09 +0800
Subject: [PATCH] Merge branch 'dev'
---
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java
index 017388c..d2558b6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java
@@ -1,7 +1,6 @@
package org.ruoyi.system.service;
import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.api.WxMaUserService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
import cn.dev33.satoken.exception.NotLoginException;
@@ -10,6 +9,10 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.lang3.math.NumberUtils;
import org.ruoyi.common.core.constant.Constants;
import org.ruoyi.common.core.constant.GlobalConstants;
import org.ruoyi.common.core.constant.TenantConstants;
@@ -28,23 +31,19 @@
import org.ruoyi.common.satoken.utils.LoginHelper;
import org.ruoyi.common.tenant.exception.TenantException;
import org.ruoyi.common.tenant.helper.TenantHelper;
-import org.ruoyi.common.wechat.web.utils.UUIDShortUtil;
import org.ruoyi.system.domain.SysUser;
import org.ruoyi.system.domain.bo.SysUserBo;
import org.ruoyi.system.domain.vo.LoginVo;
import org.ruoyi.system.domain.vo.SysTenantVo;
import org.ruoyi.system.domain.vo.SysUserVo;
import org.ruoyi.system.mapper.SysUserMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
-import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.time.Duration;
import java.util.Date;
import java.util.List;
+import java.util.UUID;
import java.util.function.Supplier;
/**
@@ -58,14 +57,14 @@
public class SysLoginService {
private final SysUserMapper userMapper;
+ private final WxMaService wxMaService;
private final ISysPermissionService permissionService;
private final ISysTenantService tenantService;
- private final WxMaService wxMaService;
private final ISysUserService userService;
private final ConfigService configService;
+
@Value("${user.password.maxRetryCount}")
private Integer maxRetryCount;
-
@Value("${user.password.lockTime}")
private Integer lockTime;
@@ -172,8 +171,7 @@
if (ObjectUtil.isNull(user)) {
SysUserBo sysUser = new SysUserBo();
// 鏀逛负鑷
- String name = "鐢ㄦ埛" + UUIDShortUtil.generateShortUuid();
- ;
+ String name = "鐢ㄦ埛" + UUID.randomUUID().toString().replace("-", "");
// 璁剧疆榛樿鐢ㄦ埛鍚�
sysUser.setUserName(name);
// 璁剧疆榛樿鏄电О
--
Gitblit v1.9.3