diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java index 9bdc7fbb4..d59ba07b6 100644 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java +++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java @@ -128,6 +128,11 @@ public class LoginUser implements Serializable { */ private String tranLanguageCode = RuleConstants.CHINES_TRAN_LANGUAGE_CODE; + /** + * 租户的编码 + */ + private String tenantCode; + public String getWsUrl() { AtomicReference returnUrl = new AtomicReference<>(StrUtil.EMPTY); Optional.ofNullable(this.wsUrl).ifPresent(url -> { diff --git a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/DataSourceApi.java b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/DataSourceApi.java index 826a68d88..62b059cff 100644 --- a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/DataSourceApi.java +++ b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/DataSourceApi.java @@ -2,6 +2,7 @@ package cn.stylefeng.roses.kernel.dsctn.api; import cn.stylefeng.roses.kernel.dsctn.api.exception.DatasourceContainerException; import cn.stylefeng.roses.kernel.dsctn.api.pojo.DataSourceDto; +import cn.stylefeng.roses.kernel.dsctn.api.pojo.request.DatabaseInfoRequest; /** * 数据库连接的api @@ -22,4 +23,13 @@ public interface DataSourceApi { */ DataSourceDto getDataSourceInfoById(Long dbId); + /** + * 新增数据库信息 + * + * @param databaseInfoRequest 新增参数 + * @author fengshuonan + * @date 2020/11/1 21:47 + */ + void add(DatabaseInfoRequest databaseInfoRequest); + } diff --git a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/DatabaseInfoService.java b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/DatabaseInfoService.java index f723d1c65..159eb6cf8 100644 --- a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/DatabaseInfoService.java +++ b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/DatabaseInfoService.java @@ -40,15 +40,6 @@ import java.util.List; */ public interface DatabaseInfoService extends IService, DataSourceApi { - /** - * 新增数据库信息 - * - * @param databaseInfoRequest 新增参数 - * @author fengshuonan - * @date 2020/11/1 21:47 - */ - void add(DatabaseInfoRequest databaseInfoRequest); - /** * 删除,删除会导致某些用该数据源的service操作失败 *