diff --git a/README.md b/README.md index 8b1a0e8..7823564 100644 --- a/README.md +++ b/README.md @@ -62,11 +62,21 @@ SpringBlade ## 技术文档 * [SpringBlade开发手册](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade开发手册) +# 开源协议 +Apache Licence 2.0 （[英文原文](http://www.apache.org/licenses/LICENSE-2.0.html)） +Apache Licence是著名的非盈利开源组织Apache采用的协议。该协议和BSD类似，同样鼓励代码共享和尊重原作者的著作权，同样允许代码修改，再发布（作为开源或商业软件）。 +需要满足的条件如下： +* 需要给代码的用户一份Apache Licence +* 如果你修改了代码，需要在被修改的文件中说明。 +* 在延伸的代码中（修改和有源代码衍生的代码中）需要带有原来代码中的协议，商标，专利声明和其他原来作者规定需要包含的说明。 +* 如果再发布的产品中包含一个Notice文件，则在Notice文件中需要带有Apache Licence。你可以在Notice中增加自己的许可，但不可以表现为对Apache Licence构成更改。 +Apache Licence也是对商业应用友好的许可。使用者也可以在需要的时候修改代码来满足需要并作为开源或商业产品发布/销售。 + ## 用户权益 * 允许免费用于学习、毕设、公司项目、私活等。 -* 代码文件需保留相关license信息。 -* 禁止直接将本项目挂淘宝等商业平台出售。 -* 非界面代码50%以上相似度的二次开源，二次开源需先联系作者。 +* 对未经过授权和不遵循 Apache 2.0 协议二次开源或者商业化我们将追究到底。 +* 参考请注明：参考自 SpringBlade：https://gitee.com/smallc/SpringBlade 。另请遵循 Apache 2.0 协议。 +* `注意`：若禁止条款被发现有权追讨 **19999** 的授权费。 # 界面 diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 5852d2f..0878285 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ SpringBlade org.springblade - 2.3.3 + 2.4.0 blade-auth diff --git a/blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java b/blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java index d82f086..11e00ed 100644 --- a/blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java +++ b/blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java @@ -43,17 +43,17 @@ import org.springframework.web.bind.annotation.RestController; public class AuthController { @PostMapping("token") - @ApiOperation(value = "获取认证token", notes = "传入租户编号:tenantCode,账号:account,密码:password") + @ApiOperation(value = "获取认证token", notes = "传入租户ID:tenantId,账号:account,密码:password") public R token(@ApiParam(value = "授权类型", required = true) @RequestParam(defaultValue = "password", required = false) String grantType, @ApiParam(value = "刷新令牌") @RequestParam(required = false) String refreshToken, - @ApiParam(value = "租户编号", required = true) @RequestParam(defaultValue = "000000", required = false) String tenantCode, + @ApiParam(value = "租户ID", required = true) @RequestParam(defaultValue = "000000", required = false) String tenantId, @ApiParam(value = "账号") @RequestParam(required = false) String account, @ApiParam(value = "密码") @RequestParam(required = false) String password) { String userType = Func.toStr(WebUtil.getRequest().getHeader(TokenUtil.USER_TYPE_HEADER_KEY), TokenUtil.DEFAULT_USER_TYPE); TokenParameter tokenParameter = new TokenParameter(); - tokenParameter.getArgs().set("tenantCode", tenantCode).set("account", account).set("password", password).set("grantType", grantType).set("refreshToken", refreshToken).set("userType", userType); + tokenParameter.getArgs().set("tenantId", tenantId).set("account", account).set("password", password).set("grantType", grantType).set("refreshToken", refreshToken).set("userType", userType); ITokenGranter granter = TokenGranterBuilder.getGranter(grantType); UserInfo userInfo = granter.grant(tokenParameter); diff --git a/blade-auth/src/main/java/org/springblade/auth/granter/PasswordTokenGranter.java b/blade-auth/src/main/java/org/springblade/auth/granter/PasswordTokenGranter.java index 4b398dd..9572a6a 100644 --- a/blade-auth/src/main/java/org/springblade/auth/granter/PasswordTokenGranter.java +++ b/blade-auth/src/main/java/org/springblade/auth/granter/PasswordTokenGranter.java @@ -39,7 +39,7 @@ public class PasswordTokenGranter implements ITokenGranter { @Override public UserInfo grant(TokenParameter tokenParameter) { - String tenantCode = tokenParameter.getArgs().getStr("tenantCode"); + String tenantId = tokenParameter.getArgs().getStr("tenantId"); String account = tokenParameter.getArgs().getStr("account"); String password = tokenParameter.getArgs().getStr("password"); UserInfo userInfo = null; @@ -49,11 +49,11 @@ public class PasswordTokenGranter implements ITokenGranter { R result; // 根据不同用户类型调用对应的接口返回数据，用户可自行拓展 if (userType.equals(BladeUserEnum.WEB.getName())) { - result = userClient.userInfo(tenantCode, account, DigestUtil.encrypt(password)); + result = userClient.userInfo(tenantId, account, DigestUtil.encrypt(password)); } else if (userType.equals(BladeUserEnum.APP.getName())) { - result = userClient.userInfo(tenantCode, account, DigestUtil.encrypt(password)); + result = userClient.userInfo(tenantId, account, DigestUtil.encrypt(password)); } else { - result = userClient.userInfo(tenantCode, account, DigestUtil.encrypt(password)); + result = userClient.userInfo(tenantId, account, DigestUtil.encrypt(password)); } userInfo = result.isSuccess() ? result.getData() : null; } diff --git a/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java b/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java index d2d6dc9..9f11dc0 100644 --- a/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java +++ b/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java @@ -33,7 +33,7 @@ import java.util.Map; */ public class TokenUtil { - public final static String TENANT_HEADER_KEY = "Tenant-Code"; + public final static String TENANT_HEADER_KEY = "Tenant-Id"; public final static String DEFAULT_TENANT_ID = "000000"; public final static String USER_TYPE_HEADER_KEY = "User-Type"; public final static String DEFAULT_USER_TYPE = "web"; @@ -54,7 +54,7 @@ public class TokenUtil { //设置jwt参数 Map param = new HashMap<>(16); param.put(TokenConstant.TOKEN_TYPE, TokenConstant.ACCESS_TOKEN); - param.put(TokenConstant.TENANT_CODE, user.getTenantCode()); + param.put(TokenConstant.TENANT_ID, user.getTenantId()); param.put(TokenConstant.USER_ID, Func.toStr(user.getId())); param.put(TokenConstant.ROLE_ID, user.getRoleId()); param.put(TokenConstant.ACCOUNT, user.getAccount()); diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 6db6af4..155ab34 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 34aaf60..a2288ad 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.3.3 + 2.4.0 4.0.0 @@ -66,13 +66,14 @@ + - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery ${alibaba.cloud.version} - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config ${alibaba.cloud.version} diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index c10ae09..c076829 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 4ed2068..46397f4 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 134914b..727ab82 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 53e805b..d24b809 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 63fa012..56b8967 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index c3d7c67..d376926 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index 4fabf08..016742d 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java index a899fb2..827a975 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java @@ -45,10 +45,10 @@ public class Dept implements Serializable { private Integer id; /** - * 租户编号 + * 租户ID */ - @ApiModelProperty(value = "租户编号") - private String tenantCode; + @ApiModelProperty(value = "租户ID") + private String tenantId; /** * 父主键 diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Role.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Role.java index 2424087..5487a07 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Role.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Role.java @@ -45,10 +45,10 @@ public class Role implements Serializable { private Integer id; /** - * 租户编号 + * 租户ID */ - @ApiModelProperty(value = "租户编号") - private String tenantCode; + @ApiModelProperty(value = "租户ID") + private String tenantId; /** * 父主键 diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java index 2816d57..517a9af 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java @@ -45,10 +45,10 @@ public class Tenant extends BaseEntity { private Integer id; /** - * 租户编号 + * 租户ID */ - @ApiModelProperty(value = "租户编号") - private String tenantCode; + @ApiModelProperty(value = "租户ID") + private String tenantId; /** * 租户名称 */ diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 62581ba..2881243 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java index 162abe9..f758550 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java @@ -48,12 +48,12 @@ public interface IUserClient { /** * 获取用户信息 * - * @param tenantCode 租户编号 + * @param tenantId 租户ID * @param account 账号 * @param password 密码 * @return */ @GetMapping(API_PREFIX + "/user-info") - R userInfo(@RequestParam("tenantCode") String tenantCode, @RequestParam("account") String account, @RequestParam("password") String password); + R userInfo(@RequestParam("tenantId") String tenantId, @RequestParam("account") String account, @RequestParam("password") String password); } diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java index f7a8d10..02faf7b 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java @@ -33,7 +33,7 @@ public class IUserClientFallback implements IUserClient { } @Override - public R userInfo(String tenantCode, String account, String password) { + public R userInfo(String tenantId, String account, String password) { return R.fail("未获取到账号信息"); } } diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 505cabe..aa06dde 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 2.3.3 + 2.4.0 4.0.0 blade-service-api ${project.artifactId} - 2.3.3 + 2.4.0 pom SpringBlade 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index f5704ee..4ac1f30 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index b9ed97e..045c386 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 5debe5c..72dbebc 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.3.3 + 2.4.0 4.0.0 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java index 6df8436..44b7b3b 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java @@ -72,7 +72,7 @@ public class DeptController extends BladeController { @ApiOperation(value = "列表", notes = "传入dept") public R> list(@ApiIgnore @RequestParam Map dept, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(dept, Dept.class); - List list = deptService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Dept::getTenantCode, bladeUser.getTenantCode()) : queryWrapper); + List list = deptService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Dept::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(DeptWrapper.build().listNodeVO(list)); } @@ -84,8 +84,8 @@ public class DeptController extends BladeController { @GetMapping("/tree") @ApiOperationSupport(order = 3) @ApiOperation(value = "树形结构", notes = "树形结构") - public R> tree(String tenantCode, BladeUser bladeUser) { - List tree = deptService.tree(Func.toStr(tenantCode, bladeUser.getTenantCode())); + public R> tree(String tenantId, BladeUser bladeUser) { + List tree = deptService.tree(Func.toStr(tenantId, bladeUser.getTenantId())); return R.data(tree); } @@ -97,7 +97,7 @@ public class DeptController extends BladeController { @ApiOperation(value = "新增或修改", notes = "传入dept") public R submit(@Valid @RequestBody Dept dept, BladeUser user) { if (Func.isEmpty(dept.getId())) { - dept.setTenantCode(user.getTenantCode()); + dept.setTenantId(user.getTenantId()); } return R.status(deptService.saveOrUpdate(dept)); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java index 202d0f7..312c9c2 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java @@ -72,7 +72,7 @@ public class RoleController extends BladeController { @ApiOperation(value = "列表", notes = "传入role") public R> list(@ApiIgnore @RequestParam Map role, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(role, Role.class); - List list = roleService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Role::getTenantCode, bladeUser.getTenantCode()) : queryWrapper); + List list = roleService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Role::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(RoleWrapper.build().listNodeVO(list)); } @@ -82,8 +82,8 @@ public class RoleController extends BladeController { @GetMapping("/tree") @ApiOperationSupport(order = 3) @ApiOperation(value = "树形结构", notes = "树形结构") - public R> tree(String tenantCode, BladeUser bladeUser) { - List tree = roleService.tree(Func.toStr(tenantCode, bladeUser.getTenantCode())); + public R> tree(String tenantId, BladeUser bladeUser) { + List tree = roleService.tree(Func.toStr(tenantId, bladeUser.getTenantId())); return R.data(tree); } @@ -95,7 +95,7 @@ public class RoleController extends BladeController { @ApiOperation(value = "新增或修改", notes = "传入role") public R submit(@Valid @RequestBody Role role, BladeUser user) { if (Func.isEmpty(role.getId())) { - role.setTenantCode(user.getTenantCode()); + role.setTenantId(user.getTenantId()); } return R.status(roleService.saveOrUpdate(role)); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java index 8e6571f..c121f4b 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java @@ -64,14 +64,14 @@ public class TenantController extends BladeController { */ @GetMapping("/list") @ApiImplicitParams({ - @ApiImplicitParam(name = "tenantCode", value = "参数名称", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "tenantId", value = "参数名称", paramType = "query", dataType = "string"), @ApiImplicitParam(name = "tenantName", value = "角色别名", paramType = "query", dataType = "string"), @ApiImplicitParam(name = "contactNumber", value = "联系电话", paramType = "query", dataType = "string") }) @ApiOperation(value = "分页", notes = "传入tenant") public R> list(@ApiIgnore @RequestParam Map tenant, Query query, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class); - IPage pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Tenant::getTenantCode, bladeUser.getTenantCode()) : queryWrapper); + IPage pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(pages); } @@ -82,7 +82,7 @@ public class TenantController extends BladeController { @ApiOperation(value = "下拉数据源", notes = "传入tenant") public R> select(Tenant tenant, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(tenant); - List list = tenantService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Tenant::getTenantCode, bladeUser.getTenantCode()) : queryWrapper); + List list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(list); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java index fd5cb57..b4bf068 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java @@ -41,9 +41,9 @@ public interface DeptMapper extends BaseMapper { /** * 获取树形节点 * - * @param tenantCode + * @param tenantId * @return */ - List tree(String tenantCode); + List tree(String tenantId); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml index 6458be5..d3b0a82 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml @@ -34,7 +34,7 @@ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java index 02cdc4b..5f60302 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java @@ -41,10 +41,10 @@ public interface RoleMapper extends BaseMapper { /** * 获取树形节点 * - * @param tenantCode + * @param tenantId * @param excludeRole * @return */ - List tree(String tenantCode, String excludeRole); + List tree(String tenantId, String excludeRole); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml index 2a497cb..1f5c9de 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml @@ -33,7 +33,7 @@