gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【8.0】【tenant】更新获取租户根id配置

pull/57/head
fengshuonan 2023-08-31 11:36:21 +08:00
parent 1e49102fda
commit 38f39b0aef
3 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/expander/SysConfigExpander.java
View File

@ -46,14 +46,4 @@ public class SysConfigExpander {
return ConfigContext.me().getSysConfigValueWithDefault("SYS_DEFAULT_PASSWORD", String.class, SysConstants.DEFAULT_LOGIN_PASSWORD);
}
/**
* 获取默认租户的id
*
* @author fengshuonan
* @since 2023/8/31 0:55
*/
public static Long getDefaultRootTenantId() {
return ConfigContext.me().getSysConfigValueWithDefault("DEFAULT_ROOT_TENANT_ID", Long.class, SysConstants.DEFAULT_ROOT_TENANT_ID);
}
}

48
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/expander/TenantConfigExpander.java Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright [2020-2030] [https://www.stylefeng.cn]
*
* 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.
*
* Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
*
* 1.请不要删除和修改根目录下的LICENSE文件。
* 2.请不要删除和修改Guns源码头部的版权声明。
* 3.请保留源码和相关描述文件的项目出处，作者声明等。
* 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns
* 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns
* 6.若您的项目无法满足以上几点，可申请商业授权
*/
package cn.stylefeng.roses.kernel.sys.api.expander;
import cn.stylefeng.roses.kernel.config.api.context.ConfigContext;
import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants;
/**
* 获取租户的一些配置
*
* @author fengshuonan
* @since 2023/8/31 11:33
*/
public class TenantConfigExpander {
/**
* 获取默认租户的id
*
* @author fengshuonan
* @since 2023/8/31 0:55
*/
public static Long getDefaultRootTenantId() {
return ConfigContext.me().getSysConfigValueWithDefault("DEFAULT_ROOT_TENANT_ID", Long.class, SysConstants.DEFAULT_ROOT_TENANT_ID);
}
}

4
kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/sys/starter/init/InitAdminService.java
View File

@ -25,7 +25,7 @@
package cn.stylefeng.roses.kernel.sys.starter.init;
import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants;
import cn.stylefeng.roses.kernel.sys.api.expander.SysConfigExpander;
import cn.stylefeng.roses.kernel.sys.api.expander.TenantConfigExpander;
import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenu;
import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions;
import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuOptionsService;
@ -78,7 +78,7 @@ public class InitAdminService {
LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysRole::getRoleCode, SysConstants.BACKEND_ADMIN_ROLE_CODE);
// 默认根租户
queryWrapper.eq(SysRole::getTenantId, SysConfigExpander.getDefaultRootTenantId());
queryWrapper.eq(SysRole::getTenantId, TenantConfigExpander.getDefaultRootTenantId());
queryWrapper.select(SysRole::getRoleId);
SysRole superAdminRole = sysRoleService.getOne(queryWrapper);