From c6f71380a766f48a1fafdcd22f186f7ba051b071 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 26 May 2021 16:26:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.4=E3=80=91=E6=9B=B4=E6=96=B0loginU?=
 =?UTF-8?q?ser=E5=92=8CDataSourceApi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/auth/api/pojo/login/LoginUser.java    |  5 +++++
 .../roses/kernel/dsctn/api/DataSourceApi.java          | 10 ++++++++++
 .../dsctn/modular/service/DatabaseInfoService.java     |  9 ---------
 3 files changed, 15 insertions(+), 9 deletions(-)

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<String> 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<DatabaseInfo>, DataSourceApi {
 
-    /**
-     * 新增数据库信息
-     *
-     * @param databaseInfoRequest 新增参数
-     * @author fengshuonan
-     * @date 2020/11/1 21:47
-     */
-    void add(DatabaseInfoRequest databaseInfoRequest);
-
     /**
      * 删除，删除会导致某些用该数据源的service操作失败
      *