From 63d6a4126d9b5a0be08553bb0c9a21fa587e0bee Mon Sep 17 00:00:00 2001 From: winer_ali <1822163+ArrayEdu@user.noreply.gitee.com> Date: Wed, 4 May 2022 08:28:17 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9A=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=90=8E=EF=BC=8C=E6=97=A0=E6=B3=95=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84admin=E5=92=8C1234?= =?UTF-8?q?56=E7=99=BB=E5=BD=95=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E7=A7=9F=E6=88=B7=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A=E6=96=B0=E5=BB=BA=E7=A7=9F=E6=88=B7=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E7=9A=84admin=E5=92=8C123456=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primary/UsernamePasswordAuthenticator.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/wemirr-platform-authority/src/main/java/com/wemirr/platform/authority/configuration/integration/primary/UsernamePasswordAuthenticator.java b/wemirr-platform-authority/src/main/java/com/wemirr/platform/authority/configuration/integration/primary/UsernamePasswordAuthenticator.java index 7b1385f8..44450014 100644 --- a/wemirr-platform-authority/src/main/java/com/wemirr/platform/authority/configuration/integration/primary/UsernamePasswordAuthenticator.java +++ b/wemirr-platform-authority/src/main/java/com/wemirr/platform/authority/configuration/integration/primary/UsernamePasswordAuthenticator.java @@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.wemirr.framework.commons.exception.CheckedException; import com.wemirr.framework.db.mybatis.conditions.Wraps; -import com.wemirr.framework.db.properties.DatabaseProperties; -import com.wemirr.framework.db.properties.MultiTenantType; import com.wemirr.framework.security.client.entity.UserInfoDetails; import com.wemirr.framework.security.client.exception.Auth2Exception; import com.wemirr.platform.authority.configuration.integration.AbstractPreparedIntegrationAuthenticator; @@ -42,9 +40,6 @@ public class UsernamePasswordAuthenticator extends AbstractPreparedIntegrationAu private UserService userService; @Resource private TenantService tenantService; - @Resource - private DatabaseProperties databaseProperties; - @Override public int getOrder() { @@ -67,13 +62,13 @@ public class UsernamePasswordAuthenticator extends AbstractPreparedIntegrationAu // 如果说是每次登陆都要清空以前的信息那么需要调用一下注销，这个注销的功能就是注销以前的token信息 } final Tenant tenant = Optional.ofNullable(tenantService.getOne(Wraps.lbQ().eq(Tenant::getCode, tenantCode))) - .orElseThrow(() -> CheckedException.notFound("{0}租户不存在", tenantCode)); + .orElseThrow(() -> CheckedException.notFound("{1}租户不存在", tenantCode)); if (tenant.getLocked()) { throw CheckedException.badRequest("租户已被禁用,请联系管理员"); } - final boolean multiTenantType = MultiTenantType.COLUMN.eq(databaseProperties.getMultiTenant().getType()); final User user = Optional.ofNullable(this.userService.getOne(Wrappers.lambdaQuery() - .eq(multiTenantType, User::getTenantId, tenant.getId()).eq(User::getUsername, username))) + //.eq(User::getTenantId, tenant.getId()) + .eq(User::getUsername, username))) .orElseThrow(() -> CheckedException.notFound("账户不存在")); final UserInfoDetails info = new UserInfoDetails(); info.setTenantCode(tenantCode); -- Gitee From 1ccb083080d2209e0d599a3715011e4f5fbe8ac0 Mon Sep 17 00:00:00 2001 From: winer_ali <1822163+ArrayEdu@user.noreply.gitee.com> Date: Wed, 4 May 2022 08:31:51 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=BB=98=E8=AE=A4=E7=99=BB=E5=BD=95admin?= =?UTF-8?q?=E5=92=8C123456=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primary/UsernamePasswordAuthenticator.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wemirr-platform-authority/src/main/java/com/wemirr/platform/authority/configuration/integration/primary/UsernamePasswordAuthenticator.java b/wemirr-platform-authority/src/main/java/com/wemirr/platform/authority/configuration/integration/primary/UsernamePasswordAuthenticator.java index 44450014..a12c2383 100644 --- a/wemirr-platform-authority/src/main/java/com/wemirr/platform/authority/configuration/integration/primary/UsernamePasswordAuthenticator.java +++ b/wemirr-platform-authority/src/main/java/com/wemirr/platform/authority/configuration/integration/primary/UsernamePasswordAuthenticator.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.wemirr.framework.commons.exception.CheckedException; import com.wemirr.framework.db.mybatis.conditions.Wraps; +import com.wemirr.framework.db.properties.DatabaseProperties; +import com.wemirr.framework.db.properties.MultiTenantType; import com.wemirr.framework.security.client.entity.UserInfoDetails; import com.wemirr.framework.security.client.exception.Auth2Exception; import com.wemirr.platform.authority.configuration.integration.AbstractPreparedIntegrationAuthenticator; @@ -40,6 +42,9 @@ public class UsernamePasswordAuthenticator extends AbstractPreparedIntegrationAu private UserService userService; @Resource private TenantService tenantService; + @Resource + private DatabaseProperties databaseProperties; + @Override public int getOrder() { @@ -62,10 +67,11 @@ public class UsernamePasswordAuthenticator extends AbstractPreparedIntegrationAu // 如果说是每次登陆都要清空以前的信息那么需要调用一下注销，这个注销的功能就是注销以前的token信息 } final Tenant tenant = Optional.ofNullable(tenantService.getOne(Wraps.lbQ().eq(Tenant::getCode, tenantCode))) - .orElseThrow(() -> CheckedException.notFound("{1}租户不存在", tenantCode)); + .orElseThrow(() -> CheckedException.notFound("{0}租户不存在", tenantCode)); if (tenant.getLocked()) { throw CheckedException.badRequest("租户已被禁用,请联系管理员"); } + final boolean multiTenantType = MultiTenantType.COLUMN.eq(databaseProperties.getMultiTenant().getType()); final User user = Optional.ofNullable(this.userService.getOne(Wrappers.lambdaQuery() //.eq(User::getTenantId, tenant.getId()) .eq(User::getUsername, username))) -- Gitee