opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-21 02:25:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 优化 调整 bo 实体不允许传入租户ID 防止数据注入

Browse Source
This commit is contained in:
疯狂的狮子li 2023-02-09 14:30:10 +08:00
parent ea8839b196
commit 5612a6d0c9
10 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java
View File

@ -51,7 +51,6 @@ public class SysRegisterService {
validateCaptcha(tenantId, username, registerBody.getCode(), registerBody.getUuid(), request); validateCaptcha(tenantId, username, registerBody.getCode(), registerBody.getUuid(), request);
} }
SysUserBo sysUser = new SysUserBo(); SysUserBo sysUser = new SysUserBo();
sysUser.setTenantId(tenantId);
sysUser.setUserName(username); sysUser.setUserName(username);
sysUser.setNickName(username); sysUser.setNickName(username);
sysUser.setPassword(BCrypt.hashpw(password)); sysUser.setPassword(BCrypt.hashpw(password));
@ -60,7 +59,7 @@ public class SysRegisterService {
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(sysUser))) { if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(sysUser))) {
throw new UserException("user.register.save.error", username); throw new UserException("user.register.save.error", username);
} }
boolean regFlag = userService.registerUser(sysUser); boolean regFlag = userService.registerUser(sysUser, tenantId);
if (!regFlag) { if (!regFlag) {
throw new UserException("user.register.error"); throw new UserException("user.register.error");
} }

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.domain.bo;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.mybatis.core.domain.TenantEntity; import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class SysDeptBo extends TenantEntity { public class SysDeptBo extends BaseEntity {
/** /**
* 部门id * 部门id

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysNoticeBo.java
View File

@ -3,7 +3,7 @@ package com.ruoyi.system.domain.bo;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.xss.Xss; import com.ruoyi.common.core.xss.Xss;
import com.ruoyi.common.mybatis.core.domain.TenantEntity; import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class SysNoticeBo extends TenantEntity { public class SysNoticeBo extends BaseEntity {
/** /**
* 公告ID * 公告ID

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system.domain.bo; package com.ruoyi.system.domain.bo;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.TenantEntity; import com.ruoyi.common.mybatis.core.domain.TenantEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -11,7 +12,7 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class SysOssBo extends TenantEntity { public class SysOssBo extends BaseEntity {
/** /**
* ossId * ossId

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.system.domain.bo;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.TenantEntity; import com.ruoyi.common.mybatis.core.domain.TenantEntity;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@ -19,7 +20,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class SysOssConfigBo extends TenantEntity { public class SysOssConfigBo extends BaseEntity {
/** /**
* 主建 * 主建

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysPostBo.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.system.domain.bo;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.mybatis.core.domain.TenantEntity; import com.ruoyi.common.mybatis.core.domain.TenantEntity;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@ -17,7 +18,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class SysPostBo extends TenantEntity { public class SysPostBo extends BaseEntity {
/** /**
* 岗位ID * 岗位ID

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysRoleBo.java
View File

@ -3,7 +3,7 @@ package com.ruoyi.system.domain.bo;
import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.mybatis.core.domain.TenantEntity; import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
@ -20,7 +20,7 @@ import lombok.NoArgsConstructor;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class SysRoleBo extends TenantEntity { public class SysRoleBo extends BaseEntity {
/** /**
* 角色ID * 角色ID

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.domain.bo;
import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.xss.Xss; import com.ruoyi.common.core.xss.Xss;
import com.ruoyi.common.mybatis.core.domain.TenantEntity; import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import com.ruoyi.common.sensitive.annotation.Sensitive; import com.ruoyi.common.sensitive.annotation.Sensitive;
import com.ruoyi.common.sensitive.core.SensitiveStrategy; import com.ruoyi.common.sensitive.core.SensitiveStrategy;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
@ -23,7 +23,7 @@ import java.util.Date;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class SysUserBo extends TenantEntity { public class SysUserBo extends BaseEntity {
/** /**
* 用户ID * 用户ID

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View File

@ -133,7 +133,7 @@ public interface ISysUserService {
* @param user 用户信息 * @param user 用户信息
* @return 结果 * @return 结果
*/ */
boolean registerUser(SysUserBo user); boolean registerUser(SysUserBo user, String tenantId);
/** /**
* 修改用户信息 * 修改用户信息

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -298,10 +298,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean registerUser(SysUserBo user) { public boolean registerUser(SysUserBo user, String tenantId) {
user.setCreateBy(user.getUserId()); user.setCreateBy(user.getUserId());
user.setUpdateBy(user.getUserId()); user.setUpdateBy(user.getUserId());
SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class); SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
sysUser.setTenantId(tenantId);
return baseMapper.insert(sysUser) > 0; return baseMapper.insert(sysUser) > 0;
} }