From d1b6a13a58afa4e03f4d6cb0a62cd759ccf306f4 Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期二, 04 三月 2025 10:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 9caac08..29f9616 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
@@ -27,6 +27,7 @@
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;
@@ -43,7 +44,6 @@
import java.time.Duration;
import java.util.Date;
import java.util.List;
-import java.util.UUID;
import java.util.function.Supplier;
/**
@@ -159,7 +159,7 @@
if (ObjectUtil.isNull(user)) {
SysUserBo sysUser = new SysUserBo();
// 鏀逛负鑷
- String name = "鐢ㄦ埛" + UUID.randomUUID();
+ String name = "鐢ㄦ埛" + UUIDShortUtil.generateShortUuid();;
// 璁剧疆榛樿鐢ㄦ埛鍚�
sysUser.setUserName(name);
// 璁剧疆榛樿鏄电О
--
Gitblit v1.9.3