fix (farm): 大屏,微信端

- 大屏模拟数据维护
- 微信端切换租户
This commit is contained in:
达富斌
2025-11-21 01:29:42 +08:00
parent e430062aa5
commit cb9781f6f1
8 changed files with 119 additions and 9 deletions

View File

@@ -23,7 +23,6 @@ import cn.iocoder.yudao.module.system.service.permission.PermissionService;
import cn.iocoder.yudao.module.system.service.permission.RoleService;
import cn.iocoder.yudao.module.system.service.social.SocialClientService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import cn.iocoder.yudao.module.system.util.TokenExtractorUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@@ -43,7 +42,6 @@ import java.util.Set;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - 认证")
@@ -171,11 +169,10 @@ public class AuthController {
@Operation(summary = "登录 (切换租户之后调用)")
public CommonResult<AuthLoginRespVO> getPhoneNumber4Login(@RequestBody @Valid TenantTokenReqVO reqVO) {
// 强行清楚 本地线程 中的租户ID , 请设置为当前将要登录的租户ID
TenantContextHolder.clear();
TenantContextHolder.setTenantId(Long.valueOf(reqVO.getTenantId()));
// TenantContextHolder.clear();
// TenantContextHolder.setTenantId(Long.valueOf(reqVO.getTenantId()));
AuthLoginRespVO login = authService.getPhoneNumber4Login(reqVO);
if (login != null) {
// log.info("tenantId ===> {}", getLoginUser().getTenantId());
return success(login);
} else {
return error(405, "该手机号不是平台用户");