opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 18:15:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 更新接口获取租户列表 SysLoginController#tenantList 根据当前请求域名进行筛选, 没有则返回全部列表 ;

Browse Source
This commit is contained in:
zlyx 2023-02-13 09:33:08 +08:00
parent 11ee0e699a
commit ac93a11123
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java
View File

@ -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<List<TenantListVo>> tenantList() {
public R<List<TenantListVo>> tenantList(HttpServletRequest request) throws Exception {
List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo());
List<TenantListVo> voList = BeanUtil.copyToList(tenantList, TenantListVo.class);
// 获取域名
String host = new URL(request.getRequestURL().toString()).getHost();
// 根据域名进行筛选
List<TenantListVo> 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);
}

2
ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java
View File

@ -14,4 +14,6 @@ public class TenantListVo {
private String companyName;
private String domain;
}