From 7798acece05100bbd7db7da8c28b9477b12a2f66 Mon Sep 17 00:00:00 2001 From: kay <729048330@qq.com> Date: Mon, 21 Aug 2023 12:16:48 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E3=80=81=E6=97=A5=E5=BF=97&=E7=BB=84=E7=BB=87=E7=BC=93?= =?UTF-8?q?=E5=AD=98&=E9=97=A8=E6=88=B7=E7=AB=AF=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20*=20fix:=20=E7=99=BB=E5=BD=95=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E3=80=81=E6=97=A5=E5=BF=97&=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=BC=93=E5=AD=98&=E9=97=A8=E6=88=B7=E7=AB=AF=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=88=97=E8=A1=A8=20*=20fix:=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=BA=90=E9=85=8D=E7=BD=AE&=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=AD=98=E5=82=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otp/sms/SendSmsOtpFilter.java | 25 +++++++++---------- .../account/OrganizationRepository.java | 9 +++++++ .../OrganizationRepositoryCustomizedImpl.java | 1 + .../app/impl/AppRepositoryCustomizedImpl.java | 8 +----- .../converter/account/UserConverter.java | 10 +++++--- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/eiam-authentication/eiam-authentication-sms/src/main/java/cn/topiam/employee/authentication/otp/sms/SendSmsOtpFilter.java b/eiam-authentication/eiam-authentication-sms/src/main/java/cn/topiam/employee/authentication/otp/sms/SendSmsOtpFilter.java index 70487c06..83a4fc12 100644 --- a/eiam-authentication/eiam-authentication-sms/src/main/java/cn/topiam/employee/authentication/otp/sms/SendSmsOtpFilter.java +++ b/eiam-authentication/eiam-authentication-sms/src/main/java/cn/topiam/employee/authentication/otp/sms/SendSmsOtpFilter.java @@ -74,32 +74,31 @@ public class SendSmsOtpFilter extends OncePerRequestFilter { if (StringUtils.isBlank(recipient)) { throw new PhoneNotExistException(); } - boolean isSend = sendOtp(recipient); - //发送OTP - if (isSend) { - HttpResponseUtils.flushResponseJson(response, HttpStatus.OK.value(), - ApiRestResult.ok()); - return; - } - HttpResponseUtils.flushResponseJson(response, HttpStatus.OK.value(), - ApiRestResult.err().message("请输入正确的手机号")); + sendOtp(response, recipient); } public RequestMatcher getRequestMatcher() { return SMS_SEND_OPT_MATCHER; } - public boolean sendOtp(String recipient) { + public void sendOtp(HttpServletResponse response, String recipient) { if (isPhoneValidate(recipient)) { //判断是否存在用户 UserEntity user = userRepository .findByPhone(PhoneNumberUtils.getPhoneNumber(recipient)); - if (!Objects.isNull(user)) { + if (Objects.nonNull(user)) { otpContextHelp.sendOtp(recipient, SmsType.LOGIN.getCode(), SMS); - return true; + HttpResponseUtils.flushResponseJson(response, HttpStatus.OK.value(), + ApiRestResult.ok()); + } else { + logger.warn("发送验证码登录失败, 手机号不存在: [{" + recipient + "}]"); + HttpResponseUtils.flushResponseJson(response, HttpStatus.OK.value(), + ApiRestResult.ok()); } + } else { + HttpResponseUtils.flushResponseJson(response, HttpStatus.OK.value(), + ApiRestResult.err().message("请输入正确的手机号")); } - return false; } private final UserRepository userRepository; diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/OrganizationRepository.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/OrganizationRepository.java index dfc45bfb..3c0a1c8a 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/OrganizationRepository.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/OrganizationRepository.java @@ -278,4 +278,13 @@ public interface OrganizationRepository extends LogicDeleteRepository S save(@NotNull S entity); + + /** + * delete all by id + * + * @param ids {@link Iterable} + */ + @CacheEvict(allEntries = true) + @Override + void deleteAllById(@NotNull Iterable ids); } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/impl/OrganizationRepositoryCustomizedImpl.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/impl/OrganizationRepositoryCustomizedImpl.java index ea153fa5..43a801ca 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/impl/OrganizationRepositoryCustomizedImpl.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/impl/OrganizationRepositoryCustomizedImpl.java @@ -64,6 +64,7 @@ public class OrganizationRepositoryCustomizedImpl implements OrganizationReposit * @param list {@link List} */ @Override + @CacheEvict(allEntries = true) public void batchSave(List list) { jdbcTemplate.batchUpdate( "INSERT INTO organization (id_, code_, name_, parent_id, is_leaf, external_id, data_origin, type_, is_enabled, order_, path_, display_path, identity_source_id,create_by,create_time,update_by,update_time,remark_,is_deleted) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java index 765f650e..9b670b3d 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java @@ -82,18 +82,12 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized { WHERE app.is_enabled = 1 AND app.is_deleted = '0' - AND app_acce.subject_id IN (:subjectIds) + AND (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = 'all_access') """); //用户名 if (StringUtils.isNoneBlank(name)) { builder.append(" AND app.name_ like '%").append(name).append("%'"); } - //或者是全员可访问的应用 - builder.append(" OR app.authorization_type = '").append("all_access'"); - //用户名 - if (StringUtils.isNoneBlank(name)) { - builder.append(" AND app.name_ like '%").append(name).append("%'"); - } //@formatter:on String sql = builder.toString(); List list = namedParameterJdbcTemplate.query( diff --git a/eiam-console/src/main/java/cn/topiam/employee/console/converter/account/UserConverter.java b/eiam-console/src/main/java/cn/topiam/employee/console/converter/account/UserConverter.java index 9fb8584d..70e14284 100644 --- a/eiam-console/src/main/java/cn/topiam/employee/console/converter/account/UserConverter.java +++ b/eiam-console/src/main/java/cn/topiam/employee/console/converter/account/UserConverter.java @@ -293,11 +293,15 @@ public interface UserConverter { .of(s -> s.field(FieldSort.of(f -> f.field(EVENT_TIME).order(sortOrder)))); fieldSortBuilders.add(eventTimeSortBuilder); }); - return new NativeQueryBuilder().withQuery(queryBuilder.build()._toQuery()) + NativeQueryBuilder nativeQueryBuilder = new NativeQueryBuilder() + .withQuery(queryBuilder.build()._toQuery()) //分页参数 - .withPageable(PageRequest.of(page.getCurrent(), page.getPageSize())) + .withPageable(PageRequest.of(page.getCurrent(), page.getPageSize())); + if (!CollectionUtils.isEmpty(fieldSortBuilders)) { //排序 - .withSort(fieldSortBuilders).build(); + nativeQueryBuilder.withSort(fieldSortBuilders); + } + return nativeQueryBuilder.build(); } /**