From b6a81f2151c05d01e7423b897eceaa7c8519a79a Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 25 Nov 2024 09:20:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A6=85=E9=81=93#582=E3=80=81#583?= =?UTF-8?q?=E3=80=81#584=E3=80=81#587=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=9B2=E3=80=81=E6=97=A0=E7=94=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=EF=BC=9AneedSetPwd=E3=80=81password=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/order/OrderController.java | 2 -- .../controller/admin/auth/vo/AuthLoginReqVO.java | 10 +++++----- .../admin/auth/vo/AuthPermissionInfoRespVO.java | 3 --- .../controller/admin/notice/NoticeController.java | 2 -- .../controller/admin/user/vo/user/UserSaveReqVO.java | 5 ----- .../imes/module/system/convert/auth/AuthConvert.java | 2 +- .../system/service/user/AdminUserServiceImpl.java | 2 -- .../system/service/user/AdminUserServiceImplTest.java | 2 -- 8 files changed, 6 insertions(+), 22 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index 7671b65ae..1b32e61fe 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -505,7 +505,6 @@ public class OrderController { // 生产单超期（工作台） @GetMapping("/getOrderOverdue") @Operation(summary = "生产单超期 （工作台）") - @PreAuthorize("@ss.hasPermission('productManager:List')") public CommonResult> getOrderOverdue(@Valid PageParam pageParam) { return success(orderService.getOrderOverdue(pageParam)); } @@ -513,7 +512,6 @@ public class OrderController { // 生产单到期告警 （工作台） @GetMapping("/getOrderWarn") @Operation(summary = "生产单到期告警 （工作台）") - @PreAuthorize("@ss.hasPermission('productManager:List')") public CommonResult> getOrderNear(@Valid PageParam pageParam) { return success(orderService.getOrderNear(pageParam)); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java index 5c17b3c3b..f6a038b74 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthLoginReqVO.java @@ -22,14 +22,14 @@ import javax.validation.constraints.Pattern; public class AuthLoginReqVO { @Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "chenfengyuanma") - @NotEmpty(message = "登录账号不能为空") - @Length(min = 4, max = 16, message = "账号长度为 4-16 位") - @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母") + @NotEmpty(message = "登录失败，账号密码不正确") + @Length(max = 11, message = "登录失败，账号密码不正确") + @Pattern(regexp = "^[A-Za-z0-9]+$", message = "登录失败，账号密码不正确") private String username; @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao") - @Length(min = 4, max = 16, message = "密码长度为 4-16 位") - @NotEmpty(message = "密码不能为空") + @Length(min = 8, max = 16, message = "登录失败，账号密码不正确") + @NotEmpty(message = "登录失败，账号密码不正确") private String password; // ========== 图片验证码相关 ========== diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java index f643ce620..464e0cabe 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java @@ -48,9 +48,6 @@ public class AuthPermissionInfoRespVO { @Schema(description = "组织id") private Long organId; - @Schema(description = "是否需要设置密码") - private boolean needSetPwd; - @Schema(description = "ip地址") private String ip; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/NoticeController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/NoticeController.java index 69cdbed4c..c04ed748b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/NoticeController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/NoticeController.java @@ -62,7 +62,6 @@ public class NoticeController { @GetMapping("/page") @Operation(summary = "获取通知公告列表") - @PreAuthorize("@ss.hasPermission('system:notice:query')") public CommonResult> getNoticePage(@Validated NoticePageReqVO pageReqVO) { PageResult pageResult = noticeService.getNoticePage(pageReqVO); return success(BeanUtils.toBean(pageResult, NoticeRespVO.class)); @@ -71,7 +70,6 @@ public class NoticeController { @GetMapping("/get") @Operation(summary = "获得通知公告") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:notice:query')") public CommonResult getNotice(@RequestParam("id") Long id) { NoticeDO notice = noticeService.getNotice(id); return success(BeanUtils.toBean(notice, NoticeRespVO.class)); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java index 26d159330..f71485d9d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java @@ -36,7 +36,6 @@ public class UserSaveReqVO { @Schema(description = "用户邮箱", example = "chenfeng@cf.com") @Email(message = "邮箱格式不正确") @Size(max = 50, message = "邮箱长度不能超过 50 个字符") - @NotBlank(message = "邮箱不能为空") private String email; @Schema(description = "手机号码", example = "15601691300") @@ -54,10 +53,6 @@ public class UserSaveReqVO { // ========== 仅【创建】时，需要传递的字段 ========== - @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456") - @Size(min = 4, max = 16, message = "密码长度为 4-16 位") - private String password; - @Schema(description = "帐号状态（0正常 1停用）") @NotNull(message = "账号状态不能空") @CommonStatus diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/auth/AuthConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/auth/AuthConvert.java index 43d91c398..97c6f471d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/auth/AuthConvert.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/auth/AuthConvert.java @@ -49,7 +49,7 @@ public interface AuthConvert { return AuthPermissionInfoRespVO.builder() .user(AuthPermissionInfoRespVO.UserVO.builder() - .id(user.getId()).nickname(user.getNickname()).avatar(user.getAvatar()).organId(user.getOrganId()).needSetPwd(StringUtils.isEmpty(user.getPassword())) + .id(user.getId()).nickname(user.getNickname()).avatar(user.getAvatar()).organId(user.getOrganId()) .expireTime(organizationDO.getExpireTime()).ip(ipQuerySuccess ? ipQueryDataRespDTO.getIp() : "") .region(region) .build()) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java index 444e4cd0d..c98433458 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java @@ -490,8 +490,6 @@ public class AdminUserServiceImpl implements AdminUserService { validateUserExists(id); // 校验用户名唯一 validateUsernameUnique(id, username, organId); - // 校验邮箱唯一 - validateEmailUnique(id, email, organId); // 校验部门处于开启状态 deptService.validateDeptList(CollectionUtils.singleton(deptId)); // 校验岗位处于开启状态 diff --git a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/user/AdminUserServiceImplTest.java b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/user/AdminUserServiceImplTest.java index 4326b9441..4fba52f93 100644 --- a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/user/AdminUserServiceImplTest.java +++ b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/user/AdminUserServiceImplTest.java @@ -106,8 +106,6 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest { o.setStatus(CommonStatusEnum.ENABLE.getStatus()); })); //when(postService.getPostList(eq(reqVO.getPostIds()), isNull())).thenReturn(posts); - // mock passwordEncoder 的方法 - when(passwordEncoder.encode(eq(reqVO.getPassword()))).thenReturn("chenfengyuanma"); // 调用 Long userId = userService.createUser(reqVO);