().eq(SysSocial::getAuthId, authId));
}
}
From 717c7b2873492c87d68402af1f6d509739233751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Sun, 19 Nov 2023 21:38:24 +0800
Subject: [PATCH 12/68] =?UTF-8?q?update=20redisson=203.24.1=20=3D>=203.24.?=
=?UTF-8?q?3=20=E4=BF=AE=E5=A4=8D=E8=AE=A2=E9=98=85=E9=87=8D=E5=90=AF?=
=?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=B6=85=E6=97=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2bff3ef2..1edacc2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
5.2.3
3.3.2
5.8.22
- 3.24.1
+ 3.24.3
2.2.5
4.3.3
1.37.0
From f6252a80cd6c88d2fd69c8f5d447873c44ce2458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Tue, 21 Nov 2023 10:48:43 +0800
Subject: [PATCH 13/68] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20websocket?=
=?UTF-8?q?=20=E6=9C=8D=E5=8A=A1=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=BC=82?=
=?UTF-8?q?=E5=B8=B8=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/RemoteMessageServiceStub.java | 38 +++++++++++++++++++
.../auth/controller/TokenController.java | 7 +---
2 files changed, 40 insertions(+), 5 deletions(-)
create mode 100644 ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageServiceStub.java
diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageServiceStub.java b/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageServiceStub.java
new file mode 100644
index 00000000..813fba63
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageServiceStub.java
@@ -0,0 +1,38 @@
+package org.dromara.resource.api;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 消息服务
+ *
+ * @author Lion Li
+ */
+@Slf4j
+@RequiredArgsConstructor
+public class RemoteMessageServiceStub implements RemoteMessageService {
+
+ private final RemoteMessageService remoteMessageService;
+
+ /**
+ * 发送消息
+ *
+ * @param sessionKey session主键 一般为用户id
+ * @param message 消息文本
+ */
+ public void sendMessage(Long sessionKey, String message) {
+ try {
+ remoteMessageService.sendMessage(sessionKey, message);
+ } catch (Exception e) {
+ log.warn("websocket 功能未开启或服务未找到");
+ }
+ }
+
+ public void publishAll(String message) {
+ try {
+ remoteMessageService.publishAll(message);
+ } catch (Exception e) {
+ log.warn("websocket 功能未开启或服务未找到");
+ }
+ }
+}
diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java
index 780b0b40..7b293a82 100644
--- a/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java
@@ -65,7 +65,7 @@ public class TokenController {
private final RemoteClientService remoteClientService;
@DubboReference
private final RemoteSocialService remoteSocialService;
- @DubboReference
+ @DubboReference(stub = "true")
private final RemoteMessageService remoteMessageService;
/**
@@ -97,10 +97,7 @@ public class TokenController {
Long userId = LoginHelper.getUserId();
scheduledExecutorService.schedule(() -> {
- try {
- remoteMessageService.sendMessage(userId, "欢迎登录RuoYi-Cloud-Plus微服务管理系统");
- } catch (Exception ignored) {
- }
+ remoteMessageService.sendMessage(userId, "欢迎登录RuoYi-Cloud-Plus微服务管理系统");
}, 3, TimeUnit.SECONDS);
return R.ok(loginVo);
}
From 5f660b27d3e934a0dc0d3759fe1df5c090939d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Tue, 21 Nov 2023 14:57:22 +0800
Subject: [PATCH 14/68] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20TenantHelpe?=
=?UTF-8?q?r=20=E5=8A=A8=E6=80=81=E7=A7=9F=E6=88=B7=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E5=87=BD=E6=95=B0=E5=BC=8F=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/tenant/helper/TenantHelper.java | 61 +++++++++++++++----
1 file changed, 50 insertions(+), 11 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
index afcff36c..2ef1a220 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
@@ -1,6 +1,7 @@
package org.dromara.common.tenant.helper;
import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.convert.Convert;
import com.alibaba.ttl.TransmittableThreadLocal;
import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
@@ -13,7 +14,6 @@ import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper;
-import org.springframework.web.context.request.RequestContextHolder;
import java.util.function.Supplier;
@@ -82,10 +82,13 @@ public class TenantHelper {
/**
* 设置动态租户(一直有效 需要手动清理)
*
- * 如果为非web环境 那么只在当前线程内生效
+ * 如果为未登录状态下 那么只在当前线程内生效
*/
public static void setDynamic(String tenantId) {
- if (!isWeb()) {
+ if (!isEnable()) {
+ return;
+ }
+ if (!isLogin()) {
TEMP_DYNAMIC_TENANT.set(tenantId);
return;
}
@@ -97,10 +100,13 @@ public class TenantHelper {
/**
* 获取动态租户(一直有效 需要手动清理)
*
- * 如果为非web环境 那么只在当前线程内生效
+ * 如果为未登录状态下 那么只在当前线程内生效
*/
public static String getDynamic() {
- if (!isWeb()) {
+ if (!isEnable()) {
+ return null;
+ }
+ if (!isLogin()) {
return TEMP_DYNAMIC_TENANT.get();
}
String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
@@ -117,7 +123,10 @@ public class TenantHelper {
* 清除动态租户
*/
public static void clearDynamic() {
- if (!isWeb()) {
+ if (!isEnable()) {
+ return;
+ }
+ if (!isLogin()) {
TEMP_DYNAMIC_TENANT.remove();
return;
}
@@ -126,6 +135,34 @@ public class TenantHelper {
SaHolder.getStorage().delete(cacheKey);
}
+ /**
+ * 在动态租户中执行
+ *
+ * @param handle 处理执行方法
+ */
+ public static void dynamic(String tenantId, Runnable handle) {
+ setDynamic(tenantId);
+ try {
+ handle.run();
+ } finally {
+ clearDynamic();
+ }
+ }
+
+ /**
+ * 在动态租户中执行
+ *
+ * @param handle 处理执行方法
+ */
+ public static T dynamic(String tenantId, Supplier handle) {
+ setDynamic(tenantId);
+ try {
+ return handle.get();
+ } finally {
+ clearDynamic();
+ }
+ }
+
/**
* 获取当前租户id(动态租户优先)
*/
@@ -137,11 +174,13 @@ public class TenantHelper {
return tenantId;
}
- /**
- * 判断是否web环境
- */
- private static boolean isWeb() {
- return RequestContextHolder.getRequestAttributes() != null;
+ private static boolean isLogin() {
+ try {
+ StpUtil.checkLogin();
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
}
}
From ef4cb01d9bea184224342738c5ee8b336509c45b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Tue, 21 Nov 2023 14:57:35 +0800
Subject: [PATCH 15/68] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BD=BF?=
=?UTF-8?q?=E7=94=A8=E5=8A=A8=E6=80=81=E7=A7=9F=E6=88=B7=E9=87=8D=E6=9E=84?=
=?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=AF=B9=E7=A7=9F=E6=88=B7=E7=9A=84=E9=80=BB?=
=?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/SysOssConfigServiceImpl.java | 9 +-
.../system/dubbo/RemoteUserServiceImpl.java | 129 +++++++++---------
.../dromara/system/mapper/SysUserMapper.java | 33 +----
.../service/impl/SysConfigServiceImpl.java | 7 +-
.../resources/mapper/system/SysUserMapper.xml | 15 --
5 files changed, 69 insertions(+), 124 deletions(-)
diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java
index 55cd1f4a..39d9a4cb 100644
--- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java
@@ -57,9 +57,8 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
new LambdaQueryWrapper().orderByAsc(TenantEntity::getTenantId))
);
Map> map = StreamUtils.groupByKey(list, SysOssConfig::getTenantId);
- try {
- for (String tenantId : map.keySet()) {
- TenantHelper.setDynamic(tenantId);
+ for (String tenantId : map.keySet()) {
+ TenantHelper.dynamic(tenantId, () -> {
// 加载OSS初始化配置
for (SysOssConfig config : map.get(tenantId)) {
String configKey = config.getConfigKey();
@@ -68,9 +67,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
}
CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
}
- }
- } finally {
- TenantHelper.clearDynamic();
+ });
}
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java
index be56450e..5d4bf00d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java
@@ -45,82 +45,74 @@ public class RemoteUserServiceImpl implements RemoteUserService {
@Override
public LoginUser getUserInfo(String username, String tenantId) throws UserException {
- SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper()
- .select(SysUser::getUserName, SysUser::getStatus)
- .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
- .eq(SysUser::getUserName, username));
- if (ObjectUtil.isNull(sysUser)) {
- throw new UserException("user.not.exists", username);
- }
- if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
- throw new UserException("user.blocked", username);
- }
- // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
- // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
- if (TenantHelper.isEnable()) {
- return buildLoginUser(userMapper.selectTenantUserByUserName(username, tenantId));
- }
- return buildLoginUser(userMapper.selectUserByUserName(username));
+ return TenantHelper.dynamic(tenantId, () -> {
+ SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper()
+ .select(SysUser::getUserName, SysUser::getStatus)
+ .eq(SysUser::getUserName, username));
+ if (ObjectUtil.isNull(sysUser)) {
+ throw new UserException("user.not.exists", username);
+ }
+ if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
+ throw new UserException("user.blocked", username);
+ }
+ // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
+ // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+ return buildLoginUser(userMapper.selectUserByUserName(username));
+ });
}
@Override
public LoginUser getUserInfo(Long userId, String tenantId) throws UserException {
- SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper()
- .select(SysUser::getUserName, SysUser::getStatus)
- .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
- .eq(SysUser::getUserId, userId));
- if (ObjectUtil.isNull(sysUser)) {
- throw new UserException("user.not.exists", "");
- }
- if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
- throw new UserException("user.blocked", sysUser.getUserName());
- }
- // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
- // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
- if (TenantHelper.isEnable()) {
- return buildLoginUser(userMapper.selectTenantUserByUserName(sysUser.getUserName(), tenantId));
- }
- return buildLoginUser(userMapper.selectUserByUserName(sysUser.getUserName()));
+ return TenantHelper.dynamic(tenantId, () -> {
+ SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper()
+ .select(SysUser::getUserName, SysUser::getStatus)
+ .eq(SysUser::getUserId, userId));
+ if (ObjectUtil.isNull(sysUser)) {
+ throw new UserException("user.not.exists", "");
+ }
+ if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
+ throw new UserException("user.blocked", sysUser.getUserName());
+ }
+ // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
+ // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+ return buildLoginUser(userMapper.selectUserByUserName(sysUser.getUserName()));
+ });
}
@Override
public LoginUser getUserInfoByPhonenumber(String phonenumber, String tenantId) throws UserException {
- SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper()
- .select(SysUser::getPhonenumber, SysUser::getStatus)
- .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
- .eq(SysUser::getPhonenumber, phonenumber));
- if (ObjectUtil.isNull(sysUser)) {
- throw new UserException("user.not.exists", phonenumber);
- }
- if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
- throw new UserException("user.blocked", phonenumber);
- }
- // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
- // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
- if (TenantHelper.isEnable()) {
- return buildLoginUser(userMapper.selectTenantUserByPhonenumber(phonenumber, tenantId));
- }
- return buildLoginUser(userMapper.selectUserByPhonenumber(phonenumber));
+ return TenantHelper.dynamic(tenantId, () -> {
+ SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper()
+ .select(SysUser::getPhonenumber, SysUser::getStatus)
+ .eq(SysUser::getPhonenumber, phonenumber));
+ if (ObjectUtil.isNull(sysUser)) {
+ throw new UserException("user.not.exists", phonenumber);
+ }
+ if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
+ throw new UserException("user.blocked", phonenumber);
+ }
+ // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
+ // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+ return buildLoginUser(userMapper.selectUserByPhonenumber(phonenumber));
+ });
}
@Override
public LoginUser getUserInfoByEmail(String email, String tenantId) throws UserException {
- SysUser user = userMapper.selectOne(new LambdaQueryWrapper()
- .select(SysUser::getEmail, SysUser::getStatus)
- .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
- .eq(SysUser::getEmail, email));
- if (ObjectUtil.isNull(user)) {
- throw new UserException("user.not.exists", email);
- }
- if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
- throw new UserException("user.blocked", email);
- }
- // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
- // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
- if (TenantHelper.isEnable()) {
- return buildLoginUser(userMapper.selectTenantUserByEmail(email, tenantId));
- }
- return buildLoginUser(userMapper.selectUserByEmail(email));
+ return TenantHelper.dynamic(tenantId, () -> {
+ SysUser user = userMapper.selectOne(new LambdaQueryWrapper()
+ .select(SysUser::getEmail, SysUser::getStatus)
+ .eq(SysUser::getEmail, email));
+ if (ObjectUtil.isNull(user)) {
+ throw new UserException("user.not.exists", email);
+ }
+ if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
+ throw new UserException("user.blocked", email);
+ }
+ // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
+ // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+ return buildLoginUser(userMapper.selectUserByEmail(email));
+ });
}
@Override
@@ -151,10 +143,11 @@ public class RemoteUserServiceImpl implements RemoteUserService {
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
throw new ServiceException("当前系统没有开启注册功能");
}
- boolean exist = userMapper.exists(new LambdaQueryWrapper()
- .eq(TenantHelper.isEnable(), SysUser::getTenantId, remoteUserBo.getTenantId())
- .eq(SysUser::getUserName, sysUserBo.getUserName())
- .ne(ObjectUtil.isNotNull(sysUserBo.getUserId()), SysUser::getUserId, sysUserBo.getUserId()));
+ boolean exist = TenantHelper.dynamic(remoteUserBo.getTenantId(), () -> {
+ return userMapper.exists(new LambdaQueryWrapper()
+ .eq(SysUser::getUserName, sysUserBo.getUserName())
+ .ne(ObjectUtil.isNotNull(sysUserBo.getUserId()), SysUser::getUserId, sysUserBo.getUserId()));
+ });
if (exist) {
throw new UserException("user.register.save.error", username);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
index a4c691f6..43222253 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
@@ -1,15 +1,14 @@
package org.dromara.system.mapper;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.annotation.DataColumn;
import org.dromara.common.mybatis.annotation.DataPermission;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.vo.SysUserVo;
-import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -86,36 +85,6 @@ public interface SysUserMapper extends BaseMapperPlus {
*/
SysUserVo selectUserByEmail(String email);
- /**
- * 通过用户名查询用户(不走租户插件)
- *
- * @param userName 用户名
- * @param tenantId 租户id
- * @return 用户对象信息
- */
- @InterceptorIgnore(tenantLine = "true")
- SysUserVo selectTenantUserByUserName(@Param("userName") String userName, @Param("tenantId") String tenantId);
-
- /**
- * 通过手机号查询用户(不走租户插件)
- *
- * @param phonenumber 手机号
- * @param tenantId 租户id
- * @return 用户对象信息
- */
- @InterceptorIgnore(tenantLine = "true")
- SysUserVo selectTenantUserByPhonenumber(@Param("phonenumber") String phonenumber, @Param("tenantId") String tenantId);
-
- /**
- * 通过邮箱查询用户(不走租户插件)
- *
- * @param email 邮箱
- * @param tenantId 租户id
- * @return 用户对象信息
- */
- @InterceptorIgnore(tenantLine = "true")
- SysUserVo selectTenantUserByEmail(@Param("email") String email, @Param("tenantId") String tenantId);
-
/**
* 通过用户ID查询用户
*
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
index 26d6f3f9..7f72159f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
@@ -83,9 +83,10 @@ public class SysConfigServiceImpl implements ISysConfigService {
*/
@Override
public boolean selectRegisterEnabled(String tenantId) {
- SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper()
- .eq(SysConfig::getConfigKey, "sys.account.registerUser")
- .eq(TenantHelper.isEnable(),SysConfig::getTenantId, tenantId));
+ SysConfig retConfig = TenantHelper.dynamic(tenantId, () -> {
+ return baseMapper.selectOne(new LambdaQueryWrapper()
+ .eq(SysConfig::getConfigKey, "sys.account.registerUser"));
+ });
if (ObjectUtil.isNull(retConfig)) {
return false;
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 6d92234b..e7831fc9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -116,21 +116,6 @@
where u.del_flag = '0' and u.email = #{email}
-
-
-
-
-
-