From 3d6969e582fe98c38ade5006a6183c66b0f8a68b Mon Sep 17 00:00:00 2001 From: qiufeng Date: Tue, 4 Jul 2023 19:59:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=A7=9F=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/oauth/api/entity/UserInfo.java | 3 --- .../mfish/common/oauth/common/OauthUtils.java | 2 +- .../common/web/aspect/InnerUserAspect.java | 2 +- .../com/mfish/gateway/filter/AuthFilter.java | 2 +- .../oauth/controller/LoginController.java | 4 ++-- .../oauth/controller/SsoTenantController.java | 10 ++++++++ .../mfish/oauth/mapper/SsoTenantMapper.java | 2 ++ .../com/mfish/oauth/mapper/SsoUserMapper.java | 2 +- .../oauth/mapper/xml/SsoTenantMapper.xml | 23 +++++++++++++------ .../mfish/oauth/mapper/xml/SsoUserMapper.xml | 11 +++++---- .../mfish/oauth/service/SsoTenantService.java | 2 ++ .../mfish/oauth/service/SsoUserService.java | 4 ++-- .../service/impl/SsoTenantServiceImpl.java | 10 ++++++-- .../service/impl/SsoUserServiceImpl.java | 16 ++++++------- 14 files changed, 61 insertions(+), 32 deletions(-) diff --git a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/UserInfo.java b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/UserInfo.java index a677eb28..acc6183b 100644 --- a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/UserInfo.java +++ b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/UserInfo.java @@ -45,9 +45,6 @@ public class UserInfo extends BaseEntity { @ApiModelProperty("备注") private String remark; @TableField(exist = false) - @ApiModelProperty("组织名称") - private String orgName; - @TableField(exist = false) @ApiModelProperty("组织ID") private List orgIds; @TableField(exist = false) diff --git a/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/common/OauthUtils.java b/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/common/OauthUtils.java index a094000b..5cc957b5 100644 --- a/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/common/OauthUtils.java +++ b/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/common/OauthUtils.java @@ -100,7 +100,7 @@ public class OauthUtils { } Set set = list.stream().map(UserRole::getRoleCode).collect(Collectors.toSet()); //如果用户为超户，直接返回 - if (null != set && set.contains(SerConstant.SUPER_ROLE)) { + if (set.contains(SerConstant.SUPER_ROLE)) { return true; } return checkValue(requiresRoles.logical(), requiresRoles.value(), set); diff --git a/mf-common/mf-common-web/src/main/java/cn/com/mfish/common/web/aspect/InnerUserAspect.java b/mf-common/mf-common-web/src/main/java/cn/com/mfish/common/web/aspect/InnerUserAspect.java index 852bac3a..c0b0b7db 100644 --- a/mf-common/mf-common-web/src/main/java/cn/com/mfish/common/web/aspect/InnerUserAspect.java +++ b/mf-common/mf-common-web/src/main/java/cn/com/mfish/common/web/aspect/InnerUserAspect.java @@ -43,7 +43,7 @@ public class InnerUserAspect { if (RPCConstants.INNER.equals(source) && !innerUser.validateUser()) { return point.proceed(); } - Result result = tokenValidator.validator(request); + Result result = tokenValidator.validator(request); if (!result.isSuccess()) { throw new OAuthValidateException(result.getMsg()); } diff --git a/mf-gateway/src/main/java/cn/com/mfish/gateway/filter/AuthFilter.java b/mf-gateway/src/main/java/cn/com/mfish/gateway/filter/AuthFilter.java index 1ace7dc6..4f919565 100644 --- a/mf-gateway/src/main/java/cn/com/mfish/gateway/filter/AuthFilter.java +++ b/mf-gateway/src/main/java/cn/com/mfish/gateway/filter/AuthFilter.java @@ -42,7 +42,7 @@ public class AuthFilter implements GlobalFilter, Ordered { ServerHttpRequest.Builder mutate = request.mutate(); // 内部请求来源参数清除 GatewayUtils.removeHeader(mutate, RPCConstants.REQ_ORIGIN); - Result result = tokenValidator.validator(request); + Result result = tokenValidator.validator(request); if (!result.isSuccess()) { // 如果校验不成功，但该页面在白名单内则直接跳过 if (StringUtils.matches(url, ignoreWhiteProperties.getWhites())) { diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/LoginController.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/LoginController.java index e5265557..315385d2 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/LoginController.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/LoginController.java @@ -51,10 +51,10 @@ public class LoginController { if (!autoCreateUser && !ssoUserService.isAccountExist(phone, null)) { return Result.fail("错误:手机号不存在"); } - Long codeTime = loginService.getSmsCodeTime(phone); + long codeTime = loginService.getSmsCodeTime(phone); //一分钟内返回code倒计时剩余时间 if (codeTime > 0) { - return Result.fail(codeTime.toString(), "一分钟内不允许重复发送"); + return Result.fail(Long.toString(codeTime), "一分钟内不允许重复发送"); } String code = loginService.getSmsCode(phone); //如果5分钟内不重新生成code diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/SsoTenantController.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/SsoTenantController.java index 1d716d0d..56cc2871 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/SsoTenantController.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/SsoTenantController.java @@ -82,6 +82,16 @@ public class SsoTenantController { return ssoTenantService.queryList(reqSsoTenant, reqPage); } + /** + * 获取当前租户信息 + * @return 租户信息 + */ + @ApiOperation(value = "获取当前租户信息", notes = "获取当前租户信息") + @GetMapping("/info") + public Result queryTenantInfo() { + return Result.ok(ssoTenantService.queryInfo(AuthInfoUtils.getCurrentTenantId()), "租户信息-查询成功!"); + } + /** * 添加 * diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoTenantMapper.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoTenantMapper.java index 60fccc29..8c65a4d6 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoTenantMapper.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoTenantMapper.java @@ -18,6 +18,8 @@ import java.util.List; public interface SsoTenantMapper extends BaseMapper { List queryList(@Param("reqSsoTenant") ReqSsoTenant reqSsoTenant); + TenantVo queryInfo(String id); + /** * 是否租户管理员 * diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoUserMapper.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoUserMapper.java index 99472394..e6c3d1d5 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoUserMapper.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoUserMapper.java @@ -81,6 +81,6 @@ public interface SsoUserMapper extends BaseMapper { int insertUserOrg(@Param("userId") String userId, @Param("orgList") List orgList); - int deleteUserOrg(@Param("userId") String userId, @Param("orgId") String orgId); + int deleteUserOrg(@Param("userId") String userId, @Param("orgList") List orgList); } diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoTenantMapper.xml b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoTenantMapper.xml index 35119828..96ff13fb 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoTenantMapper.xml +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoTenantMapper.xml @@ -5,13 +5,16 @@ - + t.del_flag = 0 and t.tenant_type = #{reqSsoTenant.tenantType} @@ -21,6 +24,12 @@ group by t.id order by create_time desc +