From fa81755e25911757b1a72644f51505b914df2430 Mon Sep 17 00:00:00 2001 From: huk Date: Sat, 20 Sep 2025 15:00:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(tenant):=20=E6=9B=B4=E6=96=B0=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E5=8F=8A=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 TenantType 枚举中的“达人”修改为“团长”，并同步更新注释描述。 refactor(exception): 统一系统异常返回信息全局异常处理器中，针对 ServletException、RuntimeException 和 Exception 的处理方法返回统一的错误提示：“系统异常，请联系管理员”。 refactor(tenant):优化租户用户名存在性校验逻辑 --- .../org/dromara/common/core/enums/TenantType.java | 4 ++-- .../common/web/handler/GlobalExceptionHandler.java | 6 +++--- .../system/service/impl/SysTenantServiceImpl.java | 14 +++++--------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantType.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantType.java index 9ead9dbab..348b7575f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantType.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantType.java @@ -4,7 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * 租户类型枚举 2->商家,3->代理,4->平台,5->达人 + * 租户类型枚举 2->商家,3->代理,4->平台,5->团长 */ @Getter @AllArgsConstructor @@ -13,7 +13,7 @@ public enum TenantType { MERCHANT(2, "商家"), AGENT(3, "代理"), PLATFORM(4, "平台"), - REFERENCE(5, "达人"); + REFERENCE(5, "团长"); private final int type; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java index 0a60fbcc7..d96cd1ca7 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java @@ -74,7 +74,7 @@ public class GlobalExceptionHandler { public R handleServletException(ServletException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',发生未知异常.", requestURI, e); - return R.fail(e.getMessage()); + return R.fail("系统异常，请联系管理员"); } /** @@ -137,7 +137,7 @@ public class GlobalExceptionHandler { public R handleRuntimeException(RuntimeException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',发生未知异常.", requestURI, e); - return R.fail(e.getMessage()); + return R.fail("系统异常，请联系管理员"); } /** @@ -147,7 +147,7 @@ public class GlobalExceptionHandler { public R handleException(Exception e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',发生系统异常.", requestURI, e); - return R.fail(e.getMessage()); + return R.fail("系统异常，请联系管理员"); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index b66649b83..d95319f17 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -74,6 +74,7 @@ public class SysTenantServiceImpl implements ISysTenantService { private final SysDictTypeMapper dictTypeMapper; private final SysDictDataMapper dictDataMapper; private final SysConfigMapper configMapper; + private final SysUserMapper sysUserMapper; /** * 查询租户 @@ -224,15 +225,10 @@ public class SysTenantServiceImpl implements ISysTenantService { // 检查用户名是否已存在 String username = bo.getUsername(); if (StringUtils.isNotBlank(username)) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysTenantExtend::getUsername, username); - Long count = tenantExtendMapper.selectCount(queryWrapper); - - if (count > 0) { - throw new ServiceException("用户名已存在，请更换其他用户名"); - }else{ - tenantExtend.setUsername(username); - } + Long count1 = tenantExtendMapper.selectCount(Wrappers.lambdaQuery(SysTenantExtend.class).eq(SysTenantExtend::getUsername, username)); + Long count2 = sysUserMapper.selectCount(Wrappers.lambdaQuery(SysUser.class).eq(SysUser::getUserName, username)); + Assert.isTrue(count1 == 0 && count2 == 0, () -> new ServiceException("用户名已存在，请更换其他用户名")); + tenantExtend.setUsername(username); } tenantExtend.setPassword(bo.getPassword()); tenantExtend.setPackageId(bo.getPackageId());