diff --git a/opsli-api/src/main/java/org/opsli/api/web/system/user/UserApi.java b/opsli-api/src/main/java/org/opsli/api/web/system/user/UserApi.java index a00250d..a15b2c5 100644 --- a/opsli-api/src/main/java/org/opsli/api/web/system/user/UserApi.java +++ b/opsli-api/src/main/java/org/opsli/api/web/system/user/UserApi.java @@ -18,10 +18,7 @@ package org.opsli.api.web.system.user; import org.opsli.api.base.result.ResultVo; import org.opsli.api.wrapper.system.menu.MenuModel; import org.opsli.api.wrapper.system.role.RoleModel; -import org.opsli.api.wrapper.system.user.UserInfo; -import org.opsli.api.wrapper.system.user.UserModel; -import org.opsli.api.wrapper.system.user.UserOrgRefWebModel; -import org.opsli.api.wrapper.system.user.UserPassword; +import org.opsli.api.wrapper.system.user.*; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -108,7 +105,7 @@ public interface UserApi { * @return ResultVo */ @PostMapping("/updatePasswordById") - ResultVo updatePasswordById(@RequestBody UserPassword userPassword); + ResultVo updatePasswordById(@RequestBody ToUserPassword userPassword); /** * 重置密码 ID @@ -244,6 +241,21 @@ public interface UserApi { void importTemplate(HttpServletResponse response); + /** + * 切换租户 + * @param tenantId 租户ID + * @return ResultVo + */ + @PostMapping("/switchTenant") + ResultVo switchTenant(String tenantId); + + /** + * 切换回自己账户 + * @return ResultVo + */ + @PostMapping("/switchOneself") + ResultVo switchOneself(); + /** * 根据 username 获得用户 * @param username 用户名 diff --git a/opsli-api/src/main/java/org/opsli/api/wrapper/system/role/RoleModel.java b/opsli-api/src/main/java/org/opsli/api/wrapper/system/role/RoleModel.java index 204e678..7b0f704 100644 --- a/opsli-api/src/main/java/org/opsli/api/wrapper/system/role/RoleModel.java +++ b/opsli-api/src/main/java/org/opsli/api/wrapper/system/role/RoleModel.java @@ -52,14 +52,6 @@ public class RoleModel extends ApiWrapper { @ValidatorLenMax(50) private String roleName; - /** 是否内置数据 0否 1是*/ - @ApiModelProperty(value = "是否内置数据 0否 1是") - @ExcelProperty(value = "是否内置数据", order = 3) - @ExcelInfo(dictType = "no_yes") - @Validator({ValidatorType.IS_NOT_NULL}) - @ValidatorLenMax(1) - private String izLock; - /** 标签 */ @ApiModelProperty(value = "标签") @ExcelProperty(value = "标签", order = 4) diff --git a/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/ToUserPassword.java b/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/ToUserPassword.java new file mode 100644 index 0000000..6230203 --- /dev/null +++ b/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/ToUserPassword.java @@ -0,0 +1,67 @@ +/** + * Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.opsli.api.wrapper.system.user; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.opsli.common.annotation.validator.Validator; +import org.opsli.common.annotation.validator.ValidatorLenMax; +import org.opsli.common.annotation.validator.ValidatorLenMin; +import org.opsli.common.enums.ValidatorType; + +import java.io.Serializable; + +/** + * 用户 修改密码 + * + * @author Parker + * @date 2020-09-16 17:33 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ExcelIgnoreUnannotated +public class ToUserPassword implements Serializable { + + private static final long serialVersionUID = 1L; + + /** User Id */ + @ApiModelProperty(value = "用户Id") + private String userId; + + /** 新密码 */ + @ApiModelProperty(value = "新密码") + @Validator({ValidatorType.IS_NOT_NULL, ValidatorType.IS_SECURITY_PASSWORD}) + @ValidatorLenMin(6) + @ValidatorLenMax(50) + private String newPassword; + + /** 盐值，密码秘钥 前端不可改*/ + @ApiModelProperty(value = "盐值，密码秘钥 前端不可改") + @ExcelIgnore + @ValidatorLenMax(50) + private String salt; + + /** 登录密码强度 前端不可改 */ + @ApiModelProperty(value = "登录密码强度 前端不可改") + @ExcelIgnore + @ValidatorLenMin(1) + @ValidatorLenMax(1) + private String passwordLevel; + +} diff --git a/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserInfo.java b/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserInfo.java index 5dbd050..ee730e4 100644 --- a/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserInfo.java +++ b/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserInfo.java @@ -15,7 +15,9 @@ */ package org.opsli.api.wrapper.system.user; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -103,4 +105,16 @@ public class UserInfo extends ApiWrapper { @ApiModelProperty(value = "多租户ID") private String tenantId; + /** 允许切换租户（0 不允许 1 允许） */ + @ApiModelProperty(value = "是否允许切换运营商") + private String enableSwitchTenant; + + /** 切换后的租户id*/ + @ApiModelProperty(value = "切换后的租户id") + private String switchTenantId; + + /** 切换后的租户管理员*/ + @ApiModelProperty(value = "切换后的租户管理员") + private String switchTenantUserId; + } diff --git a/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserModel.java b/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserModel.java index 113b8d8..31774ef 100644 --- a/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserModel.java +++ b/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserModel.java @@ -43,7 +43,7 @@ public class UserModel extends ApiWrapper { @ExcelIgnore @Validator({ValidatorType.IS_NOT_NULL, ValidatorType.IS_GENERAL}) @ValidatorLenMax(32) - @ValidatorLenMin(5) + @ValidatorLenMin(4) private String username; /** 登录密码 */ @@ -163,5 +163,4 @@ public class UserModel extends ApiWrapper { @ExcelIgnore private String switchTenantUserId; - } diff --git a/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserWebModel.java b/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserWebModel.java index 7d16fa4..531f168 100644 --- a/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserWebModel.java +++ b/opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserWebModel.java @@ -37,6 +37,10 @@ import org.opsli.plugins.excel.annotation.ExcelInfo; @EqualsAndHashCode(callSuper = false) public class UserWebModel extends ApiWrapper { + /** 角色名称 */ + @ApiModelProperty(value = "角色名称") + @ExcelIgnore + private String roleNames; /** 登录账户 */ @ApiModelProperty(value = "登录账户") @@ -137,4 +141,8 @@ public class UserWebModel extends ApiWrapper { @ValidatorLenMax(20) private String tenantId; + /** 允许切换租户（0 不允许 1 允许） */ + @ApiModelProperty(value = "是否允许切换运营商") + private String enableSwitchTenant; + } diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/interceptor/MybatisAutoFillInterceptor.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/interceptor/MybatisAutoFillInterceptor.java index fd25dff..e6bf275 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/interceptor/MybatisAutoFillInterceptor.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/interceptor/MybatisAutoFillInterceptor.java @@ -28,10 +28,8 @@ import org.apache.ibatis.executor.Executor; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlCommandType; import org.apache.ibatis.plugin.*; -import org.opsli.api.wrapper.system.org.SysOrgModel; import org.opsli.api.wrapper.system.user.UserOrgRefModel; import org.opsli.common.constants.MyBatisConstants; -import org.opsli.core.utils.UserTokenUtil; import org.opsli.core.utils.UserUtil; import org.springframework.stereotype.Component; @@ -147,7 +145,7 @@ public class MybatisAutoFillInterceptor implements Interceptor { // 如果创建人 为空则进行默认赋值 Object createValue = ReflectUtil.getFieldValue(arg, f.getName()); if(StringUtils.isBlank(Convert.toStr(createValue))){ - BeanUtil.setProperty(arg, MyBatisConstants.FIELD_CREATE_BY, UserTokenUtil.getUserIdByToken()); + BeanUtil.setProperty(arg, MyBatisConstants.FIELD_CREATE_BY, UserUtil.getUser().getId()); } break; // 更新人 @@ -155,7 +153,7 @@ public class MybatisAutoFillInterceptor implements Interceptor { // 如果更新人 为空则进行默认赋值 Object updateValue = ReflectUtil.getFieldValue(arg, f.getName()); if(StringUtils.isBlank(Convert.toStr(updateValue))){ - BeanUtil.setProperty(arg, MyBatisConstants.FIELD_UPDATE_BY, UserTokenUtil.getUserIdByToken()); + BeanUtil.setProperty(arg, MyBatisConstants.FIELD_UPDATE_BY, UserUtil.getUser().getId()); } break; // 创建日期 @@ -180,7 +178,7 @@ public class MybatisAutoFillInterceptor implements Interceptor { // 如果租户ID 为空则进行默认赋值 Object tenantValue = ReflectUtil.getFieldValue(arg, f.getName()); if(StringUtils.isBlank(Convert.toStr(tenantValue))){ - BeanUtil.setProperty(arg, MyBatisConstants.FIELD_TENANT, UserTokenUtil.getTenantIdByToken()); + BeanUtil.setProperty(arg, MyBatisConstants.FIELD_TENANT, UserUtil.getTenantId()); } break; // 组织机构设置 @@ -189,7 +187,7 @@ public class MybatisAutoFillInterceptor implements Interceptor { Object orgValue = ReflectUtil.getFieldValue(arg, f.getName()); if(StringUtils.isBlank(Convert.toStr(orgValue))){ UserOrgRefModel userOrgRefModel = - UserUtil.getUserDefOrgByUserId(UserTokenUtil.getUserIdByToken()); + UserUtil.getUserDefOrgByUserId(UserUtil.getUser().getId()); if(null != userOrgRefModel){ String orgIds = userOrgRefModel.getOrgIds(); BeanUtil.setProperty(arg, MyBatisConstants.FIELD_ORG_GROUP, orgIds); @@ -257,7 +255,7 @@ public class MybatisAutoFillInterceptor implements Interceptor { // 如果更新人 为空则进行默认赋值 Object updateValue = ReflectUtil.getFieldValue(arg, f.getName()); if(StringUtils.isBlank(Convert.toStr(updateValue))){ - BeanUtil.setProperty(arg, MyBatisConstants.FIELD_UPDATE_BY, UserTokenUtil.getUserIdByToken()); + BeanUtil.setProperty(arg, MyBatisConstants.FIELD_UPDATE_BY, UserUtil.getUser().getId()); } break; // 更新日期 diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/chain/QueryDataPermsHandler.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/chain/QueryDataPermsHandler.java index e6eaabe..2d4862c 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/chain/QueryDataPermsHandler.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/chain/QueryDataPermsHandler.java @@ -107,9 +107,7 @@ public class QueryDataPermsHandler implements QueryBuilderChain{ // 1. 当前用户 UserModel currUser = UserUtil.getUser(); - String userId = StringUtils.isNotEmpty(currUser.getSwitchTenantUserId()) - ? currUser.getSwitchTenantUserId() - : currUser.getId(); + String userId = currUser.getId(); // 2. 当前用户 组织机构集合 diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/chain/QueryTenantHandler.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/chain/QueryTenantHandler.java index a9cfc9f..ddfd37b 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/chain/QueryTenantHandler.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/chain/QueryTenantHandler.java @@ -62,9 +62,7 @@ public class QueryTenantHandler implements QueryBuilderChain{ UserModel currUser = UserUtil.getUser(); // 切换运营商后 组织ID 不同 - String tenantId = StringUtils.isNotEmpty(currUser.getSwitchTenantId()) - ? currUser.getSwitchTenantId() - : currUser.getTenantId(); + String tenantId = currUser.getTenantId(); wrapper.eq(FieldUtil.humpToUnderline(MyBatisConstants.FIELD_TENANT), tenantId); } @@ -84,9 +82,7 @@ public class QueryTenantHandler implements QueryBuilderChain{ UserModel currUser = UserUtil.getUser(); // 切换运营商后 组织ID 不同 - String tenantId = StringUtils.isNotEmpty(currUser.getSwitchTenantId()) - ? currUser.getSwitchTenantId() - : currUser.getTenantId(); + String tenantId = currUser.getTenantId(); String fieldName = webQueryConf.get(MyBatisConstants.FIELD_TENANT); if(StringUtils.isEmpty(fieldName)){ @@ -94,6 +90,7 @@ public class QueryTenantHandler implements QueryBuilderChain{ } wrapper.eq(fieldName, tenantId); } + return wrapper; } diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/conf/WebQueryConf.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/conf/WebQueryConf.java index e520b3e..9b18b99 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/conf/WebQueryConf.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/persistence/querybuilder/conf/WebQueryConf.java @@ -42,11 +42,20 @@ public class WebQueryConf { * @param fieldFn 字段 * @param value 值 */ - public void pub(FieldUtil.SFunction fieldFn, String value){ + public void pub(FieldUtil.SFunction fieldFn, String value){ String fileName = FieldUtil.getFileName(fieldFn); queryMap.putIfAbsent(fileName, value); } + /** + * 存放 + * @param fileName 字段 + * @param value 值 + */ + public void pub(String fileName, String value){ + queryMap.putIfAbsent(fileName, value); + } + /** * 获取 * @param field 字段 diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java index 841d413..9cecacd 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java @@ -108,6 +108,34 @@ public class UserUtil { // Token失效，请重新登录 throw new TokenException(TokenMsg.EXCEPTION_TOKEN_LOSE_EFFICACY); } + + return user; + } + + /** + * 获得当前系统登陆用户 + * @return UserModel + */ + public static UserModel getUserBySource(){ + // 判断 工具类是否初始化完成 + ThrowExceptionUtil.isThrowException(!IS_INIT, + CoreMsg.OTHER_EXCEPTION_UTILS_INIT); + + String token = TokenThreadLocal.get(); + + // 如果还是没获取到token 则抛出异常 + if(StringUtils.isEmpty(token)){ + // Token失效，请重新登录 + throw new TokenException(TokenMsg.EXCEPTION_TOKEN_LOSE_EFFICACY); + } + + String userId = UserTokenUtil.getUserIdByToken(token); + UserModel user = getUserBySource(userId); + if(user == null){ + // Token失效，请重新登录 + throw new TokenException(TokenMsg.EXCEPTION_TOKEN_LOSE_EFFICACY); + } + return user; } @@ -117,6 +145,25 @@ public class UserUtil { * @return UserModel */ public static UserModel getUser(String userId){ + return getUser(userId, false); + } + + /** + * 根据ID 获得用户 (不会去递归查找用户) + * @param userId 用户ID + * @return UserModel + */ + public static UserModel getUserBySource(String userId){ + return getUser(userId, true); + } + + /** + * 根据ID 获得用户 + * @param userId 用户ID + * @param isRecursion 是否递归触发 + * @return UserModel + */ + private static UserModel getUser(String userId, boolean isRecursion){ // 判断 工具类是否初始化完成 ThrowExceptionUtil.isThrowException(!IS_INIT, CoreMsg.OTHER_EXCEPTION_UTILS_INIT); @@ -127,6 +174,14 @@ public class UserUtil { // 先从缓存里拿 UserModel userModel = CacheUtil.getTimed(UserModel.class, cacheKey); if (userModel != null){ + // 如果不是递归触发 可进入一次 + if(!isRecursion){ + // 如果是 切换租户权限 则进行新一轮判断 + // 注意不要陷入递归死循环 只保障循环一次 + if (StringUtils.isNotBlank(userModel.getSwitchTenantUserId())){ + userModel = getUser(userModel.getSwitchTenantUserId(), true); + } + } return userModel; } @@ -176,6 +231,15 @@ public class UserUtil { return null; } + // 如果不是递归触发 可进入一次 + if(!isRecursion){ + // 如果是 切换租户权限 则进行新一轮判断 + // 注意不要陷入递归死循环 只保障循环一次 + if (StringUtils.isNotBlank(userModel.getSwitchTenantUserId())){ + userModel = getUser(userModel.getSwitchTenantUserId(), true); + } + } + return userModel; } @@ -253,6 +317,13 @@ public class UserUtil { ThrowExceptionUtil.isThrowException(!IS_INIT, CoreMsg.OTHER_EXCEPTION_UTILS_INIT); + // 处理 切换租户 + UserModel currUser = getUser(userId); + if (null != currUser && + StringUtils.isNotBlank(currUser.getSwitchTenantUserId())){ + userId = currUser.getSwitchTenantUserId(); + } + // 缓存Key String cacheKey = PREFIX_ID_ROLES + userId; @@ -321,6 +392,13 @@ public class UserUtil { ThrowExceptionUtil.isThrowException(!IS_INIT, CoreMsg.OTHER_EXCEPTION_UTILS_INIT); + // 处理 切换租户 + UserModel currUser = getUser(userId); + if (null != currUser && + StringUtils.isNotBlank(currUser.getSwitchTenantUserId())){ + userId = currUser.getSwitchTenantUserId(); + } + // 缓存Key String cacheKey = PREFIX_ID_PERMISSIONS + userId; @@ -388,6 +466,13 @@ public class UserUtil { ThrowExceptionUtil.isThrowException(!IS_INIT, CoreMsg.OTHER_EXCEPTION_UTILS_INIT); + // 处理 切换租户 + UserModel currUser = getUser(userId); + if (null != currUser && + StringUtils.isNotBlank(currUser.getSwitchTenantUserId())){ + userId = currUser.getSwitchTenantUserId(); + } + // 缓存Key String cacheKey = PREFIX_ID_ORGS + userId; @@ -469,6 +554,13 @@ public class UserUtil { ThrowExceptionUtil.isThrowException(!IS_INIT, CoreMsg.OTHER_EXCEPTION_UTILS_INIT); + // 处理 切换租户 + UserModel currUser = getUser(userId); + if (null != currUser && + StringUtils.isNotBlank(currUser.getSwitchTenantUserId())){ + userId = currUser.getSwitchTenantUserId(); + } + // 缓存Key String cacheKey = PREFIX_ID_MENUS + userId; @@ -538,6 +630,13 @@ public class UserUtil { ThrowExceptionUtil.isThrowException(!IS_INIT, CoreMsg.OTHER_EXCEPTION_UTILS_INIT); + // 处理 切换租户 + UserModel currUser = getUser(userId); + if (null != currUser && + StringUtils.isNotBlank(currUser.getSwitchTenantUserId())){ + userId = currUser.getSwitchTenantUserId(); + } + // 缓存Key String cacheKey = PREFIX_ID_DEF_ROLE + userId; @@ -603,6 +702,13 @@ public class UserUtil { ThrowExceptionUtil.isThrowException(!IS_INIT, CoreMsg.OTHER_EXCEPTION_UTILS_INIT); + // 处理 切换租户 + UserModel currUser = getUser(userId); + if (null != currUser && + StringUtils.isNotBlank(currUser.getSwitchTenantUserId())){ + userId = currUser.getSwitchTenantUserId(); + } + // 缓存Key String cacheKey = PREFIX_ID_DEF_ORG + userId; @@ -718,8 +824,10 @@ public class UserUtil { return true; } - UserModel userModelById = CacheUtil.getTimed(UserModel.class, PREFIX_ID + user.getId()); - UserModel userModelByUsername = CacheUtil.getTimed(UserModel.class, PREFIX_USERNAME + user.getUsername()); + UserModel userModelById = CacheUtil.getTimed( + UserModel.class, PREFIX_ID + user.getId()); + UserModel userModelByUsername = CacheUtil.getTimed( + UserModel.class, PREFIX_USERNAME + user.getUsername()); boolean hasNilFlagById = CacheUtil.hasNilFlag(PREFIX_ID + user.getId()); boolean hasNilFlagByName = CacheUtil.hasNilFlag(PREFIX_USERNAME + user.getUsername()); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/entity/SysRole.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/entity/SysRole.java index 90a83f5..54009f1 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/entity/SysRole.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/entity/SysRole.java @@ -39,9 +39,6 @@ public class SysRole extends BaseEntity { /** 角色名称 */ private String roleName; - /** 是否内置数据 0否 1是 */ - private String izLock; - /** 标签 */ private String label; diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/mapper/RoleMapper.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/mapper/RoleMapper.java index 85ea10f..8875598 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/mapper/RoleMapper.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/mapper/RoleMapper.java @@ -15,10 +15,8 @@ */ package org.opsli.modulars.system.role.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import org.opsli.modulars.system.role.entity.SysRole; diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleMenuRefRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleMenuRefRestController.java index 3a1e6c6..ad9233e 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleMenuRefRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleMenuRefRestController.java @@ -23,7 +23,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.opsli.api.base.result.ResultVo; import org.opsli.api.web.system.role.RoleMenuRefApi; import org.opsli.api.wrapper.system.role.RoleMenuRefModel; -import org.opsli.api.wrapper.system.role.RoleModel; import org.opsli.api.wrapper.system.user.UserModel; import org.opsli.common.annotation.ApiRestController; import org.opsli.common.annotation.EnableLog; @@ -34,7 +33,6 @@ import org.opsli.core.utils.UserUtil; import org.opsli.modulars.system.SystemMsg; import org.opsli.modulars.system.menu.entity.SysMenu; import org.opsli.modulars.system.role.service.IRoleMenuRefService; -import org.opsli.modulars.system.role.service.IRoleService; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; @@ -53,15 +51,10 @@ import java.util.stream.Collectors; @ApiRestController("/system/role/perms") public class RoleMenuRefRestController implements RoleMenuRefApi { - /** 内置数据 */ - private static final String LOCK_DATA = "1"; - /** 配置类 */ @Autowired protected GlobalProperties globalProperties; - @Autowired - private IRoleService iRoleService; @Autowired private IRoleMenuRefService iRoleMenuRefService; @@ -114,16 +107,6 @@ public class RoleMenuRefRestController implements RoleMenuRefApi { return ResultVo.error("设置权限失败"); } - RoleModel roleModel = iRoleService.get(model.getRoleId()); - // 内置数据 只有超级管理员可以修改 - if(roleModel != null && LOCK_DATA.equals(roleModel.getIzLock()) ){ - UserModel user = UserUtil.getUser(); - if(!StringUtils.equals(UserUtil.SUPER_ADMIN, user.getUsername())){ - throw new ServiceException(SystemMsg.EXCEPTION_LOCK_DATA); - } - } - - boolean ret = iRoleMenuRefService.setPerms(model.getRoleId(), model.getPermsIds()); if(ret){ diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleRestController.java index eebfa70..8c900b0 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleRestController.java @@ -21,25 +21,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.opsli.api.base.result.ResultVo; import org.opsli.api.web.system.role.RoleApi; import org.opsli.api.wrapper.system.role.RoleModel; -import org.opsli.api.wrapper.system.user.UserModel; import org.opsli.common.annotation.ApiRestController; import org.opsli.common.annotation.EnableLog; import org.opsli.common.annotation.RequiresPermissionsCus; -import org.opsli.common.constants.MyBatisConstants; -import org.opsli.common.exception.ServiceException; -import org.opsli.common.utils.FieldUtil; import org.opsli.core.base.controller.BaseRestController; import org.opsli.core.persistence.Page; -import org.opsli.core.persistence.querybuilder.GenQueryBuilder; import org.opsli.core.persistence.querybuilder.QueryBuilder; import org.opsli.core.persistence.querybuilder.WebQueryBuilder; -import org.opsli.core.utils.UserUtil; -import org.opsli.modulars.system.SystemMsg; import org.opsli.modulars.system.role.entity.SysRole; import org.opsli.modulars.system.role.service.IRoleService; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -47,7 +39,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Method; -import java.util.List; /** @@ -62,9 +53,6 @@ import java.util.List; public class RoleRestController extends BaseRestController implements RoleApi { - /** 内置数据 */ - private static final String LOCK_DATA = "1"; - /** * 角色 查一条 * @param model 模型 @@ -131,18 +119,6 @@ public class RoleRestController extends BaseRestController queryBuilder = new GenQueryBuilder<>(); - QueryWrapper wrapper = queryBuilder.build(); - List idList = Convert.toList(String.class,idArray); - - wrapper.in(MyBatisConstants.FIELD_ID, idList); - List roleList = IService.findList(wrapper); - for (SysRole sysRole : roleList) { - // 内置数据 只有超级管理员可以修改 - if(sysRole != null && LOCK_DATA.equals(sysRole.getIzLock()) ){ - UserModel user = UserUtil.getUser(); - if(!StringUtils.equals(UserUtil.SUPER_ADMIN, user.getUsername())){ - throw new ServiceException(SystemMsg.EXCEPTION_LOCK_DATA); - } - } - } - } - IService.deleteAll(idArray); return ResultVo.success("批量删除角色成功"); } diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/entity/SysUser.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/entity/SysUser.java index faf0d12..3df08ae 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/entity/SysUser.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/entity/SysUser.java @@ -82,6 +82,9 @@ public class SysUser extends BaseEntity { /** 是否租户管理员 */ private String izTenantAdmin; + /** 允许切换租户（0 不允许 1 允许） */ + private String enableSwitchTenant; + // ======================================== /** 逻辑删除字段 */ diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/entity/SysUserWeb.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/entity/SysUserWeb.java index 4f89348..1274e95 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/entity/SysUserWeb.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/entity/SysUserWeb.java @@ -32,6 +32,8 @@ import org.opsli.core.base.entity.BaseEntity; @EqualsAndHashCode(callSuper = false) public class SysUserWeb extends BaseEntity { + /** 角色名称 */ + private String roleNames; /** 登录账户 */ private String username; @@ -76,6 +78,9 @@ public class SysUserWeb extends BaseEntity { @TableField(updateStrategy = FieldStrategy.IGNORED) private String sign; + /** 允许切换租户（0 不允许 1 允许） */ + private String enableSwitchTenant; + // ======================================== /** 逻辑删除字段 */ diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/xml/UserMapper.xml b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/xml/UserMapper.xml index af1807f..5983447 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/xml/UserMapper.xml +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/xml/UserMapper.xml @@ -19,6 +19,7 @@ a.login_ip as loginIp, a.remark as remark, a.tenant_id as tenantId, + a.enable_switch_tenant as enableSwitchTenant, a.create_by as createBy, a.create_time as createTime, @@ -29,16 +30,19 @@ + GROUP_CONCAT(r.role_name) as roleNames, left join sys_user_org_ref b on b.user_id = a.id + left join sys_user_role_ref c on c.user_id = a.id + left join sys_role r on r.id = c.role_id