From ac93a11123b7811ea7603501807d2c645645ce53 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: Mon, 13 Feb 2023 09:33:08 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=A7=9F=E6=88=B7=E5=88=97=E8=A1=A8=20SysLog?= =?UTF-8?q?inController#tenantList=20=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=9F=9F=E5=90=8D=E8=BF=9B=E8=A1=8C=E7=AD=9B?= =?UTF-8?q?=E9=80=89,=20=E6=B2=A1=E6=9C=89=E5=88=99=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=88=97=E8=A1=A8=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/SysLoginController.java | 21 ++++++++++++++++++- .../com/ruoyi/web/domain/vo/TenantListVo.java | 2 ++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java index dae66be89..10274c44c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java @@ -2,6 +2,8 @@ package com.ruoyi.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.model.LoginBody; import com.ruoyi.common.core.domain.model.LoginUser; @@ -19,6 +21,7 @@ import com.ruoyi.web.domain.vo.LoginVo; import com.ruoyi.web.domain.vo.TenantListVo; import com.ruoyi.web.domain.vo.UserInfoVo; import com.ruoyi.web.service.SysLoginService; +import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -27,6 +30,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.net.URL; +import java.util.ArrayList; import java.util.List; /** @@ -112,9 +117,23 @@ public class SysLoginController { */ @SaIgnore @GetMapping("/tenant/list") - public R> tenantList() { + public R> tenantList(HttpServletRequest request) throws Exception { List tenantList = tenantService.queryList(new SysTenantBo()); List voList = BeanUtil.copyToList(tenantList, TenantListVo.class); + + // 获取域名 + String host = new URL(request.getRequestURL().toString()).getHost(); + // 根据域名进行筛选 + List list = new ArrayList<>(); + voList.forEach(vo -> { + if (ObjectUtil.equal(vo.getDomain(), host)) { + list.add(vo); + } + }); + if (CollUtil.isNotEmpty(list)) { + return R.ok(list); + } + return R.ok(voList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java index c36ec4a51..9f8016bd8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java @@ -14,4 +14,6 @@ public class TenantListVo { private String companyName; + private String domain; + }