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 优化 根据域名获取租户编码

Browse Source
This commit is contained in:
疯狂的狮子li 2023-02-13 09:51:36 +08:00
parent ac93a11123
commit 937e8cc53f
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,11 +3,11 @@ 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;
import com.ruoyi.common.core.domain.model.SmsLoginBody;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.satoken.utils.LoginHelper;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.bo.SysTenantBo;
@ -31,7 +31,6 @@ 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;
/**
@ -120,21 +119,11 @@ public class SysLoginController {
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);
List<TenantListVo> list = voList.stream().filter(vo -> StringUtils.equals(vo.getDomain(), host)).toList();
return R.ok(CollUtil.isNotEmpty(list) ? list : voList);
}
/**

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java
View File

@ -91,8 +91,8 @@ public class SysTenantController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) {
if (UserConstants.NOT_UNIQUE.equals(sysTenantService.checkCompanyNameUnique(bo))) {
throw new ServiceException("新增租户'" + bo.getCompanyName() + "'失败，公司名称已存在");
if (TenantConstants.NOT_PASS.equals(sysTenantService.checkCompanyNameUnique(bo))) {
throw new ServiceException("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在");
}
SysUserBo userBo = new SysUserBo();
userBo.setUserName(bo.getUsername());

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java
View File

@ -56,7 +56,7 @@ public interface ISysTenantService {
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 校验公司名称是否唯一
* 校验企业名称是否唯一
*/
String checkCompanyNameUnique(SysTenantBo bo);

7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
View File

@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.CacheNames;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.TenantConstants;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.common.core.utils.StringUtils;
@ -284,7 +283,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
}
/**
* 校验公司名称是否唯一
* 校验企业名称是否唯一
*/
@Override
public String checkCompanyNameUnique(SysTenantBo bo) {
@ -292,9 +291,9 @@ public class SysTenantServiceImpl implements ISysTenantService {
.eq(SysTenant::getCompanyName, bo.getCompanyName())
.ne(ObjectUtil.isNotNull(bo.getTenantId()), SysTenant::getTenantId, bo.getTenantId()));
if (exist) {
return UserConstants.NOT_UNIQUE;
return TenantConstants.NOT_PASS;
}
return UserConstants.UNIQUE;
return TenantConstants.PASS;
}
/**