:tada: 2.0.3.RELEASE

doc/sql/bladex-sword-mysql.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50723
  File Encoding         : 65001
 
- Date: 28/05/2019 12:30:36
+ Date: 01/06/2019 09:35:25
 */
 
 SET NAMES utf8mb4;
@@ -81,7 +81,7 @@ COMMIT;
 DROP TABLE IF EXISTS `blade_dept`;
 CREATE TABLE `blade_dept`  (
   `id` bigint(64) NOT NULL COMMENT '主键',
-  `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号',
+  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
   `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父主键',
   `dept_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门名',
   `full_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门全称',
@@ -127,7 +127,7 @@ COMMIT;
 DROP TABLE IF EXISTS `blade_log_api`;
 CREATE TABLE `blade_log_api`  (
   `id` bigint(64) NOT NULL COMMENT '编号',
-  `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号',
+  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
   `service_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务ID',
   `server_host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器名',
   `server_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器IP地址',
@@ -153,7 +153,7 @@ CREATE TABLE `blade_log_api`  (
 DROP TABLE IF EXISTS `blade_log_error`;
 CREATE TABLE `blade_log_error`  (
   `id` bigint(64) NOT NULL COMMENT '编号',
-  `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号',
+  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
   `service_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务ID',
   `server_host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器名',
   `server_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器IP地址',
@@ -190,7 +190,7 @@ COMMIT;
 DROP TABLE IF EXISTS `blade_log_usual`;
 CREATE TABLE `blade_log_usual`  (
   `id` bigint(64) NOT NULL COMMENT '编号',
-  `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号',
+  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
   `service_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务ID',
   `server_host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器名',
   `server_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器IP地址',
@@ -241,7 +241,7 @@ COMMIT;
 DROP TABLE IF EXISTS `blade_notice`;
 CREATE TABLE `blade_notice`  (
   `id` bigint(64) NOT NULL COMMENT '主键',
-  `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号',
+  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
   `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题',
   `category` int(11) NULL DEFAULT NULL COMMENT '类型',
   `release_time` datetime(0) NULL DEFAULT NULL COMMENT '发布时间',
@@ -268,7 +268,7 @@ COMMIT;
 DROP TABLE IF EXISTS `blade_oss`;
 CREATE TABLE `blade_oss`  (
   `id` bigint(64) NOT NULL COMMENT '主键',
-  `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号',
+  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
   `category` int(2) NULL DEFAULT NULL COMMENT '分类',
   `endpoint` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资源地址',
   `access_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'accessKey',
@@ -345,7 +345,7 @@ CREATE TABLE `blade_process_leave`  (
 DROP TABLE IF EXISTS `blade_role`;
 CREATE TABLE `blade_role`  (
   `id` bigint(64) NOT NULL COMMENT '主键',
-  `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号',
+  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
   `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父主键',
   `role_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色名',
   `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
@@ -385,7 +385,7 @@ COMMIT;
 DROP TABLE IF EXISTS `blade_tenant`;
 CREATE TABLE `blade_tenant`  (
   `id` bigint(64) NOT NULL COMMENT '主键',
-  `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '租户编号',
+  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
   `tenant_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '租户名称',
   `linkman` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人',
   `contact_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话',
@@ -412,7 +412,7 @@ COMMIT;
 DROP TABLE IF EXISTS `blade_user`;
 CREATE TABLE `blade_user`  (
   `id` bigint(64) NOT NULL COMMENT '主键',
-  `tenant_code` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户编号',
+  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
   `account` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '账号',
   `password` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码',
   `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称',

doc/sql/bladex-tenantid-update.sql

@@ -0,0 +1,26 @@
+ALTER TABLE `blade_dept`
+    CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`;
+
+ALTER TABLE `blade_log_api`
+    CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`;
+
+ALTER TABLE `blade_log_error`
+    CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`;
+
+ALTER TABLE `blade_log_usual`
+    CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`;
+
+ALTER TABLE `blade_notice`
+    CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`;
+
+ALTER TABLE `blade_oss`
+    CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`;
+
+ALTER TABLE `blade_role`
+    CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`;
+
+ALTER TABLE `blade_tenant`
+    CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`;
+
+ALTER TABLE `blade_user`
+    CHANGE COLUMN `tenant_code` `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID' AFTER `id`;

pom.xml

@@ -7,10 +7,10 @@
     <groupId>org.springblade</groupId>
     <artifactId>BladeX-Boot</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.2.RELEASE</version>
+    <version>2.0.3.RELEASE</version>
 
     <properties>
-        <bladex.tool.version>2.0.2.RELEASE</bladex.tool.version>
+        <bladex.tool.version>2.0.3.RELEASE</bladex.tool.version>
 
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.1</maven.plugin.version>

src/main/java/org/springblade/core/secure/utils/SecureUtil.java

@@ -50,7 +50,7 @@ public class SecureUtil {
 	private final static String USER_ID = TokenConstant.USER_ID;
 	private final static String ROLE_ID = TokenConstant.ROLE_ID;
 	private final static String ROLE_NAME = TokenConstant.ROLE_NAME;
-	private final static String TENANT_CODE = TokenConstant.TENANT_CODE;
+	private final static String TENANT_ID = TokenConstant.TENANT_ID;
 	private final static String CLIENT_ID = TokenConstant.CLIENT_ID;
 	private final static Integer AUTH_LENGTH = TokenConstant.AUTH_LENGTH;
 	private static String BASE64_SECURITY = Base64.getEncoder().encodeToString(TokenConstant.SIGN_KEY.getBytes(Charsets.UTF_8));
@@ -96,7 +96,7 @@ public class SecureUtil {
 		}
 		String clientId = Func.toStr(claims.get(SecureUtil.CLIENT_ID));
 		Long userId = Func.toLong(claims.get(SecureUtil.USER_ID));
-		String tenantCode = Func.toStr(claims.get(SecureUtil.TENANT_CODE));
+		String tenantId = Func.toStr(claims.get(SecureUtil.TENANT_ID));
 		String roleId = Func.toStr(claims.get(SecureUtil.ROLE_ID));
 		String account = Func.toStr(claims.get(SecureUtil.ACCOUNT));
 		String roleName = Func.toStr(claims.get(SecureUtil.ROLE_NAME));
@@ -105,7 +105,7 @@ public class SecureUtil {
 		BladeUser bladeUser = new BladeUser();
 		bladeUser.setClientId(clientId);
 		bladeUser.setUserId(userId);
-		bladeUser.setTenantCode(tenantCode);
+		bladeUser.setTenantId(tenantId);
 		bladeUser.setAccount(account);
 		bladeUser.setRoleId(roleId);
 		bladeUser.setRoleName(roleName);
@@ -221,30 +221,30 @@ public class SecureUtil {
 	}
 
 	/**
-	 * 获取租户编号
+	 * 获取租户ID
 	 *
-	 * @return tenantCode
+	 * @return tenantId
 	 */
-	public static String getTenantCode() {
+	public static String getTenantId() {
 		BladeUser user = getUser();
-		return (null == user) ? StringPool.EMPTY : user.getTenantCode();
+		return (null == user) ? StringPool.EMPTY : user.getTenantId();
 	}
 
 	/**
-	 * 获取租户编号
+	 * 获取租户ID
 	 *
 	 * @param request request
-	 * @return tenantCode
+	 * @return tenantId
 	 */
-	public static String getTenantCode(HttpServletRequest request) {
+	public static String getTenantId(HttpServletRequest request) {
 		BladeUser user = getUser(request);
-		return (null == user) ? StringPool.EMPTY : user.getTenantCode();
+		return (null == user) ? StringPool.EMPTY : user.getTenantId();
 	}
 
 	/**
 	 * 获取客户端id
 	 *
-	 * @return tenantCode
+	 * @return tenantId
 	 */
 	public static String getClientId() {
 		BladeUser user = getUser();
@@ -255,7 +255,7 @@ public class SecureUtil {
 	 * 获取客户端id
 	 *
 	 * @param request request
-	 * @return tenantCode
+	 * @return tenantId
 	 */
 	public static String getClientId(HttpServletRequest request) {
 		BladeUser user = getUser(request);

src/main/java/org/springblade/modules/auth/AuthController.java

@@ -59,8 +59,8 @@ public class AuthController {
 
 	@ApiLog("登录用户验证")
 	@PostMapping("/oauth/token")
-	@ApiOperation(value = "获取认证token", notes = "传入租户编号:tenantCode,账号:account,密码:password")
-	public Kv token(@ApiParam(value = "租户编号", required = true) @RequestParam(defaultValue = "000000", required = false) String tenantCode,
+	@ApiOperation(value = "获取认证token", notes = "传入租户ID:tenantId,账号:account,密码:password")
+	public Kv token(@ApiParam(value = "租户ID", required = true) @RequestParam(defaultValue = "000000", required = false) String tenantId,
 					@ApiParam(value = "账号", required = true) @RequestParam(required = false) String username,
 					@ApiParam(value = "密码", required = true) @RequestParam(required = false)  String password) {
 
@@ -72,7 +72,7 @@ public class AuthController {
 		UserInfo userInfo = null;
 
 		if (Func.isNoneBlank(username, password)) {
-			userInfo = service.userInfo(tenantCode, username, DigestUtil.encrypt(password));
+			userInfo = service.userInfo(tenantId, username, DigestUtil.encrypt(password));
 		} else if (Func.isNoneBlank(grantType, refreshToken) && grantType.equals(TokenConstant.REFRESH_TOKEN)) {
 			Claims claims = SecureUtil.parseJWT(refreshToken);
 			String tokenType = Func.toStr(Objects.requireNonNull(claims).get(TokenConstant.TOKEN_TYPE));
@@ -104,7 +104,7 @@ public class AuthController {
 		//设置jwt参数
 		Map<String, String> 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());

src/main/java/org/springblade/modules/resource/builder/OssBuilder.java

@@ -67,14 +67,14 @@ public class OssBuilder {
 	 * @return OssTemplate
 	 */
 	public OssTemplate template() {
-		String tenantCode = SecureUtil.getTenantCode();
-		Oss oss = getOss(tenantCode);
-		Oss ossCached = ossPool.get(tenantCode);
-		OssTemplate template = templatePool.get(tenantCode);
+		String tenantId = SecureUtil.getTenantId();
+		Oss oss = getOss(tenantId);
+		Oss ossCached = ossPool.get(tenantId);
+		OssTemplate template = templatePool.get(tenantId);
 		// 若为空或者不一致，则重新加载
 		if (Func.hasEmpty(template, ossCached) || oss.getEndpoint().equals(ossCached.getEndpoint()) || !oss.getAccessKey().equals(ossCached.getAccessKey())) {
 			synchronized (OssBuilder.class) {
-				template = templatePool.get(tenantCode);
+				template = templatePool.get(tenantId);
 				if (Func.hasEmpty(template, ossCached) || oss.getEndpoint().equals(ossCached.getEndpoint()) || !oss.getAccessKey().equals(ossCached.getAccessKey())) {
 					OssRule ossRule;
 					// 若采用默认设置则开启多租户模式, 若是用户自定义oss则不开启
@@ -88,8 +88,8 @@ public class OssBuilder {
 					} else if (oss.getCategory() == OssEnum.QINIU.getCategory()) {
 						template = QiniuBuilder.template(oss, ossRule);
 					}
-					templatePool.put(tenantCode, template);
-					ossPool.put(tenantCode, oss);
+					templatePool.put(tenantId, template);
+					ossPool.put(tenantId, oss);
 				}
 			}
 		}
@@ -99,11 +99,11 @@ public class OssBuilder {
 	/**
 	 * 获取对象存储实体
 	 *
-	 * @param tenantCode 租户编号
+	 * @param tenantId 租户ID
 	 * @return Role
 	 */
-	public Oss getOss(String tenantCode) {
-		return CacheUtil.get(SYS_CACHE, OSS_CODE, tenantCode, () -> {
+	public Oss getOss(String tenantId) {
+		return CacheUtil.get(SYS_CACHE, OSS_CODE, tenantId, () -> {
 			Oss o = ossMapper.selectOne(Wrappers.<Oss>query().lambda().eq(Oss::getStatus, OssStatusEnum.ENABLE.getNum()));
 			// 若为空则调用默认配置
 			if ((Func.isEmpty(o))) {

src/main/java/org/springblade/modules/resource/controller/OssController.java

@@ -133,7 +133,7 @@ public class OssController extends BladeController {
 	@PostMapping("/enable")
 	@ApiOperation(value = "配置启用", notes = "传入id", position = 7)
 	public R enable(@ApiParam(value = "主键", required = true) @RequestParam Long id) {
-		CacheUtil.evict(SYS_CACHE, OssBuilder.OSS_CODE, SecureUtil.getTenantCode());
+		CacheUtil.evict(SYS_CACHE, OssBuilder.OSS_CODE, SecureUtil.getTenantId());
 		return R.status(ossService.enable(id));
 	}
 

src/main/java/org/springblade/modules/system/controller/DeptController.java

@@ -79,7 +79,7 @@ public class DeptController extends BladeController {
 	@ApiOperation(value = "列表", notes = "传入dept", position = 2)
 	public R<List<INode>> list(@ApiIgnore @RequestParam Map<String, Object> dept, BladeUser bladeUser) {
 		QueryWrapper<Dept> queryWrapper = Condition.getQueryWrapper(dept, Dept.class);
-		List<Dept> list = deptService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Dept::getTenantCode, bladeUser.getTenantCode()) : queryWrapper);
+		List<Dept> 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));
 	}
 
@@ -90,8 +90,8 @@ public class DeptController extends BladeController {
 	 */
 	@GetMapping("/tree")
 	@ApiOperation(value = "树形结构", notes = "树形结构", position = 3)
-	public R<List<DeptVO>> tree(String tenantCode, BladeUser bladeUser) {
-		List<DeptVO> tree = deptService.tree(Func.toStr(tenantCode, bladeUser.getTenantCode()));
+	public R<List<DeptVO>> tree(String tenantId, BladeUser bladeUser) {
+		List<DeptVO> tree = deptService.tree(Func.toStr(tenantId, bladeUser.getTenantId()));
 		return R.data(tree);
 	}
 
@@ -103,7 +103,7 @@ public class DeptController extends BladeController {
 	@CacheEvict(cacheNames = {SYS_CACHE})
 	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));
 	}

src/main/java/org/springblade/modules/system/controller/RoleController.java

@@ -79,7 +79,7 @@ public class RoleController extends BladeController {
 	@ApiOperation(value = "列表", notes = "传入role", position = 2)
 	public R<List<INode>> list(@ApiIgnore @RequestParam Map<String, Object> role, BladeUser bladeUser) {
 		QueryWrapper<Role> queryWrapper = Condition.getQueryWrapper(role, Role.class);
-		List<Role> list = roleService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Role::getTenantCode, bladeUser.getTenantCode()) : queryWrapper);
+		List<Role> 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));
 	}
 
@@ -88,8 +88,8 @@ public class RoleController extends BladeController {
 	 */
 	@GetMapping("/tree")
 	@ApiOperation(value = "树形结构", notes = "树形结构", position = 3)
-	public R<List<RoleVO>> tree(String tenantCode, BladeUser bladeUser) {
-		List<RoleVO> tree = roleService.tree(Func.toStr(tenantCode, bladeUser.getTenantCode()));
+	public R<List<RoleVO>> tree(String tenantId, BladeUser bladeUser) {
+		List<RoleVO> tree = roleService.tree(Func.toStr(tenantId, bladeUser.getTenantId()));
 		return R.data(tree);
 	}
 
@@ -101,7 +101,7 @@ public class RoleController extends BladeController {
 	@CacheEvict(cacheNames = {SYS_CACHE})
 	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));
 	}

src/main/java/org/springblade/modules/system/controller/TenantController.java

@@ -67,14 +67,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", position = 2)
 	public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) {
 		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
-		IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Tenant::getTenantCode, bladeUser.getTenantCode()) : queryWrapper);
+		IPage<Tenant> 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);
 	}
 
@@ -85,7 +85,7 @@ public class TenantController extends BladeController {
 	@ApiOperation(value = "下拉数据源", notes = "传入tenant", position = 3)
 	public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) {
 		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant);
-		List<Tenant> list = tenantService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Tenant::getTenantCode, bladeUser.getTenantCode()) : queryWrapper);
+		List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
 		return R.data(list);
 	}
 

src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -79,7 +79,7 @@ public class UserController {
 	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<IPage<UserVO>> list(@ApiIgnore @RequestParam Map<String, Object> user, Query query, BladeUser bladeUser) {
 		QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
-		IPage<User> pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(User::getTenantCode, bladeUser.getTenantCode()) : queryWrapper);
+		IPage<User> pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
 		return R.data(UserWrapper.build().pageVO(pages));
 	}
 

src/main/java/org/springblade/modules/system/entity/Dept.java

@@ -49,10 +49,10 @@ public class Dept implements Serializable {
 	private Long id;
 
 	/**
-	 * 租户编号
+	 * 租户ID
 	 */
-	@ApiModelProperty(value = "租户编号")
-	private String tenantCode;
+	@ApiModelProperty(value = "租户ID")
+	private String tenantId;
 
 	/**
 	 * 父主键

src/main/java/org/springblade/modules/system/entity/Role.java

@@ -49,10 +49,10 @@ public class Role implements Serializable {
 	private Long id;
 
 	/**
-	 * 租户编号
+	 * 租户ID
 	 */
-	@ApiModelProperty(value = "租户编号")
-	private String tenantCode;
+	@ApiModelProperty(value = "租户ID")
+	private String tenantId;
 
 	/**
 	 * 父主键

src/main/java/org/springblade/modules/system/entity/Tenant.java

@@ -37,10 +37,10 @@ public class Tenant extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 租户编号
+	 * 租户ID
 	 */
-	@ApiModelProperty(value = "租户编号")
-	private String tenantCode;
+	@ApiModelProperty(value = "租户ID")
+	private String tenantId;
 	/**
 	 * 租户名称
 	 */

src/main/java/org/springblade/modules/system/mapper/DeptMapper.java

@@ -42,10 +42,10 @@ public interface DeptMapper extends BaseMapper<Dept> {
 	/**
 	 * 获取树形节点
 	 *
-	 * @param tenantCode
+	 * @param tenantId
 	 * @return
 	 */
-	List<DeptVO> tree(String tenantCode);
+	List<DeptVO> tree(String tenantId);
 
 	/**
 	 * 获取部门名

src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml

@@ -34,7 +34,7 @@
     <select id="tree" resultMap="treeNodeResultMap">
         select id, parent_id, dept_name as title, id as 'value', id as 'key' from blade_dept where is_deleted = 0
         <if test="_parameter!=null">
-            and tenant_code = #{_parameter}
+            and tenant_id = #{_parameter}
         </if>
     </select>
 

src/main/java/org/springblade/modules/system/mapper/RoleMapper.java

@@ -42,11 +42,11 @@ public interface RoleMapper extends BaseMapper<Role> {
 	/**
 	 * 获取树形节点
 	 *
-	 * @param tenantCode
+	 * @param tenantId
 	 * @param excludeRole
 	 * @return
 	 */
-	List<RoleVO> tree(String tenantCode, String excludeRole);
+	List<RoleVO> tree(String tenantId, String excludeRole);
 
 	/**
 	 * 获取角色名

src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml

@@ -33,7 +33,7 @@
     <select id="tree" resultMap="treeNodeResultMap">
         select id, parent_id, role_name as title, id as 'value', id as 'key' from blade_role where is_deleted = 0
         <if test="param1!=null">
-            and tenant_code = #{param1}
+            and tenant_id = #{param1}
         </if>
         <if test="param2!=null">
             and role_alias &lt;&gt; #{param2}

src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -41,11 +41,11 @@ public interface UserMapper extends BaseMapper<User> {
 	/**
 	 * 获取用户
 	 *
-	 * @param tenantCode
+	 * @param tenantId
 	 * @param account
 	 * @param password
 	 * @return
 	 */
-	User getUser(String tenantCode, String account, String password);
+	User getUser(String tenantId, String account, String password);
 
 }

src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="userResultMap" type="org.springblade.modules.system.entity.User">
         <result column="id" property="id"/>
-        <result column="tenant_code" property="tenantCode"/>
+        <result column="tenant_id" property="tenantId"/>
         <result column="create_user" property="createUser"/>
         <result column="create_time" property="createTime"/>
         <result column="update_user" property="updateUser"/>
@@ -46,7 +46,7 @@
         FROM
             blade_user
         WHERE
-            tenant_code = #{param1} and account = #{param2} and password = #{param3} and is_deleted = 0
+            tenant_id = #{param1} and account = #{param2} and password = #{param3} and is_deleted = 0
     </select>
 
 </mapper>

src/main/java/org/springblade/modules/system/service/IDeptService.java

@@ -42,10 +42,10 @@ public interface IDeptService extends IService<Dept> {
 	/**
 	 * 树形结构
 	 *
-	 * @param tenantCode
+	 * @param tenantId
 	 * @return
 	 */
-	List<DeptVO> tree(String tenantCode);
+	List<DeptVO> tree(String tenantId);
 
 	/**
 	 * 获取部门名

src/main/java/org/springblade/modules/system/service/IRoleService.java

@@ -43,10 +43,10 @@ public interface IRoleService extends IService<Role> {
 	/**
 	 * 树形结构
 	 *
-	 * @param tenantCode
+	 * @param tenantId
 	 * @return
 	 */
-	List<RoleVO> tree(String tenantCode);
+	List<RoleVO> tree(String tenantId);
 
 	/**
 	 * 权限配置

src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -57,12 +57,12 @@ public interface IUserService extends BaseService<User> {
 	/**
 	 * 用户信息
 	 *
-	 * @param tenantCode
+	 * @param tenantId
 	 * @param account
 	 * @param password
 	 * @return
 	 */
-	UserInfo userInfo(String tenantCode, String account, String password);
+	UserInfo userInfo(String tenantId, String account, String password);
 
 	/**
 	 * 给用户设置角色

src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -44,8 +44,8 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 	}
 
 	@Override
-	public List<DeptVO> tree(String tenantCode) {
-		return ForestNodeMerger.merge(baseMapper.tree(tenantCode));
+	public List<DeptVO> tree(String tenantId) {
+		return ForestNodeMerger.merge(baseMapper.tree(tenantId));
 	}
 
 	@Override

src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java

@@ -103,7 +103,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 
 	@Override
 	public List<MenuVO> grantTree(BladeUser user) {
-		return ForestNodeMerger.merge(user.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE) ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId())));
+		return ForestNodeMerger.merge(user.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId())));
 	}
 
 	@Override

src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java

@@ -57,13 +57,13 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
 	}
 
 	@Override
-	public List<RoleVO> tree(String tenantCode) {
+	public List<RoleVO> tree(String tenantId) {
 		String userRole = SecureUtil.getUserRole();
 		String excludeRole = null;
 		if (!CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMIN) && !CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR)) {
 			excludeRole = RoleConstant.ADMIN;
 		}
-		return ForestNodeMerger.merge(baseMapper.tree(tenantCode, excludeRole));
+		return ForestNodeMerger.merge(baseMapper.tree(tenantId, excludeRole));
 	}
 
 	@Override

src/main/java/org/springblade/modules/system/service/impl/TenantServiceImpl.java

@@ -60,12 +60,12 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 	public boolean saveTenant(Tenant tenant) {
 		if (Func.isEmpty(tenant.getId())) {
 			List<Tenant> tenants = baseMapper.selectList(Wrappers.<Tenant>query().lambda().eq(Tenant::getIsDeleted, BladeConstant.DB_NOT_DELETED));
-			List<String> codes = tenants.stream().map(Tenant::getTenantCode).collect(Collectors.toList());
-			String tenantCode = getTenantCode(codes);
-			tenant.setTenantCode(tenantCode);
+			List<String> codes = tenants.stream().map(Tenant::getTenantId).collect(Collectors.toList());
+			String tenantId = getTenantId(codes);
+			tenant.setTenantId(tenantId);
 			// 新建租户对应的默认角色
 			Role role = new Role();
-			role.setTenantCode(tenantCode);
+			role.setTenantId(tenantId);
 			role.setParentId(CommonConstant.TOP_PARENT_ID);
 			role.setRoleName("管理员");
 			role.setRoleAlias("admin");
@@ -74,7 +74,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 			roleMapper.insert(role);
 			// 新建租户对应的默认部门
 			Dept dept = new Dept();
-			dept.setTenantCode(tenantCode);
+			dept.setTenantId(tenantId);
 			dept.setParentId(CommonConstant.TOP_PARENT_ID);
 			dept.setDeptName(tenant.getTenantName());
 			dept.setFullName(tenant.getTenantName());
@@ -85,10 +85,10 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 		return super.saveOrUpdate(tenant);
 	}
 
-	private String getTenantCode(List<String> codes) {
+	private String getTenantId(List<String> codes) {
 		String code = tenantId.generate();
 		if (codes.contains(code)) {
-			return getTenantCode(codes);
+			return getTenantId(codes);
 		}
 		return code;
 	}

src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -49,7 +49,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		if (Func.isNotEmpty(user.getPassword())) {
 			user.setPassword(DigestUtil.encrypt(user.getPassword()));
 		}
-		Integer cnt = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantCode, Func.toStr(user.getTenantCode(), BladeConstant.ADMIN_TENANT_CODE)).eq(User::getAccount, user.getAccount()));
+		Integer cnt = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, Func.toStr(user.getTenantId(), BladeConstant.ADMIN_TENANT_ID)).eq(User::getAccount, user.getAccount()));
 		if (cnt > 0) {
 			throw new ApiException("当前用户已存在!");
 		}
@@ -74,9 +74,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	}
 
 	@Override
-	public UserInfo userInfo(String tenantCode, String account, String password) {
+	public UserInfo userInfo(String tenantId, String account, String password) {
 		UserInfo userInfo = new UserInfo();
-		User user = baseMapper.getUser(tenantCode, account, password);
+		User user = baseMapper.getUser(tenantId, account, password);
 		userInfo.setUser(user);
 		if (Func.isNotEmpty(user)) {
 			List<String> roleAlias = SysCache.getRoleAliases(user.getRoleId());

src/main/resources/application.yml

@@ -112,7 +112,7 @@ blade:
         path-patterns:
           - /blade-saber/**
   tenant:
-    column: tenant_code
+    column: tenant_id
     tables:
       - blade_notice
 

src/test/resources/application.yml

@@ -63,7 +63,7 @@ blade:
         path-patterns:
           - /blade-saber/**
   tenant:
-    column: tenant_code
+    column: tenant_id
     tables:
       - blade_notice