From 4cbfb651090dc876087934a5fb84093dc3ede9d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?=
 <14096380+qwe963852@user.noreply.gitee.com>
Date: Wed, 9 Oct 2024 17:16:17 +0800
Subject: [PATCH] =?UTF-8?q?test:()=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E4=BC=81=E4=B8=9A=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../muyu/common/system/domain/Datasource.java | 26 -------------------
 .../system/remote/RemoteSaaSService.java      |  9 +++----
 .../factory/RemoteSaaSFallbackFactory.java    |  9 ++-----
 3 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Datasource.java

diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Datasource.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Datasource.java
deleted file mode 100644
index 9b54051..0000000
--- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Datasource.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.muyu.common.system.domain;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName(value = "datasource", autoResultMap = true)
-public class Datasource {
-
-    @TableId(value = "id",type = IdType.AUTO)
-    private Integer id;
-
-    public String firmName;
-
-    public String databaseName;
-
-
-
-}
diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteSaaSService.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteSaaSService.java
index 9e6691e..2b9c8ee 100644
--- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteSaaSService.java
+++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteSaaSService.java
@@ -1,13 +1,10 @@
 package com.muyu.common.system.remote;
 
-import com.muyu.common.core.constant.SecurityConstants;
+
 import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.common.core.domain.Result;
-import com.muyu.common.system.domain.Datasource;
-import com.muyu.common.system.domain.LoginUser;
-import com.muyu.common.system.domain.SysUser;
+import com.muyu.common.system.domain.Business;
 import com.muyu.common.system.remote.factory.RemoteSaaSFallbackFactory;
-import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,7 +19,7 @@ import java.util.List;
 public interface RemoteSaaSService {
 
     @GetMapping("/saas/findDatabaseList")
-    Result<List<Datasource>> findDatabaseList();
+    Result<List<Business>> findDatabaseList();
 
 
 
diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSaaSFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSaaSFallbackFactory.java
index 886a151..42c8517 100644
--- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSaaSFallbackFactory.java
+++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSaaSFallbackFactory.java
@@ -1,13 +1,8 @@
 package com.muyu.common.system.remote.factory;
 
 import com.muyu.common.core.domain.Result;
-import com.muyu.common.system.domain.Datasource;
-import com.muyu.common.system.domain.LoginUser;
-import com.muyu.common.system.domain.SysUser;
+import com.muyu.common.system.domain.Business;
 import com.muyu.common.system.remote.RemoteSaaSService;
-import com.muyu.common.system.remote.RemoteUserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
@@ -25,7 +20,7 @@ public class RemoteSaaSFallbackFactory implements FallbackFactory<RemoteSaaSServ
     public RemoteSaaSService create(Throwable cause) {
         return new RemoteSaaSService() {
             @Override
-            public Result<List<Datasource>> findDatabaseList() {
+            public Result<List<Business>> findDatabaseList() {
                 return Result.error("查询数据库失败:" + cause.getMessage());
             }
         };