From 1c3dcab0db50e561b51bd1c1a53afdb85a859695 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 15 Oct 2024 17:44:57 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81bug#565=20=E7=99=BB=E5=BD=95=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BC=98=E5=8C=96=EF=BC=9B2=E3=80=81=E5=8F=91?= =?UTF-8?q?=E9=80=81=E7=9F=AD=E4=BF=A1=E5=8F=AA=E5=9C=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E6=97=B6=E6=A0=A1=E9=AA=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/template/ReportTemplateController.java | 3 ++- .../admin/template/vo/ReportTemplateSaveReqVO.java | 4 ++++ .../module/system/service/auth/AdminAuthServiceImpl.java | 3 +-- .../imes/module/system/service/sms/SmsCodeServiceImpl.java | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java index 5c5f2621c..3a8909693 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java @@ -42,6 +42,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Size; import java.io.OutputStream; import java.util.HashMap; @@ -106,7 +107,7 @@ public class ReportTemplateController { @GetMapping("/templates") @Operation(summary = "获取报表模板信息列表") @PreAuthorize("@ss.hasPermission('report:design')") - public CommonResult> getTemplatePage(@RequestParam(value = "name", required = false) String name) { + public CommonResult> getTemplatePage(@RequestParam(value = "name", required = false) @Size(max = 64, message = "模板名称长度不能超过64个字符") String name) { ReportTemplateReqVO reqVO = new ReportTemplateReqVO(name, null); return success(BeanUtils.toBean(templateService.getReportTemplateList(reqVO), ReportTemplateRespVO.class)); } diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java index ceb5d597a..88cd39c41 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import java.util.Set; /** @@ -33,11 +34,14 @@ public class ReportTemplateSaveReqVO { private String content; @Schema(description = "备注", example = "该模板仅供生产使用") + @Length(max = 64, message = "备注长度不能超过64个字符") private String remark; @Schema(description = "数据源id列表") + @Size(max = 20, message = "数据源数量不能超过20个") private Set datasourceIds; @Schema(description = "数据集id列表") + @Size(max = 20, message = "数据集数量不能超过20个") private Set datasetIds; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java index a1cea439e..267b21e66 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java @@ -105,8 +105,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { // 校验机构有效性 organService.validOrgan(user.getOrganId()); // 校验密码 - String userPassword = user.getPassword(); - if (StringUtils.isNotEmpty(userPassword) && !userService.isPasswordMatch(password, userPassword)) { + if (!userService.isPasswordMatch(password, user.getPassword())) { createLoginLog(user.getId(), username, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS); throw ServiceExceptionUtil.exception(ErrorCodeConstants.AUTH_LOGIN_BAD_CREDENTIALS); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImpl.java index daae816e6..5cab9520f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/sms/SmsCodeServiceImpl.java @@ -60,9 +60,6 @@ public class SmsCodeServiceImpl implements SmsCodeService { public void sendSmsCode(SmsCodeSendReqDTO reqDTO) { AdminUserDO user = userService.getUserByUsernameAndOrganId(reqDTO.getMobile(), null); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); - if (ObjectUtil.isNull(loginUser)) { - throw new ServiceException(GlobalErrorCodeConstants.UNAUTHORIZED); - } // 更新手机号场景检查 if (ObjectUtil.equal(SmsSceneEnum.USER_UPDATE_MOBILE.getScene(), reqDTO.getScene())) { userUpdateMobileValid(user, loginUser); @@ -89,6 +86,9 @@ public class SmsCodeServiceImpl implements SmsCodeService { * @param loginUser */ private void userUpdateMobileValid(AdminUserDO user, LoginUser loginUser) { + if (ObjectUtil.isNull(loginUser)) { + throw new ServiceException(GlobalErrorCodeConstants.UNAUTHORIZED); + } if (ObjectUtil.isNotNull(user)) { if (ObjectUtil.equal(user.getId(), loginUser.getId())) { // 手机号没有改变无需验证码